Skip to content

Merge branch v3.7.2-doc into v3.7.x #26428

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 2, 2023
Merged

Merge branch v3.7.2-doc into v3.7.x #26428

merged 13 commits into from
Aug 2, 2023

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Aug 1, 2023

PR summary

Mainly for the flake8 fixes.

PR checklist

QuLogic and others added 13 commits July 5, 2023 20:09
…266-on-v3.7.2-doc

Backport PR #26266 on branch v3.7.2-doc (DOC: Use consistent font for anatomy example)
…195-on-v3.7.2-doc

Backport PR #26195 on branch v3.7.2-doc ([Doc] link style sheets reference to customization tutorial)
…321-on-v3.7.2-doc

Backport PR #26321 on branch v3.7.2-doc (remove quote box from font_manager)
…370-on-v3.7.2-doc

Backport PR #26370 on branch v3.7.2-doc (Update README.txt )
…405-on-v3.7.2-doc

Backport PR #26405 on branch v3.7.2-doc (DOC: Clarify the difference between document and section references)
…3.7.2-doc

Backport PR #26414: Fixes for pycodestyle v2.11
@QuLogic QuLogic added this to the v3.7.3 milestone Aug 1, 2023
@QuLogic
Copy link
Member Author

QuLogic commented Aug 1, 2023

The GitHub diff is a bit strange; it should only be showing the flake8 fix and the Zenodo image/DOI.

@tacaswell
Copy link
Member

Are there backports to 3.7.x that got missed?

@QuLogic
Copy link
Member Author

QuLogic commented Aug 1, 2023

Not that are shown in this diff. Pulling the merge commit and comparing heads does not show the extra changes that are here.

@QuLogic
Copy link
Member Author

QuLogic commented Aug 2, 2023

In any case, linting is fixed, so I'm going to merge this, and leave the test failures (which are pyparsing) to #26432.

@QuLogic QuLogic merged commit 2ba853d into v3.7.x Aug 2, 2023
@QuLogic QuLogic deleted the v3.7.2-doc branch August 2, 2023 00:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants