Skip to content

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.

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
Merged
merged 152 commits into from
Sep 20, 2022
Merged

Merge v3.6.x branch to main #23918

merged 152 commits into from
Sep 20, 2022

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Sep 17, 2022

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

  • [n/a] Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (install flake8-docstrings and run flake8 --docstring-convention=all).

Documentation

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

QuLogic and others added 30 commits August 17, 2022 18:24
@QuLogic
Merge pull request matplotlib#23652 from QuLogic/auto-backport-of-pr-…
a4c888f 
…23641-on-v3.5.3-doc

Backport PR matplotlib#23641 on branch v3.5.3-doc (Fix doc bugs found in 3.5.3)
@QuLogic
DOC: Update GitHub stats for 3.6.0rc1
6b96e8b
@QuLogic
DOC: Update supported security releases
107cda0
@QuLogic
REL: v3.6.0rc1
4d49a6d 
First release candidate for 3.6.0.
@QuLogic
BLD: bump branch away from tag
b7bccee 
So the tarballs from GitHub are stable.
@timhoffm @meeseeksmachine
Backport PR matplotlib#23695: Document polar handling of _interpolati…
7f152f4 
…on_steps.
@story645 @meeseeksmachine
Backport PR matplotlib#23705: DOC: Added link to class under discussion
056eb64
@QuLogic
Merge pull request matplotlib#23706 from meeseeksmachine/auto-backpor…
ed237d8 
…t-of-pr-23705-on-v3.6.x

Backport PR matplotlib#23705 on branch v3.6.x (DOC: Added link to class under discussion)
@QuLogic
DOC: Fix typos in GitHub stats
f7130cd
@QuLogic
Merge pull request matplotlib#23696 from meeseeksmachine/auto-backpor…
04b1be5 
…t-of-pr-23695-on-v3.6.x

Backport PR matplotlib#23695 on branch v3.6.x (Document polar handling of _interpolation_steps.)
@timhoffm @meeseeksmachine
Backport PR matplotlib#23710: Fix cmap deprecations
a26402d
@greglucas @meeseeksmachine
Backport PR matplotlib#23708: Loosen up test_Normalize test
5c7d928
@greglucas
Merge pull request matplotlib#23713 from meeseeksmachine/auto-backpor…
5f8bdd6 
…t-of-pr-23710-on-v3.6.x

Backport PR matplotlib#23710 on branch v3.6.x (Fix cmap deprecations)
@QuLogic
Merge pull request matplotlib#23715 from meeseeksmachine/auto-backpor…
2345c2f 
…t-of-pr-23708-on-v3.6.x

Backport PR matplotlib#23708 on branch v3.6.x (Loosen up test_Normalize test)
@oscargus @meeseeksmachine
Backport PR matplotlib#23711: Fix deprecation messages for vendoring …
dd73ea5 
…unused things
@oscargus @meeseeksmachine
Backport PR matplotlib#23724: Fix/harmonize spacing in dependencies.rst.
82a53dc
@oscargus
Merge pull request matplotlib#23727 from meeseeksmachine/auto-backpor…
27377d5 
…t-of-pr-23724-on-v3.6.x

Backport PR matplotlib#23724 on branch v3.6.x (Fix/harmonize spacing in dependencies.rst.)
@timhoffm @meeseeksmachine
Backport PR matplotlib#23722: Restore deprecation class aliases in cbook
cfb4dd5
@oscargus
Merge pull request matplotlib#23726 from meeseeksmachine/auto-backpor…
045b745 
…t-of-pr-23711-on-v3.6.x

Backport PR matplotlib#23711 on branch v3.6.x (Fix deprecation messages for vendoring unused things)
@tacaswell @meeseeksmachine
Backport PR matplotlib#23729: Use cleaner recursion check in PyQt Fig…
4b02eb4 
…ureCanvas' resizeEvent.
@QuLogic
Merge pull request matplotlib#23728 from meeseeksmachine/auto-backpor…
a9f2a88 
…t-of-pr-23722-on-v3.6.x

Backport PR matplotlib#23722 on branch v3.6.x (Restore deprecation class aliases in cbook)
@QuLogic @meeseeksmachine
Backport PR matplotlib#23733: DOC: Update theme configuration for upc…
ac35fb6 
…oming changes
@QuLogic
Merge pull request matplotlib#23734 from meeseeksmachine/auto-backpor…
6a203bf 
…t-of-pr-23733-on-v3.6.x

