From 927f411ee2691e95174726205364f95877a2b302 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 1 Sep 2016 21:28:30 -0300 Subject: [PATCH 1/2] Fix release 3.0.2 release announcement list of authors --- doc/en/announce/release-3.0.2.rst | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/en/announce/release-3.0.2.rst b/doc/en/announce/release-3.0.2.rst index 631f14fe4..9d1c05f2d 100644 --- a/doc/en/announce/release-3.0.2.rst +++ b/doc/en/announce/release-3.0.2.rst @@ -12,15 +12,13 @@ The changelog is available at http://doc.pytest.org/en/latest/changelog.html. Thanks to all who contributed to this release, among them: -* Adam Chainz -* Andrew Svetlov +* Ahn Ki-Wook * Bruno Oliveira -* Daniel Hahler -* Dmitry Dygalo * Florian Bruhin -* Marcin Bachry +* Jordan Guymon +* Raphael Pierzina * Ronny Pfannschmidt -* matthiasha +* mbyt Happy testing, The pytest Development Team From ee284ec58763db7467caa831674192e5acee8ab4 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Thu, 1 Sep 2016 21:34:54 -0300 Subject: [PATCH 2/2] Set version to 3.0.3.dev0 Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop": UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0' normalized_version, --- CHANGELOG.rst | 14 ++++++++++++++ HOWTORELEASE.rst | 10 +++++----- _pytest/__init__.py | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 867ae6e45..b7ca19734 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,17 @@ +3.0.3.dev0 +========== + +* + +* + +* + +* + +* + + 3.0.2 ===== diff --git a/HOWTORELEASE.rst b/HOWTORELEASE.rst index e6f1973b6..7da047503 100644 --- a/HOWTORELEASE.rst +++ b/HOWTORELEASE.rst @@ -64,19 +64,19 @@ Note: this assumes you have already registered on pypi. a. **patch release (2.8.3)**: 1. Checkout ``master``. - 2. Update version number in ``_pytest/__init__.py`` to ``"2.8.4.dev"``. - 3. Create a new section in ``CHANGELOG.rst`` titled ``2.8.4.dev`` and add a few bullet points as placeholders for new entries. + 2. Update version number in ``_pytest/__init__.py`` to ``"2.8.4.dev0"``. + 3. Create a new section in ``CHANGELOG.rst`` titled ``2.8.4.dev0`` and add a few bullet points as placeholders for new entries. 4. Commit and push. b. **minor release (2.9.0)**: 1. Merge ``features`` into ``master``. 2. Checkout ``master``. - 3. Follow the same steps for a **patch release** above, using the next patch release: ``2.9.1.dev``. + 3. Follow the same steps for a **patch release** above, using the next patch release: ``2.9.1.dev0``. 4. Commit ``master``. 5. Checkout ``features`` and merge with ``master`` (should be a fast-forward at this point). - 6. Update version number in ``_pytest/__init__.py`` to the next minor release: ``"2.10.0.dev"``. - 7. Create a new section in ``CHANGELOG.rst`` titled ``2.10.0.dev``, above ``2.9.1.dev``, and add a few bullet points as placeholders for new entries. + 6. Update version number in ``_pytest/__init__.py`` to the next minor release: ``"2.10.0.dev0"``. + 7. Create a new section in ``CHANGELOG.rst`` titled ``2.10.0.dev0``, above ``2.9.1.dev0``, and add a few bullet points as placeholders for new entries. 8. Commit ``features``. 9. Push ``master`` and ``features``. diff --git a/_pytest/__init__.py b/_pytest/__init__.py index 757e56087..4d8be3d3a 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,2 +1,2 @@ # -__version__ = '3.0.2' +__version__ = '3.0.3.dev0'