Skip to content

Commit 96a1d29

Browse files
authored
Merge pull request #1900 from nicoddemus/finalize-3.0.2-release
Finalize 3.0.2 release
2 parents 919f50a + ee284ec commit 96a1d29

File tree

4 files changed

+24
-12
lines changed

4 files changed

+24
-12
lines changed

CHANGELOG.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
3.0.3.dev0
2+
==========
3+
4+
*
5+
6+
*
7+
8+
*
9+
10+
*
11+
12+
*
13+
14+
115
3.0.2
216
=====
317

HOWTORELEASE.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ Note: this assumes you have already registered on pypi.
6464
a. **patch release (2.8.3)**:
6565

6666
1. Checkout ``master``.
67-
2. Update version number in ``_pytest/__init__.py`` to ``"2.8.4.dev"``.
68-
3. Create a new section in ``CHANGELOG.rst`` titled ``2.8.4.dev`` and add a few bullet points as placeholders for new entries.
67+
2. Update version number in ``_pytest/__init__.py`` to ``"2.8.4.dev0"``.
68+
3. Create a new section in ``CHANGELOG.rst`` titled ``2.8.4.dev0`` and add a few bullet points as placeholders for new entries.
6969
4. Commit and push.
7070

7171
b. **minor release (2.9.0)**:
7272

7373
1. Merge ``features`` into ``master``.
7474
2. Checkout ``master``.
75-
3. Follow the same steps for a **patch release** above, using the next patch release: ``2.9.1.dev``.
75+
3. Follow the same steps for a **patch release** above, using the next patch release: ``2.9.1.dev0``.
7676
4. Commit ``master``.
7777
5. Checkout ``features`` and merge with ``master`` (should be a fast-forward at this point).
78-
6. Update version number in ``_pytest/__init__.py`` to the next minor release: ``"2.10.0.dev"``.
79-
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.
78+
6. Update version number in ``_pytest/__init__.py`` to the next minor release: ``"2.10.0.dev0"``.
79+
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.
8080
8. Commit ``features``.
8181
9. Push ``master`` and ``features``.
8282

_pytest/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#
2-
__version__ = '3.0.2'
2+
__version__ = '3.0.3.dev0'

doc/en/announce/release-3.0.2.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ The changelog is available at http://doc.pytest.org/en/latest/changelog.html.
1212

1313
Thanks to all who contributed to this release, among them:
1414

15-
* Adam Chainz
16-
* Andrew Svetlov
15+
* Ahn Ki-Wook
1716
* Bruno Oliveira
18-
* Daniel Hahler
19-
* Dmitry Dygalo
2017
* Florian Bruhin
21-
* Marcin Bachry
18+
* Jordan Guymon
19+
* Raphael Pierzina
2220
* Ronny Pfannschmidt
23-
* matthiasha
21+
* mbyt
2422

2523
Happy testing,
2624
The pytest Development Team

0 commit comments

Comments
 (0)