Skip to content

doc: Streamline remote handling in releasing docs #9603

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 1 commit into from
Feb 4, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions RELEASING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ breaking changes or new features.

For a new minor release, first create a new maintenance branch from ``main``::

git fetch --all
git fetch upstream
git branch 7.1.x upstream/main
git push upstream 7.1.x

Expand All @@ -63,7 +63,7 @@ Major releases

1. Create a new maintenance branch from ``main``::

git fetch --all
git fetch upstream
git branch 8.0.x upstream/main
git push upstream 8.0.x

Expand Down Expand Up @@ -136,17 +136,17 @@ Both automatic and manual processes described above follow the same steps from t
#. After all tests pass and the PR has been approved, tag the release commit
in the ``release-MAJOR.MINOR.PATCH`` branch and push it. This will publish to PyPI::

git fetch --all
git fetch upstream
git tag MAJOR.MINOR.PATCH upstream/release-MAJOR.MINOR.PATCH
git push [email protected]:pytest-dev/pytest.git MAJOR.MINOR.PATCH
git push upstream MAJOR.MINOR.PATCH

Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.

#. Merge the PR.

#. Cherry-pick the CHANGELOG / announce files to the ``main`` branch::

git fetch --all --prune
git fetch upstream
git checkout upstream/main -b cherry-pick-release
git cherry-pick -x -m1 upstream/MAJOR.MINOR.x

Expand All @@ -158,7 +158,7 @@ Both automatic and manual processes described above follow the same steps from t
git checkout main
git pull
git tag MAJOR.{MINOR+1}.0.dev0
git push [email protected]:pytest-dev/pytest.git MAJOR.{MINOR+1}.0.dev0
git push upstream MAJOR.{MINOR+1}.0.dev0

#. Send an email announcement with the contents from::

Expand Down