Merge pull request #1900 from nicoddemus/finalize-3.0.2-release

Finalize 3.0.2 release
This commit is contained in:
Bruno Oliveira 2016-09-01 23:05:39 -03:00 committed by GitHub
commit 96a1d2941b
4 changed files with 24 additions and 12 deletions

View File

@ -1,3 +1,17 @@
3.0.3.dev0
==========
*
*
*
*
*
3.0.2 3.0.2
===== =====

View File

@ -64,19 +64,19 @@ Note: this assumes you have already registered on pypi.
a. **patch release (2.8.3)**: a. **patch release (2.8.3)**:
1. Checkout ``master``. 1. Checkout ``master``.
2. Update version number in ``_pytest/__init__.py`` to ``"2.8.4.dev"``. 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.dev`` and add a few bullet points as placeholders for new entries. 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. 4. Commit and push.
b. **minor release (2.9.0)**: b. **minor release (2.9.0)**:
1. Merge ``features`` into ``master``. 1. Merge ``features`` into ``master``.
2. Checkout ``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``. 4. Commit ``master``.
5. Checkout ``features`` and merge with ``master`` (should be a fast-forward at this point). 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"``. 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.dev``, above ``2.9.1.dev``, and add a few bullet points as placeholders for new entries. 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``. 8. Commit ``features``.
9. Push ``master`` and ``features``. 9. Push ``master`` and ``features``.

View File

@ -1,2 +1,2 @@
# #
__version__ = '3.0.2' __version__ = '3.0.3.dev0'

View File

@ -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: Thanks to all who contributed to this release, among them:
* Adam Chainz * Ahn Ki-Wook
* Andrew Svetlov
* Bruno Oliveira * Bruno Oliveira
* Daniel Hahler
* Dmitry Dygalo
* Florian Bruhin * Florian Bruhin
* Marcin Bachry * Jordan Guymon
* Raphael Pierzina
* Ronny Pfannschmidt * Ronny Pfannschmidt
* matthiasha * mbyt
Happy testing, Happy testing,
The pytest Development Team The pytest Development Team