Merge branch 'pytest-dev:main' into main

changelog/10533.bugfix.rst

@@ -1 +0,0 @@
-Fix :func:`pytest.approx` handling of dictionaries containing one or more values of `0.0` in class ApproxMapping.

changelog/10592.bugfix.rst

@@ -1 +0,0 @@
-Fixed crash if `--cache-show` and `--help` are passed at the same time.

changelog/10597.bugfix.rst

@@ -1 +0,0 @@
-Fix bug where a fixture method named ``teardown`` would be called as part of ``nose`` teardown stage.

changelog/10626.bugfix.rst

@@ -1 +0,0 @@
-Fix crash if ``--fixtures`` and ``--help`` are passed at the same time.

changelog/10660.bugfix.rst

@@ -1,2 +0,0 @@
-Fix :py:func:`pytest.raises` to return a 'ContextManager' so that type-checkers could narrow
-:code:`pytest.raises(...) if ... else nullcontext()` down to 'ContextManager' rather than 'object'.

changelog/10690.doc.rst

@@ -1 +0,0 @@
-Added `CI` and `BUILD_NUMBER` environment variables to the documentation.

changelog/10721.doc.rst

@@ -1 +0,0 @@
-Fixed entry-points declaration in the documentation example using Hatch.

changelog/10753.doc.rst

@@ -1,2 +0,0 @@
-Change wording of the module level skip to be very explicit
-about not collecting and not executing the rest of the module.

doc/en/announce/index.rst

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-7.2.2
    release-7.2.1
    release-7.2.0
    release-7.1.3

doc/en/announce/release-7.2.2.rst

@@ -0,0 +1,25 @@
+pytest-7.2.2
+=======================================
+
+pytest 7.2.2 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:
+
+* Bruno Oliveira
+* Garvit Shubham
+* Mahesh Vashishtha
+* Ramsey
+* Ronny Pfannschmidt
+* Teejay
+* q0w
+* vin01
+
+
+Happy testing,
+The pytest Development Team

doc/en/builtin.rst

@@ -22,7 +22,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collected 0 items
-    cache -- .../_pytest/cacheprovider.py:510
+    cache -- .../_pytest/cacheprovider.py:509
         Return a cache object that can persist state between testing sessions.
 
         cache.get(key, default)

doc/en/changelog.rst

@@ -28,6 +28,42 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 7.2.2 (2023-03-03)
+=========================
+
+Bug Fixes
+---------
+
+- `#10533 <https://github.com/pytest-dev/pytest/issues/10533>`_: Fixed :func:`pytest.approx` handling of dictionaries containing one or more values of `0.0`.
+
+
+- `#10592 <https://github.com/pytest-dev/pytest/issues/10592>`_: Fixed crash if `--cache-show` and `--help` are passed at the same time.
+
+
+- `#10597 <https://github.com/pytest-dev/pytest/issues/10597>`_: Fixed bug where a fixture method named ``teardown`` would be called as part of ``nose`` teardown stage.
+
+
+- `#10626 <https://github.com/pytest-dev/pytest/issues/10626>`_: Fixed crash if ``--fixtures`` and ``--help`` are passed at the same time.
+
+
+- `#10660 <https://github.com/pytest-dev/pytest/issues/10660>`_: Fixed :py:func:`pytest.raises` to return a 'ContextManager' so that type-checkers could narrow
+  :code:`pytest.raises(...) if ... else nullcontext()` down to 'ContextManager' rather than 'object'.
+
+
+
+Improved Documentation
+----------------------
+
+- `#10690 <https://github.com/pytest-dev/pytest/issues/10690>`_: Added `CI` and `BUILD_NUMBER` environment variables to the documentation.
+
+
+- `#10721 <https://github.com/pytest-dev/pytest/issues/10721>`_: Fixed entry-points declaration in the documentation example using Hatch.
+
+
+- `#10753 <https://github.com/pytest-dev/pytest/issues/10753>`_: Changed wording of the module level skip to be very explicit
+  about not collecting tests and not executing the rest of the module.
+
+
 pytest 7.2.1 (2023-01-13)
 =========================
 

doc/en/getting-started.rst

@@ -22,7 +22,7 @@ Install ``pytest``
 .. code-block:: bash
 
     $ pytest --version
-    pytest 7.2.1
+    pytest 7.2.2
 
 .. _`simpletest`:
 

testing/acceptance_test.py

@@ -693,7 +693,14 @@ class TestInvocationVariants:
 
         # mixed module and filenames:
         monkeypatch.chdir("world")
-        result = pytester.runpytest("--pyargs", "-v", "ns_pkg.hello", "ns_pkg/world")
+
+        # pgk_resources.declare_namespace has been deprecated in favor of implicit namespace packages.
+        # While we could change the test to use implicit namespace packages, seems better
+        # to still ensure the old declaration via declare_namespace still works.
+        ignore_w = r"-Wignore:Deprecated call to `pkg_resources.declare_namespace"
+        result = pytester.runpytest(
+            "--pyargs", "-v", "ns_pkg.hello", "ns_pkg/world", ignore_w
+        )
         assert result.ret == 0
         result.stdout.fnmatch_lines(
             [

testing/test_monkeypatch.py

@@ -425,6 +425,9 @@ def test_context_classmethod() -> None:
     assert A.x == 1
 
 
+@pytest.mark.filterwarnings(
+    "ignore:Deprecated call to `pkg_resources.declare_namespace"
+)
 def test_syspath_prepend_with_namespace_packages(
     pytester: Pytester, monkeypatch: MonkeyPatch
 ) -> None: