From 68be31916520c668c9caa3ddc25531709830ae89 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Fri, 11 Feb 2022 15:50:54 -0300 Subject: [PATCH] Merge pull request #9674 from pytest-dev/release-7.0.1 (cherry picked from commit 18d35b817de7a8a0b416eefbb54a323f9ba90d21) --- changelog/9608.bugfix.rst | 1 - changelog/9610.bugfix.rst | 3 --- changelog/9636.bugfix.rst | 1 - changelog/9642.bugfix.rst | 1 - changelog/9643.bugfix.rst | 2 -- doc/en/announce/index.rst | 1 + doc/en/announce/release-7.0.1.rst | 20 ++++++++++++++++++++ doc/en/changelog.rst | 24 ++++++++++++++++++++++++ doc/en/getting-started.rst | 2 +- 9 files changed, 46 insertions(+), 9 deletions(-) delete mode 100644 changelog/9608.bugfix.rst delete mode 100644 changelog/9610.bugfix.rst delete mode 100644 changelog/9636.bugfix.rst delete mode 100644 changelog/9642.bugfix.rst delete mode 100644 changelog/9643.bugfix.rst create mode 100644 doc/en/announce/release-7.0.1.rst diff --git a/changelog/9608.bugfix.rst b/changelog/9608.bugfix.rst deleted file mode 100644 index 4dda46becd2..00000000000 --- a/changelog/9608.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix invalid importing of ``importlib.readers`` in Python 3.9. diff --git a/changelog/9610.bugfix.rst b/changelog/9610.bugfix.rst deleted file mode 100644 index c8c89c0c961..00000000000 --- a/changelog/9610.bugfix.rst +++ /dev/null @@ -1,3 +0,0 @@ -Restore `UnitTestFunction.obj` to return unbound rather than bound method. -Fixes a crash during a failed teardown in unittest TestCases with non-default `__init__`. -Regressed in pytest 7.0.0. diff --git a/changelog/9636.bugfix.rst b/changelog/9636.bugfix.rst deleted file mode 100644 index 2288c37ffc7..00000000000 --- a/changelog/9636.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin. diff --git a/changelog/9642.bugfix.rst b/changelog/9642.bugfix.rst deleted file mode 100644 index 0b3c2050c51..00000000000 --- a/changelog/9642.bugfix.rst +++ /dev/null @@ -1 +0,0 @@ -Fix running tests by id with ``::`` in the parametrize portion. diff --git a/changelog/9643.bugfix.rst b/changelog/9643.bugfix.rst deleted file mode 100644 index 24ca81182ed..00000000000 --- a/changelog/9643.bugfix.rst +++ /dev/null @@ -1,2 +0,0 @@ -Delay issuing a :class:`~pytest.PytestWarning` about diamond inheritance involving :class:`~pytest.Item` and -:class:`~pytest.Collector` so it can be filtered using :ref:`standard warning filters `. diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst index 75dde1bd6d9..9505b0b9e46 100644 --- a/doc/en/announce/index.rst +++ b/doc/en/announce/index.rst @@ -6,6 +6,7 @@ Release announcements :maxdepth: 2 + release-7.0.1 release-7.0.0 release-7.0.0rc1 release-6.2.5 diff --git a/doc/en/announce/release-7.0.1.rst b/doc/en/announce/release-7.0.1.rst new file mode 100644 index 00000000000..5accfbad0d4 --- /dev/null +++ b/doc/en/announce/release-7.0.1.rst @@ -0,0 +1,20 @@ +pytest-7.0.1 +======================================= + +pytest 7.0.1 has just been released to PyPI. + +This is a bug-fix release, being a drop-in replacement. To upgrade:: + + pip install --upgrade pytest + +The full changelog is available at https://docs.pytest.org/en/stable/changelog.html. + +Thanks to all of the contributors to this release: + +* Anthony Sottile +* Bruno Oliveira +* Ran Benita + + +Happy testing, +The pytest Development Team diff --git a/doc/en/changelog.rst b/doc/en/changelog.rst index 9605d6bcf00..1acdad366da 100644 --- a/doc/en/changelog.rst +++ b/doc/en/changelog.rst @@ -28,6 +28,30 @@ with advance notice in the **Deprecations** section of releases. .. towncrier release notes start +pytest 7.0.1 (2022-02-11) +========================= + +Bug Fixes +--------- + +- `#9608 `_: Fix invalid importing of ``importlib.readers`` in Python 3.9. + + +- `#9610 `_: Restore `UnitTestFunction.obj` to return unbound rather than bound method. + Fixes a crash during a failed teardown in unittest TestCases with non-default `__init__`. + Regressed in pytest 7.0.0. + + +- `#9636 `_: The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin. + + +- `#9642 `_: Fix running tests by id with ``::`` in the parametrize portion. + + +- `#9643 `_: Delay issuing a :class:`~pytest.PytestWarning` about diamond inheritance involving :class:`~pytest.Item` and + :class:`~pytest.Collector` so it can be filtered using :ref:`standard warning filters `. + + pytest 7.0.0 (2022-02-03) ========================= diff --git a/doc/en/getting-started.rst b/doc/en/getting-started.rst index 4c948843a9d..79b88ced9e1 100644 --- a/doc/en/getting-started.rst +++ b/doc/en/getting-started.rst @@ -22,7 +22,7 @@ Install ``pytest`` .. code-block:: bash $ pytest --version - pytest 7.0.0 + pytest 7.0.1 .. _`simpletest`: