Skip to content

Merge up 3.8.x into main#27899

Merged
QuLogic merged 169 commits intomatplotlib:mainfrom
dstansby:merge_3.8.x
Mar 12, 2024
Merged

Merge up 3.8.x into main#27899
QuLogic merged 169 commits intomatplotlib:mainfrom
dstansby:merge_3.8.x

Conversation

@dstansby
Copy link
Copy Markdown
Member

@dstansby dstansby commented Mar 9, 2024

It looks like this hasn't happened for a couple of minor releases now.

timhoffm and others added 30 commits November 1, 2023 22:19
…t-of-pr-26703-on-v3.8.1-doc

Backport PR matplotlib#26703 on branch v3.8.1-doc (moved communications guidelines from governance, updated and clarified process )
…t-of-pr-27249-on-v3.8.x

Backport PR matplotlib#27249 on branch v3.8.x (DOC: reasoning for communications guidelines)
…t-of-pr-27249-on-v3.8.1-doc

Backport PR matplotlib#27249 on branch v3.8.1-doc (DOC: reasoning for communications guidelines)
…t-of-pr-27213-on-v3.8.x

Backport PR matplotlib#27213 on branch v3.8.x (DOC: consolidated coding guide and added naming conventions table)
…t-of-pr-27213-on-v3.8.1-doc

Backport PR matplotlib#27213 on branch v3.8.1-doc (DOC: consolidated coding guide and added naming conventions table)
…t-of-pr-27268-on-v3.8.x

Backport PR matplotlib#27268 on branch v3.8.x (Copy-edit various examples.)
…t-of-pr-27268-on-v3.8.1-doc

Backport PR matplotlib#27268 on branch v3.8.1-doc (Copy-edit various examples.)
…t-of-pr-27271-on-v3.8.1-doc

Backport PR matplotlib#27271 on branch v3.8.1-doc (DOC: minor fixes to dev workflow)
…t-of-pr-27271-on-v3.8.x

Backport PR matplotlib#27271 on branch v3.8.x (DOC: minor fixes to dev workflow)
…t-of-pr-27276-on-v3.8.x

Backport PR matplotlib#27276 on branch v3.8.x (Clarify behavior of `prune` parameter to MaxNLocator.)
…t-of-pr-27280-on-v3.8.x

Backport PR matplotlib#27280 on branch v3.8.x (DOC: added rest of licenses to license page)
…t-of-pr-27290-on-v3.8.x

Backport PR matplotlib#27290 on branch v3.8.x (Ensure GIL while releasing buffer)
…t-of-pr-27291-on-v3.8.x

Backport PR matplotlib#27291 on branch v3.8.x (Expand 3D import to handle any exception not just ImportError)
…t-of-pr-27312-on-v3.8.1-doc

Backport PR matplotlib#27312 on branch v3.8.1-doc (Doc: Step redirect)
…t-of-pr-27312-on-v3.8.x

Backport PR matplotlib#27312 on branch v3.8.x (Doc: Step redirect)
@github-actions github-actions bot added Documentation: devdocs files in doc/devel Documentation: user guide files in galleries/users_explain or doc/users labels Mar 9, 2024
@github-actions github-actions bot removed the Documentation: devdocs files in doc/devel label Mar 9, 2024
@dstansby dstansby marked this pull request as ready for review March 11, 2024 09:50
@dstansby
Copy link
Copy Markdown
Member Author

Hmm, I'm not sure why this is failing with

/home/circleci/project/doc/project/citing.rst:: WARNING: image file not readable: ../_static/zenodo_cache/10661079.svg
/home/circleci/project/doc/project/citing.rst:: WARNING: image file not readable: ../_static/zenodo_cache/10150955.svg

when the doc build is passing on 3.8.x...

@dstansby
Copy link
Copy Markdown
Member Author

Was failing because the relative path to the zenodo badges was broken. I've manually fixed in the most recent commit.

@QuLogic QuLogic added this to the v3.9.0 milestone Mar 12, 2024
@QuLogic QuLogic merged commit 3c11861 into matplotlib:main Mar 12, 2024
@dstansby dstansby deleted the merge_3.8.x branch March 12, 2024 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Documentation: user guide files in galleries/users_explain or doc/users

Projects

None yet

Development

Successfully merging this pull request may close these issues.