summaryrefslogtreecommitdiff
path: root/HOWTORELEASE.rst
diff options
context:
space:
mode:
authorRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2016-02-13 20:29:30 +0100
committerRonny Pfannschmidt <opensource@ronnypfannschmidt.de>2016-02-13 20:30:58 +0100
commit48424a6bf66c5aedba0849daebc37eb2ecd05ef9 (patch)
tree8ac97e445edb6e62225e99f1e16fe99d530efdb0 /HOWTORELEASE.rst
parent2a8d58814a556b2d9cd031ae34b00e51ee72d36d (diff)
downloadpytest-48424a6bf66c5aedba0849daebc37eb2ecd05ef9.tar.gz
update release process to ensure correct usage of base branches and propper finalization
Diffstat (limited to 'HOWTORELEASE.rst')
-rw-r--r--HOWTORELEASE.rst7
1 files changed, 6 insertions, 1 deletions
diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst
index 34c4564dd..3ebfa28b1 100644
--- a/HOWTORELEASE.rst
+++ b/HOWTORELEASE.rst
@@ -3,6 +3,10 @@ How to release pytest
Note: this assumes you have already registered on pypi.
+0. create the branch release-VERSION
+ use features as base for minor/major releases
+ and master as base for bugfix releases
+
1. Bump version numbers in _pytest/__init__.py (setup.py reads it)
2. Check and finalize CHANGELOG
@@ -84,4 +88,5 @@ Note: this assumes you have already registered on pypi.
to the next Minor release version (i.e. if you released ``pytest-2.8.0``,
set it to ``pytest-2.9.0.dev1``).
-14. merge the actual release into the features branch and do a pull request against it
+14. merge the actual release into the master branch and do a pull request against it
+15. merge from master to features