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

Merge v3.6.x branch to main#23918

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
tacaswell merged 152 commits intomatplotlib:mainfromQuLogic:merge-v36x
Sep 20, 2022
Merged

Conversation

QuLogic
Copy link
Member

PR Summary

This is necessary to get the version switcher correctly pointing to 3.6, as well as fix the setuptools-scm-generated version since the tag will be in themain history.

PR Checklist

Tests and Styling

  • [n/a] Has pytest style unit tests (andpytest passes).
  • IsFlake 8 compliant (installflake8-docstrings and runflake8 --docstring-convention=all).

Documentation

  • [n/a] New features are documented, with examples if plot related.
  • [n/a] New features have an entry indoc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented indoc/api/next_api_changes/ (follow instructions in README.rst there).
  • Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).

QuLogicand others added30 commitsAugust 17, 2022 18:24
…23641-on-v3.5.3-docBackport PRmatplotlib#23641 on branch v3.5.3-doc (Fix doc bugs found in 3.5.3)
First release candidate for 3.6.0.
So the tarballs from GitHub are stable.
…t-of-pr-23705-on-v3.6.xBackport PRmatplotlib#23705 on branch v3.6.x (DOC: Added link to class under discussion)
…t-of-pr-23695-on-v3.6.xBackport PRmatplotlib#23695 on branch v3.6.x (Document polar handling of _interpolation_steps.)
…t-of-pr-23710-on-v3.6.xBackport PRmatplotlib#23710 on branch v3.6.x (Fix cmap deprecations)
…t-of-pr-23708-on-v3.6.xBackport PRmatplotlib#23708 on branch v3.6.x (Loosen up test_Normalize test)
…t-of-pr-23724-on-v3.6.xBackport PRmatplotlib#23724 on branch v3.6.x (Fix/harmonize spacing in dependencies.rst.)
…t-of-pr-23711-on-v3.6.xBackport PRmatplotlib#23711 on branch v3.6.x (Fix deprecation messages for vendoring unused things)
…t-of-pr-23722-on-v3.6.xBackport PRmatplotlib#23722 on branch v3.6.x (Restore deprecation class aliases in cbook)
…t-of-pr-23733-on-v3.6.xBackport PRmatplotlib#23733 on branch v3.6.x (DOC: Update theme configuration for upcoming changes)
…t-of-pr-23729-on-v3.6.xBackport PRmatplotlib#23729 on branch v3.6.x (Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.)
…t-of-pr-23712-on-v3.6.xBackport PRmatplotlib#23712 on branch v3.6.x (FIX: do not try to help CPython with garbage collection)
…t-of-pr-23639-on-v3.6.xBackport PRmatplotlib#23639 on branch v3.6.x (Adding the new contributor meeting)
@timhoffm
Copy link
Member

That looks real, not sure the least painful way to fix this (maybe a just 3.6.x PR with the spelling fix that will land here?)

Yes, see#23940.

@timhoffm
Copy link
Member

This should now be updated to merge the new 3.6.x tip. The additional commits there should fix CI.

story645and others added14 commitsSeptember 19, 2022 13:32
…t-of-pr-23951-on-v3.6.xBackport PRmatplotlib#23951 on branch v3.6.x (DOC: Make animation continuous)
…t-of-pr-23919-on-v3.6.xBackport PRmatplotlib#23919 on branch v3.6.x (DOC: remove dead "Show Source" links)
…t-of-pr-23751-on-v3.6.xBackport PRmatplotlib#23751 on branch v3.6.x (FIX: show bars when the first location is nan)
…t-of-pr-23941-on-v3.6.xBackport PRmatplotlib#23941 on branch v3.6.x (consistent notation for minor/patch branches)
DOC: Display "dev" instead of "devdocs" in the version switcher(cherry picked from commitb5fa310)
…t-of-pr-23958-on-v3.6.xBackport PRmatplotlib#23958 on branch v3.6.x (DOC: Remove Adding Animations section)
…-backport-of-pr-23935-on-v3.6.xDOC: fix versions in v3.6.x doc switcher
@timhoffm
Copy link
Member

I assume the following issues are ok for the merge?

 The following files were both added and deleted in this PR:doc/api/next_api_changes/behavior/23710-ES.rstdoc/api/next_api_changes/deprecations/23720-RS.rstdoc/api/next_api_changes/deprecations/23735-ES.rstError: Process completed with exit code 1.

@QuLogic
Copy link
MemberAuthor

That's because they were added in backports and then re-deleted during#23814.

@tacaswelltacaswell merged commitec85e72 intomatplotlib:mainSep 20, 2022
@QuLogicQuLogic deleted the merge-v36x branchSeptember 21, 2022 02:06
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@oscargusoscargusoscargus approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.7.0
Development

Successfully merging this pull request may close these issues.

12 participants
@QuLogic@tacaswell@timhoffm@oscargus@story645@greglucas@jklymak@anntzer@amartinez1224@meeseeksmachine@dstansby@melissawm

[8]ページ先頭

©2009-2025 Movatter.jp