Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Enforce backport conditions on v*-doc branches#21833

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
tacaswell merged 2 commits intomatplotlib:mainfromQuLogic:clean-doc-backports
Jan 12, 2022

Conversation

QuLogic
Copy link
Member

@QuLogicQuLogic commentedDec 1, 2021•
edited
Loading

PR Summary

Thev*-doc backport branches build docs against the released version. This is not enforced in the CI, and PRs can be backported that have no effect (e.e.g,#21631).

This PR adds a check thatlib files are not modified on backports, and also attempts to run CircleCI with the right version.

Also fixes the added-and-modified check which was incorrectly failing in#21799, as noted on gitter.

PR Checklist

Tests and Styling

  • [n/a] Has pytest style unit tests (andpytest passes).
  • IsFlake 8 compliant (installflake8-docstrings and runflake8 --docstring-convention=all).

Documentation

  • [n/a] New features are documented, with examples if plot related.
  • [n/a] New features have an entry indoc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented indoc/api/next_api_changes/ (follow instructions in README.rst there).
  • Documentation is sphinx and numpydoc compliant (the docs shouldbuild without error).

@QuLogicQuLogic added this to thev3.5-doc milestoneDec 1, 2021
@QuLogic
Copy link
MemberAuthor

I'll try to post a test PR for this before it gets merged.

@QuLogic
Copy link
MemberAuthor

Here is abuild onv3.5.0-doc showing that we are building against the release for the backport doc build.

Here is apull request with an invalid backport.

@tacaswelltacaswell merged commit6cebe46 intomatplotlib:mainJan 12, 2022
@lumberbot-app
Copy link

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.xgit pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -m1 6cebe46157976ab16cc8da38415e5fb15bcc4607
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #21833: Enforce backport conditions on v*-doc branches'
  1. Push to a named branch:
git push YOURFORK v3.5.x:auto-backport-of-pr-21833-on-v3.5.x
  1. Create a PR against branch v3.5.x, I would have named this PR:

"Backport PR#21833 on branch v3.5.x (Enforce backport conditions on v*-doc branches)"

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 theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

@lumberbot-app
Copy link

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.1-docgit pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -m1 6cebe46157976ab16cc8da38415e5fb15bcc4607
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #21833: Enforce backport conditions on v*-doc branches'
  1. Push to a named branch:
git push YOURFORK v3.5.1-doc:auto-backport-of-pr-21833-on-v3.5.1-doc
  1. Create a PR against branch v3.5.1-doc, I would have named this PR:

"Backport PR#21833 on branch v3.5.1-doc (Enforce backport conditions on v*-doc branches)"

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 theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

@QuLogicQuLogic deleted the clean-doc-backports branchJanuary 12, 2022 21:04
tacaswell added a commit to tacaswell/matplotlib that referenced this pull requestJan 12, 2022
…ranchesMerge pull requestmatplotlib#21833 from QuLogic/clean-doc-backportsCI: Enforce backport conditions on v*-doc branches
tacaswell added a commit to tacaswell/matplotlib that referenced this pull requestJan 12, 2022
…ranchesMerge pull requestmatplotlib#21833 from QuLogic/clean-doc-backportsCI: Enforce backport conditions on v*-doc branches
QuLogic added a commit that referenced this pull requestJan 12, 2022
…-v3.5.xBackport PR#21833: Enforce backport conditions on v*-doc branches
QuLogic added a commit that referenced this pull requestJan 19, 2022
…-v3.5.1-docBackport PR#21833: Enforce backport conditions on v*-doc branches
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@tacaswelltacaswelltacaswell approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.5-doc
Development

Successfully merging this pull request may close these issues.

2 participants
@QuLogic@tacaswell
[8]ページ先頭
©2009-2025 Movatter.jp