Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix missing-references.json.#17045

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
timhoffm merged 1 commit intomatplotlib:masterfromanntzer:docrefs
Apr 6, 2020
Merged

Conversation

anntzer
Copy link
Contributor

I think what happened is that the way nested classes are referred to in
inheritance diagrams has improved (the qualified name is more correct
now), which caused missing-references.json to go out of sync.
Unfortunately this means missing-references.json can either be
compatible with sphinx<3.0 or with sphinx>3.0, but to be compatible with
both we'd likely need to generate one with both versions and merge the
two json files, which seems not worth it. Instead, just drop nitpicky
mode for older sphixes (sphinges?).

PR Summary

PR Checklist

  • Has Pytest style unit tests
  • Code isFlake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

I think what happened is that the way nested classes are referred to ininheritance diagrams has improved (the qualified name is more correctnow), which caused missing-references.json to go out of sync.Unfortunately this means missing-references.json can either becompatible with sphinx<3.0 or with sphinx>3.0, but to be compatible withboth we'd likely need to generate one with both versions and merge thetwo json files, which seems not worth it.  Instead, just drop nitpickymode for older sphixes (sphinges?).
@anntzeranntzer added Documentation Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. labelsApr 6, 2020
@anntzeranntzer added this to thev3.2.2 milestoneApr 6, 2020
@timhoffmtimhoffm merged commit9f821e4 intomatplotlib:masterApr 6, 2020
@lumberbot-app
Copy link

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 v3.2.x$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 9f821e49051da54d912f5177e74b66ea37096e7d
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #17045: Fix missing-references.json.'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-17045-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR#17045 on branch v3.2.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 tosuggest an improvement.

@tacaswell
Copy link
Member

Working on backporting this, just going to re-generate the json file on the 3.2.x branch.

tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull requestApr 6, 2020
Merge pull requestmatplotlib#17045 from anntzer/docrefsFix missing-references.json.Conflicts:doc/missing-references.json          - fixed by fully regenerating
timhoffm added a commit that referenced this pull requestApr 7, 2020
tacaswell pushed a commit to SidharthBansal/matplotlib that referenced this pull requestApr 8, 2020
Fix missing-references.json.Conflicts:doc/missing-references.json         - re-generated the skip list
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@tacaswelltacaswelltacaswell approved these changes

@timhoffmtimhoffmtimhoffm approved these changes

Assignees
No one assigned
Labels
DocumentationRelease criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Milestone
v3.2.2
Development

Successfully merging this pull request may close these issues.

3 participants
@anntzer@tacaswell@timhoffm
[8]ページ先頭
©2009-2025 Movatter.jp