8000 TST/DOC: just run circle once... by jklymak · Pull Request #20621 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

TST/DOC: just run circle once... #20621

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 1 commit into from
Jul 10, 2021
Merged

TST/DOC: just run circle once... #20621

merged 1 commit into from
Jul 10, 2021

Conversation

jklymak
Copy link
Member
@jklymak jklymak commented Jul 9, 2021

PR Summary

On dev call it was decided to just run circle once, so here keep py3.8

PR Checklist

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • 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).
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

@jklymak jklymak marked this pull request as draft July 9, 2021 22:54
@jklymak jklymak marked this pull request as ready for review July 9, 2021 23:24
@timhoffm timhoffm added this to the v3.4-doc milestone Jul 10, 2021
@timhoffm timhoffm merged commit 3e327dd into matplotlib:master Jul 10, 2021
@lumberbot-app
Copy link
lumberbot-app bot commented Jul 10, 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.4.2-doc
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 3e327dd5847b86265f9a955c647cfc5e149bf8fb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #20621: TST/DOC: just run circle once...'
  1. Push to a named branch :
git push YOURFORK v3.4.2-doc:auto-backport-of-pr-20621-on-v3.4.2-doc
  1. Create a PR against branch v3.4.2-doc, I would have named this PR:

"Backport PR #20621 on branch v3.4.2-doc"

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!

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

@lumberbot-app
Copy link
lumberbot-app bot commented Jul 10, 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.4.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 3e327dd5847b86265f9a955c647cfc5e149bf8fb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #20621: TST/DOC: just run circle once
8000
...'
  1. Push to a named branch :
git push YOURFORK v3.4.x:auto-backport-of-pr-20621-on-v3.4.x
  1. Create a PR against branch v3.4.x, I would have named this PR:

"Backport PR #20621 on branch v3.4.x"

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!

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

@QuLogic
Copy link
Member
QuLogic commented Jul 10, 2021

There are not that many backports that I think we should bother doing it for this one.

@QuLogic QuLogic modified the milestones: v3.4-doc, v3.5.0 Jul 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
Documentation
Projects
None yet
Milestone
v3.5.0
Development

Successfully merging this pull request may close these issues.
3 participants
@jklymak @QuLogic @timhoffm
0