Skip to content

Revert matplotlib.pyplot intersphinx workaround#6733

Merged
astrofrog merged 2 commits into
astropy:masterfrom
bsipocz:mpl_intersphinx_workaround_revert
Oct 14, 2017
Merged

Revert matplotlib.pyplot intersphinx workaround#6733
astrofrog merged 2 commits into
astropy:masterfrom
bsipocz:mpl_intersphinx_workaround_revert

Conversation

@bsipocz

@bsipocz bsipocz commented Oct 13, 2017

Copy link
Copy Markdown
Member

The issue (#6695) has been resolved upstream (matplotlib/matplotlib#9331 (comment)), so this PR reverts our local workaround.

closes #6695

@bsipocz bsipocz added this to the v2.0.3 milestone Oct 13, 2017
@astropy-bot

astropy-bot Bot commented Oct 13, 2017 •
edited
Loading

Copy link
Copy Markdown

Hi there @bsipocz 👋 - thanks for the pull request! I'm just a friendly 🤖 that checks for issues related to the changelog and making sure that this pull request is milestoned and labelled correctly. This is mainly intended for the maintainers, so if you are not a maintainer you can ignore this, and a maintainer will let you know if any action is required on your part 😃.

Everything looks good from my point of view! 👍

If there are any issues with this message, please report them here

@bsipocz bsipocz added the zzz 💤 merge-when-ci-passes Do not use: We have auto-merge option now. label Oct 13, 2017
mhvk
mhvk approved these changes Oct 14, 2017
View reviewed changes

@mhvk mhvk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just so you don't have to review yourself...

@bsipocz

bsipocz commented Oct 14, 2017 •
edited
Loading

Copy link
Copy Markdown
Member Author

@mhvk - Thanks. Actually the system is rather clever, one cannot approve their own PRs :)

@bsipocz

bsipocz commented Oct 14, 2017 •
edited
Loading

Copy link
Copy Markdown
Member Author

The failures are actually unrelated and were introduced in #6692, but didn't show up there yet as we just yet updated numpydoc in another PR.

@bsipocz bsipocz force-pushed the mpl_intersphinx_workaround_revert branch from 7f10531 to 0d2d35b Compare October 14, 2017 01:24
@astrofrog

astrofrog commented Oct 14, 2017

Copy link
Copy Markdown
Member

Thanks @bsipocz!

@astrofrog astrofrog merged commit ed43a16 into astropy:master Oct 14, 2017
bsipocz pushed a commit that referenced this pull request Oct 15, 2017
@astrofrog @bsipocz
Merge pull request #6733 from bsipocz/mpl_intersphinx_workaround_revert
0c072f6 
Revert matplotlib.pyplot intersphinx workaround
@MSeifert04 MSeifert04 removed the zzz 💤 merge-when-ci-passes Do not use: We have auto-merge option now. label Oct 17, 2017
@bsipocz bsipocz deleted the mpl_intersphinx_workaround_revert branch September 16, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mhvk mhvk mhvk approved these changes

Assignees

No one assigned

Labels

Docs no-changelog-entry-needed

Projects

None yet

Milestone

v2.0.3

Development

Successfully merging this pull request may close these issues.

matplotlib.pyplot is missing from v2.1 intersphinx inventory

4 participants

@bsipocz @astrofrog @mhvk @MSeifert04