From f6b682ad49c5db1b374193a4b2052415d6d341b1 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 17 Oct 2020 19:08:48 +0300 Subject: [PATCH] RELEASING: start new dev cycle by tagging MAJOR.{MINOR+1}.0.dev0 in master This is needed so setuptools-scm in master shows an accurate version. In particular, higher than the stable branch. --- RELEASING.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELEASING.rst b/RELEASING.rst index 9ff95be92..9ec2b069c 100644 --- a/RELEASING.rst +++ b/RELEASING.rst @@ -122,6 +122,14 @@ Both automatic and manual processes described above follow the same steps from t #. Open a PR for ``cherry-pick-release`` and merge it once CI passes. No need to wait for approvals if there were no conflicts on the previous step. +#. For major and minor releases, tag the release cherry-pick merge commit in master with + a dev tag for the next feature release:: + + git checkout master + git pull + git tag MAJOR.{MINOR+1}.0.dev0 + git push git@github.com:pytest-dev/pytest.git MAJOR.{MINOR+1}.0.dev0 + #. Send an email announcement with the contents from:: doc/en/announce/release-.rst