Backport PR matplotlib#23733 on branch v3.6.x (DOC: Update theme configuration for upcoming changes)
@QuLogic
Merge pull request matplotlib#23732 from meeseeksmachine/auto-backpor…
f75e545 
…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.)
@QuLogic @meeseeksmachine
Backport PR matplotlib#23639: Adding the new contributor meeting
f7a12a4
@greglucas @meeseeksmachine
Backport PR matplotlib#23712: FIX: do not try to help CPython with ga…
dee03b2 
…rbage collection
@tacaswell
Merge pull request matplotlib#23739 from meeseeksmachine/auto-backpor…
7b1060a 
…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)
@QuLogic
Merge pull request matplotlib#23738 from meeseeksmachine/auto-backpor…
4c069c9 
…t-of-pr-23639-on-v3.6.x

Backport PR matplotlib#23639 on branch v3.6.x (Adding the new contributor meeting)
@QuLogic @meeseeksmachine
Backport PR matplotlib#23674: Re-rename builtin seaborn styles to not…
6fe3897 
… include a dot.
@timhoffm @meeseeksmachine
Backport PR matplotlib#23740: Clarify error for colorbar with unparen…
438d0e3 
…ted mappable
@timhoffm timhoffm mentioned this pull request Sep 18, 2022
Merged
@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.

story645 and others added 14 commits September 19, 2022 13:32
@story645 @meeseeksmachine
Backport PR matplotlib#23951: DOC: Make animation continuous
709335a
@timhoffm
Merge pull request matplotlib#23952 from meeseeksmachine/auto-backpor…
f41eedf 
…t-of-pr-23951-on-v3.6.x

Backport PR matplotlib#23951 on branch v3.6.x (DOC: Make animation continuous)
@timhoffm
Merge pull request matplotlib#23938 from meeseeksmachine/auto-backpor…
f751574 
…t-of-pr-23919-on-v3.6.x

Backport PR matplotlib#23919 on branch v3.6.x (DOC: remove dead "Show Source" links)
@timhoffm @meeseeksmachine
Backport PR matplotlib#23751: FIX: show bars when the first location …
7381e20 
…is nan
@timhoffm
Merge pull request matplotlib#23956 from meeseeksmachine/auto-backpor…
65ca31c 
…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)
@dstansby
Merge pull request matplotlib#23945 from meeseeksmachine/auto-backpor…
fd4ab64 
…t-of-pr-23941-on-v3.6.x

Backport PR matplotlib#23941 on branch v3.6.x (consistent notation for minor/patch branches)
@melissawm @QuLogic
Fix version switcher links
e90efb1
@jklymak @QuLogic
Merge pull request matplotlib#23949 from timhoffm/version-switcher-dev
6578d9a 
DOC: Display "dev" instead of "devdocs" in the version switcher
(cherry picked from commit b5fa310)
@timhoffm @meeseeksmachine
Backport PR matplotlib#23958: DOC: Remove Adding Animations section
f429076
@QuLogic
Merge pull request matplotlib#23961 from meeseeksmachine/auto-backpor…
0a8b1ce 
…t-of-pr-23958-on-v3.6.x

Backport PR matplotlib#23958 on branch v3.6.x (DOC: Remove Adding Animations section)
@QuLogic
Merge pull request matplotlib#23942 from matplotlib/revert-23936-auto…
b8af722 
…-backport-of-pr-23935-on-v3.6.x

DOC: fix versions in v3.6.x doc switcher
@QuLogic
Merge branch 'v3.6.x' into merge-v36x
abbfe56
@QuLogic
Re-enable next what's new pages
450dbff
@QuLogic
DOC: Unpin mpl-sphinx-theme again
21cd26b
@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.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.

@QuLogic
Copy link
Member Author

QuLogic commented Sep 20, 2022

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

@tacaswell tacaswell merged commit ec85e72 into matplotlib:main Sep 20, 2022
@QuLogic QuLogic deleted the merge-v36x branch September 21, 2022 02:06
This was referenced Feb 17, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oscargus oscargus oscargus approved these changes

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

Successfully merging this pull request may close these issues.