Repository navigation
Merge v3.6.x branch to main - #23918
Merged
tacaswell merged 152 commits intoSep 20, 2022
Merged
tacaswell merged 152 commits into
tacaswell merged 152 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
…23641-on-v3.5.3-doc Backport PR matplotlib#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.x Backport PR matplotlib#23705 on branch v3.6.x (DOC: Added link to class under discussion)
…t-of-pr-23695-on-v3.6.x Backport PR matplotlib#23695 on branch v3.6.x (Document polar handling of _interpolation_steps.)
…t-of-pr-23710-on-v3.6.x Backport PR matplotlib#23710 on branch v3.6.x (Fix cmap deprecations)
…t-of-pr-23708-on-v3.6.x Backport PR matplotlib#23708 on branch v3.6.x (Loosen up test_Normalize test)
…t-of-pr-23724-on-v3.6.x Backport PR matplotlib#23724 on branch v3.6.x (Fix/harmonize spacing in dependencies.rst.)
…t-of-pr-23711-on-v3.6.x Backport PR matplotlib#23711 on branch v3.6.x (Fix deprecation messages for vendoring unused things)
…ureCanvas' resizeEvent.
…t-of-pr-23722-on-v3.6.x Backport PR matplotlib#23722 on branch v3.6.x (Restore deprecation class aliases in cbook)
…t-of-pr-23733-on-v3.6.x Backport PR matplotlib#23733 on branch v3.6.x (DOC: Update theme configuration for upcoming changes)
…t-of-pr-23729-on-v3.6.x Backport PR matplotlib#23729 on branch v3.6.x (Use cleaner recursion check in PyQt FigureCanvas' resizeEvent.)
…rbage collection
…t-of-pr-23712-on-v3.6.x Backport PR matplotlib#23712 on branch v3.6.x (FIX: do not try to help CPython with garbage collection)
…t-of-pr-23639-on-v3.6.x Backport PR matplotlib#23639 on branch v3.6.x (Adding the new contributor meeting)
… include a dot.
Copy link
Copy Markdown
Member
Yes, see #23940. |
Sorry, something went wrong.
…t-of-pr-23935-on-v3.6.x Backport PR matplotlib#23935 on branch v3.6.x (DOC: fix versions is doc switcher)
…ons is doc switcher)"
Fix typos in guthub_stats.rst
Copy link
Copy Markdown
Member
|
This should now be updated to merge the new 3.6.x tip. The additional commits there should fix CI. |
Sorry, something went wrong.
…t-of-pr-23951-on-v3.6.x Backport PR matplotlib#23951 on branch v3.6.x (DOC: Make animation continuous)
…t-of-pr-23919-on-v3.6.x Backport PR matplotlib#23919 on branch v3.6.x (DOC: remove dead "Show Source" links)
…t-of-pr-23751-on-v3.6.x Backport PR matplotlib#23751 on branch v3.6.x (FIX: show bars when the first location is nan)
…t-of-pr-23941-on-v3.6.x Backport PR matplotlib#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 commit b5fa310)
…t-of-pr-23958-on-v3.6.x Backport PR matplotlib#23958 on branch v3.6.x (DOC: Remove Adding Animations section)
…-backport-of-pr-23935-on-v3.6.x DOC: fix versions in v3.6.x doc switcher
Copy link
Copy Markdown
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.rst doc/api/next_api_changes/deprecations/23720-RS.rst doc/api/next_api_changes/deprecations/23735-ES.rst Error: Process completed with exit code 1. |
Sorry, something went wrong.
Copy link
Copy Markdown
Member
Author
|
That's because they were added in backports and then re-deleted during #23814. |
Sorry, something went wrong.
oscargus
approved these changes
Sep 20, 2022
This was referenced Feb 17, 2023
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 the main history.
PR Checklist
Tests and Styling
Documentation