Skip to content

Commit 6cdd851

Browse files
committed
CHANGELOG and docs changes requested during review
1 parent 6eeacab commit 6cdd851

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

CHANGELOG.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Deprecations and Removals
1515
-------------------------
1616

1717
- Pytest no longer supports Python **2.6** and **3.3**. Those Python versions
18-
are EOL for some time now and incurr maintenance and compatibility costs on
18+
are EOL for some time now and incur maintenance and compatibility costs on
1919
the pytest core team, and following up with the rest of the community we
2020
decided that they will no longer be supported starting on this version. Users
2121
which still require those versions should pin pytest to ``<3.3``. (`#2812
@@ -30,7 +30,7 @@ Deprecations and Removals
3030
``CallSpec2`` class. (`#2672
3131
<https://github.com/pytest-dev/pytest/issues/2672>`_)
3232

33-
- remove ParameterSet.deprecated_arg_dict - its not a public api and the lack
33+
- Remove ParameterSet.deprecated_arg_dict - its not a public api and the lack
3434
of the underscore was a naming error. (`#2675
3535
<https://github.com/pytest-dev/pytest/issues/2675>`_)
3636

@@ -46,16 +46,16 @@ Features
4646

4747
- Replace the old introspection code in compat.py that determines the available
4848
arguments of fixtures with inspect.signature on Python 3 and
49-
funcsigs.signature on Python 2. This should respect __signature__
49+
funcsigs.signature on Python 2. This should respect ``__signature__``
5050
declarations on functions. (`#2267
5151
<https://github.com/pytest-dev/pytest/issues/2267>`_)
5252

53-
- Report only once tests with global ``pytestmark`` variable. (`#2549
53+
- Report tests with global ``pytestmark`` variable only once. (`#2549
5454
<https://github.com/pytest-dev/pytest/issues/2549>`_)
5555

5656
- Now pytest displays the total progress percentage while running tests. The
57-
previous output style can be set by setting the new ``console_output_style``
58-
to ``classic``. (`#2657 <https://github.com/pytest-dev/pytest/issues/2657>`_)
57+
previous output style can be set by configuring the ``console_output_style``
58+
setting to ``classic``. (`#2657 <https://github.com/pytest-dev/pytest/issues/2657>`_)
5959

6060
- Match ``warns`` signature to ``raises`` by adding ``match`` keyword. (`#2708
6161
<https://github.com/pytest-dev/pytest/issues/2708>`_)
@@ -83,15 +83,15 @@ Features
8383
``err`` can be accessed by attribute. (`#2879
8484
<https://github.com/pytest-dev/pytest/issues/2879>`_)
8585
86-
- Add ``capfdbinary`` a version of ``capfd`` which returns bytes from
86+
- Add ``capfdbinary``, a version of ``capfd`` which returns bytes from
8787
``readouterr()``. (`#2923
8888
<https://github.com/pytest-dev/pytest/issues/2923>`_)
8989

9090
- Add ``capsysbinary`` a version of ``capsys`` which returns bytes from
9191
``readouterr()``. (`#2934
9292
<https://github.com/pytest-dev/pytest/issues/2934>`_)
9393

94-
- Implement feature to skip ``setup.py`` files when ran with
94+
- Implement feature to skip ``setup.py`` files when run with
9595
``--doctest-modules``. (`#502
9696
<https://github.com/pytest-dev/pytest/issues/502>`_)
9797

doc/en/backwards-compatibility.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,10 @@ Past Releases
9696
were never documented and a leftover from a pre-virtualenv era. These entry
9797
points also created broken entry points in wheels, so removing them also
9898
removes a source of confusion for users.
99+
100+
101+
102+
3.3
103+
^^^
104+
105+
* Dropped support for EOL Python 2.6 and 3.3.

0 commit comments

Comments
 (0)