From 48424a6bf66c5aedba0849daebc37eb2ecd05ef9 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Sat, 13 Feb 2016 20:29:30 +0100 Subject: update release process to ensure correct usage of base branches and propper finalization --- HOWTORELEASE.rst | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'HOWTORELEASE.rst') 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 -- cgit v1.2.3