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.

Sign up for GitHub

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

Jump to bottom

Use matplotlib-inline instead of ipykernel.pylab #12817

Merged
merged 2 commits into from Apr 20, 2021
Merged

Use matplotlib-inline instead of ipykernel.pylab #12817

merged 2 commits into from Apr 20, 2021
+109 −113

Conversation

martinRenou
Copy link
Contributor

@martinRenou martinRenou commented Feb 12, 2021 •
edited

martinRenou
martinRenou commented Feb 12, 2021
View reviewed changes
IPython/core/display.py Outdated Show resolved Hide resolved
IPython/core/display.py Outdated Show resolved Hide resolved
@martinRenou martinRenou mentioned this pull request Feb 12, 2021
Merged
@Carreau
Copy link
Member

Carreau commented Feb 19, 2021

@tacaswell would that also help or be the occasion to help cleaning some logic inside matplotlib ?

@martinRenou martinRenou force-pushed the matplotlib_inline branch 4 times, most recently from 35b51cd to fd7267c Compare April 15, 2021 08:38
@martinRenou martinRenou marked this pull request as ready for review April 15, 2021 08:59
@martinRenou
Copy link
Contributor Author

Tests are now passing and it seems to work as intended.

matplotlib

matplotlib-inline is installable from PyPi or conda-forge. The repo is here for now: https://github.com/martinRenou/matplotlib-inline. But I guess we should put this repo under the Matplotlib or the ipython organization.

@martinRenou
Copy link
Contributor Author

It is indeed one good step for cleaning the Matplotlib logic in IPython

@martinRenou martinRenou mentioned this pull request Apr 16, 2021
Closed
@Carreau Carreau modified the milestones: 8.0, 7.23 Apr 17, 2021
@Carreau
Copy link
Member

Carreau commented Apr 17, 2021

I've push minor changes (mostly saying it's deprecated since 7.23), and will merge once it passes.

@Carreau Carreau mentioned this pull request Apr 17, 2021
Closed
@martinRenou
Copy link
Contributor Author

Thanks!

@SylvainCorlay
Copy link
Member

Hey, should we go ahead with this and move matplotlib_inline to this organization?

@Carreau
Copy link
Member

Carreau commented Apr 20, 2021

Hey, should we go ahead with this and move matplotlib_inline to this organization?

Up to you; I know there are some effort to cleanup what is where; but I'll adapt if you wish to keep it somewhere else. Whatever suit people.

@Carreau Carreau merged commit e4ce502 into ipython:master Apr 20, 2021
@lumberbot-app
Copy link
Contributor

lumberbot-app bot commented Apr 20, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 7.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 e4ce5023ac90dee412387c0e9c6a2bbdce0b0b3c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12817: Use matplotlib-inline instead of ipykernel.pylab'
  1. Push to a named branch :
git push YOURFORK 7.x:auto-backport-of-pr-12817-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #12817 on branch 7.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Apr 20, 2021
@Carreau
Copy link
Member

Carreau commented Apr 20, 2021

Also forgot to merge, which is now done.

Carreau added a commit to Carreau/ipython that referenced this pull request Apr 20, 2021
@Carreau
Backport PR ipython#12817: Use matplotlib-inline instead of ipykernel…
feeb4ea 
….pylab

Merge pull request ipython#12817 from martinRenou/matplotlib_inline

Use matplotlib-inline instead of ipykernel.pylab
@Carreau Carreau mentioned this pull request Apr 20, 2021
Merged
@martinRenou martinRenou deleted the matplotlib_inline branch April 20, 2021 06:53
@martinRenou
Copy link
Contributor Author

Thanks for merging!

I guess we can move the matplotlib-inline repo under the IPython org then? The inline backend is quite related to IPython.

@tacaswell
Copy link
Contributor

tacaswell commented Apr 21, 2021 •
edited

Sorry for late comments. I assume this does not make IPython have an install-time dependency on Matplotilb?

@martinRenou
Copy link
Contributor Author

Yes, I didn't make matplotlib a matplotlib-inline dependency :)

Carreau added a commit that referenced this pull request Apr 21, 2021
@Carreau
Merge pull request #12925 from Carreau/auto-backport-of-pr-12817-on-7.x
a8955db 
Backport PR #12817: Use matplotlib-inline instead of ipykernel.pylab
@SylvainCorlay
Copy link
Member

Hey @Carreau, how about we tag a pre-release of IPython with that change?
We could start testing the companion PR in ipykernel...

@Carreau Carreau removed the Still Needs Manual Backport Added My MrMeeseeks when a backport fails. Help by backporting it, solving conflicts, send PR. label Apr 30, 2021
archlinux-github pushed a commit to archlinux/svntogit-community that referenced this pull request Aug 7, 2021
upgpkg: python-nbval 0.9.6-2; adopt the package, add missing dependen…
7c50f59 
…cy and fix check()

What a mess in tests LOL!

Related tickets:

[1] computationalmodelling/nbval#162
[2] computationalmodelling/nbval#167
[3] ipython/ipython#12817
[4] ipython/ipython#12889
[5] ipython/ipykernel#591
[6] matplotlib/matplotlib#20046

git-svn-id: file:///srv/repos/svn-community/svn@994636 9fca08f4-af9d-4005-b8df-a31f2cc04f65
archlinux-github pushed a commit to archlinux/svntogit-community that referenced this pull request Aug 7, 2021
upgpkg: python-nbval 0.9.6-2; adopt the package, add missing dependen…
5bb37c6 
…cy and fix check()

What a mess in tests LOL!

Related tickets:

[1] computationalmodelling/nbval#162
[2] computationalmodelling/nbval#167
[3] ipython/ipython#12817
[4] ipython/ipython#12889
[5] ipython/ipykernel#591
[6] matplotlib/matplotlib#20046


git-svn-id: file:///srv/repos/svn-community/svn@994636 9fca08f4-af9d-4005-b8df-a31f2cc04f65
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.23
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@martinRenou @Carreau @SylvainCorlay @tacaswell @MrBago