Skip to content

Commit 02dd6df

Browse files
committed
Changelog now in rst format (2.9.0 and onward) and add rst-lint check
Fix pytest-dev#1274
1 parent 6c17020 commit 02dd6df

File tree

3 files changed

+37
-30
lines changed

3 files changed

+37
-30
lines changed

CHANGELOG renamed to CHANGELOG.rst

+34-29
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,49 @@
11
2.9.0.dev
22
=========
33

4-
New Features
5-
------------
4+
**New Features**
65

7-
* New `pytest.mark.skip` mark, which unconditional skips marked tests.
8-
Thanks Michael Aquilina for the complete PR.
6+
* New ``pytest.mark.skip`` mark, which unconditional skips marked tests.
7+
Thanks `@MichaelAquilina`_ for the complete PR (`#1040`_).
98

109
* ``--doctest-glob`` may now be passed multiple times in the command-line.
11-
Thanks Joshua Bronson and Bruno Oliveira for the PR.
10+
Thanks `@jab`_ and `@nicoddemus`_ for the PR.
1211

13-
* New `-rp` and `-rP` reporting options give the summary and full output
14-
of passing tests, respectively. Thanks to David Vierra for the PR.
12+
* New ``-rp`` and ``-rP`` reporting options give the summary and full output
13+
of passing tests, respectively. Thanks to `@codewarrior0`_ for the PR.
1514

1615
* New ``ALLOW_BYTES`` doctest option strips ``b`` prefixes from byte strings
1716
in doctest output (similar to ``ALLOW_UNICODE``).
18-
Thanks Jason R. Coombs for the request and Bruno Oliveira for the PR (#1287).
17+
Thanks `@jaraco`_ for the request and `@nicoddemus`_ for the PR (`#1287`_).
1918

2019

21-
Changes
22-
-------
20+
**Changes**
2321

24-
* `pytest_enter_pdb` now optionally receives the pytest config object.
25-
Thanks Bruno Oliveira for the PR.
22+
* ``pytest_enter_pdb`` now optionally receives the pytest config object.
23+
Thanks `@nicoddemus`_ for the PR.
2624

27-
* fix #1226: Removed code and documentation for Python 2.5 or lower versions,
25+
* Removed code and documentation for Python 2.5 or lower versions,
2826
including removal of the obsolete ``_pytest.assertion.oldinterpret`` module.
29-
Thanks Bruno Oliveira for the PR.
27+
Thanks `@nicoddemus`_ for the PR (`#1226`_).
28+
3029

30+
**Bug Fixes**
3131

32-
Bug Fixes
33-
---------
32+
* The ``-s`` and ``-c`` options should now work under ``xdist``;
33+
``Config.fromdictargs`` now represents its input much more faithfully.
34+
Thanks to `@bukzor`_ for the complete PR (`#680`_).
3435

35-
* fix issue #680: the -s and -c options should now work under xdist;
36-
`Config.fromdictargs` now represents its input much more faithfully.
37-
Thanks to Buck Evan for the complete PR.
36+
37+
.. _#1040: https://github.com/pytest-dev/pytest/pull/1040
38+
.. _#680: https://github.com/pytest-dev/pytest/issues/680
39+
.. _#1287: https://github.com/pytest-dev/pytest/pull/1287
40+
.. _#1226: https://github.com/pytest-dev/pytest/pull/1226
41+
.. _@MichaelAquilina: https://github.com/MichaelAquilina
42+
.. _@bukzor: https://github.com/bukzor
43+
.. _@nicoddemus: https://github.com/nicoddemus
44+
.. _@jab: https://github.com/jab
45+
.. _@codewarrior0: https://github.com/codewarrior0
46+
.. _@jaraco: https://github.com/jaraco
3847

3948

4049
2.8.6.dev1
@@ -543,7 +552,7 @@ Bug Fixes
543552
it from the "decorator" case. Thanks Tom Viner.
544553

545554
- "python_classes" and "python_functions" options now support glob-patterns
546-
for test discovery, as discussed in issue600. Thanks Ldiary Translations.
555+
for test discovery, as discussed in issue600. Thanks Ldiary Translations.
547556

548557
- allow to override parametrized fixtures with non-parametrized ones and vice versa (bubenkoff).
549558

@@ -1757,8 +1766,7 @@ v1.3.3
17571766
v1.3.2
17581767
==============================================
17591768

1760-
New features
1761-
++++++++++++++++++
1769+
**New features**
17621770

17631771
- fix issue103: introduce py.test.raises as context manager, examples::
17641772

@@ -1793,8 +1801,7 @@ New features
17931801
- introduce '--junitprefix=STR' option to prepend a prefix
17941802
to all reports in the junitxml file.
17951803

1796-
Bug fixes / Maintenance
1797-
++++++++++++++++++++++++++
1804+
**Bug fixes**
17981805

17991806
- make tests and the ``pytest_recwarn`` plugin in particular fully compatible
18001807
to Python2.7 (if you use the ``recwarn`` funcarg warnings will be enabled so that
@@ -1832,8 +1839,7 @@ Bug fixes / Maintenance
18321839
v1.3.1
18331840
=============================================
18341841

1835-
New features
1836-
++++++++++++++++++
1842+
**New features**
18371843

18381844
- issue91: introduce new py.test.xfail(reason) helper
18391845
to imperatively mark a test as expected to fail. Can
@@ -1871,8 +1877,7 @@ New features
18711877
course requires that your application and tests are properly teared
18721878
down and don't have global state.
18731879

1874-
Fixes / Maintenance
1875-
++++++++++++++++++++++
1880+
**Bug Fixes**
18761881

18771882
- improved traceback presentation:
18781883
- improved and unified reporting for "--tb=short" option
@@ -2108,7 +2113,7 @@ v1.1.0
21082113
- try harder to have deprecation warnings for py.compat.* accesses
21092114
report a correct location
21102115

2111-
v1.0.2
2116+
v1.0.3
21122117
=============================================
21132118

21142119
* adjust and improve docs

doc/en/changelog.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
Changelog history
55
=================================
66

7-
.. include:: ../../CHANGELOG
7+
.. include:: ../../CHANGELOG.rst

tox.ini

+2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ commands= py.test --genscript=pytest1
3434
[testenv:flakes]
3535
basepython = python2.7
3636
deps = flake8
37+
restructuredtext_lint
3738
commands = flake8 pytest.py _pytest testing
39+
rst-lint CHANGELOG.rst
3840

3941
[testenv:py27-xdist]
4042
deps=pytest-xdist>=1.13

0 commit comments

Comments
 (0)