doc: Streamline remote handling in releasing docs (#9603)

The docs already assume an 'upstream' remote, so we can only fetch from there instead of fetching all remotes. We also don't need to hardcode the remote URL.
This commit is contained in:
Florian Bruhin 2022-02-04 12:13:33 +01:00 committed by GitHub
parent 48f01bdcc2
commit b5a168aa0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions

View File

@ -37,7 +37,7 @@ breaking changes or new features.
For a new minor release, first create a new maintenance branch from ``main``:: 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 branch 7.1.x upstream/main
git push upstream 7.1.x git push upstream 7.1.x
@ -63,7 +63,7 @@ Major releases
1. Create a new maintenance branch from ``main``:: 1. Create a new maintenance branch from ``main``::
git fetch --all git fetch upstream
git branch 8.0.x upstream/main git branch 8.0.x upstream/main
git push upstream 8.0.x git push upstream 8.0.x
@ -136,9 +136,9 @@ 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 #. 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:: 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 tag MAJOR.MINOR.PATCH upstream/release-MAJOR.MINOR.PATCH
git push git@github.com: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>`_. Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
@ -146,7 +146,7 @@ Both automatic and manual processes described above follow the same steps from t
#. Cherry-pick the CHANGELOG / announce files to the ``main`` branch:: #. 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 checkout upstream/main -b cherry-pick-release
git cherry-pick -x -m1 upstream/MAJOR.MINOR.x git cherry-pick -x -m1 upstream/MAJOR.MINOR.x
@ -158,7 +158,7 @@ Both automatic and manual processes described above follow the same steps from t
git checkout main git checkout main
git pull git pull
git tag MAJOR.{MINOR+1}.0.dev0 git tag MAJOR.{MINOR+1}.0.dev0
git push git@github.com: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:: #. Send an email announcement with the contents from::