Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade xterm.js to 2.9.2 #2849

Merged
merged 1 commit into from Sep 20, 2017

Conversation

Projects
None yet
5 participants
@cancan101
Copy link
Contributor

cancan101 commented Sep 18, 2017

No description provided.

@rgbkrk

This comment has been minimized.

Copy link
Member

rgbkrk commented Sep 18, 2017

Does this fix #2850 for you?

@takluyver takluyver added this to the 5.2 milestone Sep 19, 2017

@takluyver

This comment has been minimized.

Copy link
Member

takluyver commented Sep 19, 2017

It looks like the fix for that issue is still waiting in a PR on xterm.

I've restarted one test job that failed; if it passes next time, I'm happy to merge this.

@takluyver

This comment has been minimized.

Copy link
Member

takluyver commented Sep 19, 2017

@Carreau it looks like the notebook tests rely on passing a base64-encoded unicode string to IPython.display.Image(), and the new release of IPython has broken that (the test only fails on Python 3, but I suspect it will display an invalid image with Python 2).

Do you think we should change the notebook tests to not rely on that, or put back the ability to pass base64 encoded data into the class in IPython?

@rgbkrk

This comment has been minimized.

Copy link
Member

rgbkrk commented Sep 19, 2017

Do you think we should change the notebook tests to not rely on that, or put back the ability to pass base64 encoded data into the class in IPython?

Change the notebook test

@minrk

This comment has been minimized.

Copy link
Member

minrk commented Sep 19, 2017

#2851 should update the tests to use bytes instead.

@minrk

This comment has been minimized.

Copy link
Member

minrk commented Sep 19, 2017

If there is a fix to be made on the IPython side, I think it would be to make the b64encode conditional on if the input data is bytes or unicode:

if isinstance(data, unicode):
    # already base64
    b64data = data
else:
    b64data = b2a_base64(data).decode('ascii')
@takluyver

This comment has been minimized.

Copy link
Member

takluyver commented Sep 20, 2017

Reopening to rerun the tests now that #2851 is merged.

@takluyver takluyver closed this Sep 20, 2017

@takluyver takluyver reopened this Sep 20, 2017

@takluyver takluyver merged commit 39c27ac into jupyter:master Sep 20, 2017

4 checks passed

codecov/patch Coverage not affected when comparing 9dabaa2...132f042
Details
codecov/project 79.37% remains the same compared to 9dabaa2
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@gnestor gnestor modified the milestone: 5.2 Oct 13, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.