Merge pull request #9674 from pytest-dev/release-7.0.1

(cherry picked from commit 18d35b817de7a8a0b416eefbb54a323f9ba90d21)

changelog/9608.bugfix.rst

@@ -1 +0,0 @@
-Fix invalid importing of ``importlib.readers`` in Python 3.9.

changelog/9610.bugfix.rst

@@ -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.

changelog/9636.bugfix.rst

@@ -1 +0,0 @@
-The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin.

changelog/9642.bugfix.rst

@@ -1 +0,0 @@
-Fix running tests by id with ``::`` in the parametrize portion.

changelog/9643.bugfix.rst

@@ -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 <warnings>`.

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

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

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 <https://github.com/pytest-dev/pytest/issues/9608>`_: Fix invalid importing of ``importlib.readers`` in Python 3.9.
+
+
+- `#9610 <https://github.com/pytest-dev/pytest/issues/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 <https://github.com/pytest-dev/pytest/issues/9636>`_: The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin.
+
+
+- `#9642 <https://github.com/pytest-dev/pytest/issues/9642>`_: Fix running tests by id with ``::`` in the parametrize portion.
+
+
+- `#9643 <https://github.com/pytest-dev/pytest/issues/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 <warnings>`.
+
+
 pytest 7.0.0 (2022-02-03)
 =========================
 

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`: