Thanks to visit codestin.com
Credit goes to github.com

Skip to content

DOC: Fix source links and flake8 cleanup #21240

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 3 commits into from
Oct 1, 2021

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Sep 30, 2021

PR Summary

Instead of trying to figure out a regex, just use packaging to parse the version, and link to either master branch or a tag directly if a release.

PR Checklist

  • [n/a] Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • [n/a] New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • [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).

@QuLogic QuLogic added this to the v3.5.0 milestone Sep 30, 2021
@@ -12,6 +12,7 @@ colorspacious
ipython
ipywidgets
numpydoc>=0.8
packaging>=20
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add to environment.yml.

Instead of figuring out a regex ourselves, just use `packaging` to
determine the version. And point to `master` branch if not on an actual
tag.

Fixes matplotlib#21230
@timhoffm timhoffm merged commit 66687d0 into matplotlib:master Oct 1, 2021
@lumberbot-app
Copy link

lumberbot-app bot commented Oct 1, 2021

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.5.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 66687d0311d3a41be0295a8923aac0e281c26329
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #21240: DOC: Fix source links and flake8 cleanup'
  1. Push to a named branch :
git push YOURFORK v3.5.x:auto-backport-of-pr-21240-on-v3.5.x
  1. Create a PR against branch v3.5.x, I would have named this PR:

"Backport PR #21240 on branch v3.5.x (DOC: Fix source links and flake8 cleanup)"

And apply the correct labels and milestones.

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

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

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

@QuLogic QuLogic deleted the doc-cleanup branch October 1, 2021 20:19
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Oct 1, 2021
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Oct 1, 2021
timhoffm added a commit that referenced this pull request Oct 1, 2021
…3.5.x

Backport PR #21240: DOC: Fix source links and flake8 cleanup
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Oct 12, 2021
DOC: Fix source links and flake8 cleanup
tacaswell pushed a commit that referenced this pull request Oct 20, 2021
DOC: Fix source links and flake8 cleanup
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.

2 participants