FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

DOC: restore SHA to footer by tacaswell · Pull Request #24781 · matplotlib/matplotlib · GitHub

Repository navigation

DOC: restore SHA to footer - #24781

Merged
ksunden merged 2 commits into
matplotlib:mainfrom
tacaswell:mnt/restore_doc_sha
Feb 10, 2023
Merged

ksunden merged 2 commits into
matplotlib:mainfrom
tacaswell:mnt/restore_doc_sha

Conversation

Copy link
Copy Markdown
Member

PR Summary

Depends on matplotlib/mpl-sphinx-theme#54 being merged.

We used to include the exact commit used to build the docs in the footer (see https://matplotlib.org/3.4.3/index.html) however that got lost as part of the move to mpl-sphinx-theme. This adds the option to put this in the footer again.

Copy link
Copy Markdown
Member Author

This will also require a pin forward on the version of mpl-sphinx-theme we require to build the docs.

QuLogic commented Dec 20, 2022

Copy link
Copy Markdown
Member

There is no pin on main, only the release branch.

Copy link
Copy Markdown
Member Author

tacaswell force-pushed the mnt/restore_doc_sha branch from ef7667d to 5744893 Compare January 5, 2023 23:58

QuLogic commented Jan 6, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

With a small bit of CSS:

.bd-footer__inner {
	display: flex;
	flex-wrap: wrap;
}
.footer-item {
	margin: 0 0.5em;
}
.footer-item:first-child {
	width: 100%;
}

we can get it together like before:

which I'm not sure if that should end up in mpl-sphinx-theme?

ksunden added the Documentation: website layout/behavior/styling changes label Jan 25, 2023
tacaswell marked this pull request as ready for review February 10, 2023 19:05

Copy link
Copy Markdown
Member Author

I am in favor of leaving the CSS tweaking for later.

jklymak commented Feb 10, 2023

Copy link
Copy Markdown
Member

Feel free to self-merge if mpl-sphinx-theme is already at 3.7

Copy link
Copy Markdown
Member Author

Feel free to self-merge if mpl-sphinx-theme is already at 3.7

it is in a funny state (due to branch protections I could not push the version bumping commit to main but I could push the tag, will fix that soon), but there is a release on pypi.

Copy link
Copy Markdown
Member Author

manually cancelled the appevyor to unblock it for other PRs.

ksunden merged commit 73909bc into matplotlib:main Feb 10, 2023

lumberbot-app Bot commented Feb 10, 2023

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v3.7.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 73909bcb408886a22e2b84581d6b9e6d9907c813
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #24781: DOC: restore SHA to footer'
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-24781-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #24781 on branch v3.7.x (DOC: restore SHA to footer)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

tacaswell deleted the mnt/restore_doc_sha branch February 10, 2023 22:08

Copy link
Copy Markdown
Member Author

Will backport this as part of #25194 .

tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Feb 10, 2023
DOC: restore SHA to footer
(cherry picked from commit 73909bc)
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Feb 10, 2023
DOC: restore SHA to footer
(cherry picked from commit 73909bc)
ksunden added a commit to tacaswell/matplotlib that referenced this pull request Feb 13, 2023
DOC: restore SHA to footer
(cherry picked from commit 73909bc)
ksunden added a commit to tacaswell/matplotlib that referenced this pull request Feb 13, 2023
DOC: restore SHA to footer
(cherry picked from commit 73909bc)

ksunden commented Feb 14, 2023

Copy link
Copy Markdown
Member

Backport included in 3.7.0 final preparation

ksunden mentioned this pull request Feb 20, 2023
6 tasks
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

Labels

Documentation: website layout/behavior/styling changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants


Back | FazBrowse Home | New Git URL