Merge pull request #1385 from RonnyPfannschmidt/release-process-update

update release process to ensure correct usage of base branches and p…
This commit is contained in:
Bruno Oliveira 2016-02-14 00:54:25 -02:00
commit 6f0d90cd5a
1 changed files with 6 additions and 1 deletions

View File

@ -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