Skip to content

Commit b5a168a

Browse files
authored
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.
1 parent 48f01bd commit b5a168a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

RELEASING.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ breaking changes or new features.
3737

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

40-
git fetch --all
40+
git fetch upstream
4141
git branch 7.1.x upstream/main
4242
git push upstream 7.1.x
4343

@@ -63,7 +63,7 @@ Major releases
6363

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

66-
git fetch --all
66+
git fetch upstream
6767
git branch 8.0.x upstream/main
6868
git push upstream 8.0.x
6969

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

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

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

145145
#. Merge the PR.
146146

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

149-
git fetch --all --prune
149+
git fetch upstream
150150
git checkout upstream/main -b cherry-pick-release
151151
git cherry-pick -x -m1 upstream/MAJOR.MINOR.x
152152

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

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

0 commit comments

Comments
 (0)