Merge branch 'main' into pytest_skip_paramspec

nicoddemus · web-flow · commit b6d97c1288e5 · 2025-05-31T08:25:11.000-03:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -118,6 +118,10 @@ jobs:
             os: windows-latest
             tox_env: "py313"
 
+          - name: "windows-py314"
+            python: "3.14"
+            os: windows-latest
+            tox_env: "py314"
 
           - name: "ubuntu-py39-lsof-numpy-pexpect"
             python: "3.9"
@@ -163,6 +167,12 @@ jobs:
             tox_env: "py313-pexpect"
             use_coverage: true
 
+          - name: "ubuntu-py314"
+            python: "3.14"
+            os: ubuntu-latest
+            tox_env: "py314"
+            use_coverage: true
+
           - name: "ubuntu-pypy3-xdist"
             python: "pypy-3.9"
             os: ubuntu-latest
@@ -190,6 +200,10 @@ jobs:
             os: macos-latest
             tox_env: "py313-xdist"
 
+          - name: "macos-py314"
+            python: "3.14"
+            os: macos-latest
+            tox_env: "py314-xdist"
 
           - name: "plugins"
             python: "3.12"
@@ -239,7 +253,8 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python }}
-        check-latest: ${{ endsWith(matrix.python, '-dev') }}
+        check-latest: true
+        allow-prereleases: true
 
     - name: Install dependencies
       run: |
diff --git a/AUTHORS b/AUTHORS
@@ -333,6 +333,7 @@ Nikolay Kondratyev
 Nipunn Koorapati
 Oleg Pidsadnyi
 Oleg Sushchenko
+Oleksandr Zavertniev
 Olga Matoula
 Oliver Bestwalter
 Omar Kohl
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -139,9 +139,8 @@ The objectives of the ``pytest-dev`` organisation are:
 * Sharing some of the maintenance responsibility (in case a maintainer no
   longer wishes to maintain a plugin)
 
-You can submit your plugin by subscribing to the `pytest-dev mail list
-<https://mail.python.org/mailman/listinfo/pytest-dev>`_ and writing a
-mail pointing to your existing pytest plugin repository which must have
+You can submit your plugin by posting a new topic in the `pytest-dev GitHub Discussions
+<https://github.com/pytest-dev/pytest/discussions>`_ pointing to your existing pytest plugin repository which must have
 the following:
 
 - PyPI presence with packaging metadata that contains a ``pytest-``
diff --git a/changelog/13308.improvement.rst b/changelog/13308.improvement.rst
@@ -0,0 +1 @@
+Added official support for Python 3.14.
diff --git a/changelog/13312.bugfix.rst b/changelog/13312.bugfix.rst
@@ -0,0 +1 @@
+Fixed a possible ``KeyError`` crash on PyPy during collection of tests involving higher-scoped parameters.
diff --git a/changelog/13420.improvement.rst b/changelog/13420.improvement.rst
@@ -0,0 +1 @@
+Improved test collection performance by optimizing path resolution used in ``FSCollector``.
diff --git a/doc/en/contact.rst b/doc/en/contact.rst
@@ -35,7 +35,6 @@ Mail
 ----
 
 - `Testing In Python`_: a mailing list for Python testing tools and discussion.
-- `pytest-dev at python.org`_ a mailing list for pytest specific announcements and discussions.
 - Mail to `core@pytest.org <mailto:core@pytest.org>`_ for topics that cannot be
   discussed in public. Mails sent there will be distributed among the members
   in the pytest core team, who can also be contacted individually:
@@ -58,4 +57,3 @@ Other
 .. _`pytest issue tracker`: https://github.com/pytest-dev/pytest/issues
 .. _`pytest discussions`: https://github.com/pytest-dev/pytest/discussions
 .. _`Testing in Python`: http://lists.idyll.org/listinfo/testing-in-python
-.. _`pytest-dev at python.org`: http://mail.python.org/mailman/listinfo/pytest-dev
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,6 +38,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Testing",
     "Topic :: Utilities",
@@ -349,7 +350,7 @@ ignore = "W009"
 
 [tool.pyproject-fmt]
 indent = 4
-max_supported_python = "3.13"
+max_supported_python = "3.14"
 
 [tool.pytest.ini_options]
 minversion = "2.0"
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
@@ -286,10 +286,18 @@ def reorder_items_atscope(
                     for other_scope in HIGH_SCOPES:
                         other_scoped_items_by_argkey = items_by_argkey[other_scope]
                         for argkey in argkeys_by_item[other_scope].get(i, ()):
-                            other_scoped_items_by_argkey[argkey][i] = None
-                            other_scoped_items_by_argkey[argkey].move_to_end(
-                                i, last=False
-                            )
+                            argkey_dict = other_scoped_items_by_argkey[argkey]
+                            if not hasattr(sys, "pypy_version_info"):
+                                argkey_dict[i] = None
+                                argkey_dict.move_to_end(i, last=False)
+                            else:
+                                # Work around a bug in PyPy:
+                                # https://github.com/pypy/pypy/issues/5257
+                                # https://github.com/pytest-dev/pytest/issues/13312
+                                bkp = argkey_dict.copy()
+                                argkey_dict.clear()
+                                argkey_dict[i] = None
+                                argkey_dict.update(bkp)
                 break
         if no_argkey_items:
             reordered_no_argkey_items = reorder_items_atscope(
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py
@@ -38,7 +38,6 @@
 from _pytest.mark.structures import NodeKeywords
 from _pytest.outcomes import fail
 from _pytest.pathlib import absolutepath
-from _pytest.pathlib import commonpath
 from _pytest.stash import Stash
 from _pytest.warning_types import PytestWarning
 
@@ -548,10 +547,13 @@ def _traceback_filter(self, excinfo: ExceptionInfo[BaseException]) -> Traceback:
 def _check_initialpaths_for_relpath(
     initial_paths: frozenset[Path], path: Path
 ) -> str | None:
-    for initial_path in initial_paths:
-        if commonpath(path, initial_path) == initial_path:
-            rel = str(path.relative_to(initial_path))
-            return "" if rel == "." else rel
+    if path in initial_paths:
+        return ""
+
+    for parent in path.parents:
+        if parent in initial_paths:
+            return str(path.relative_to(parent))
+
     return None
 
 
diff --git a/src/_pytest/pastebin.py b/src/_pytest/pastebin.py
@@ -76,6 +76,7 @@ def create_new_paste(contents: str | bytes) -> str:
     :returns: URL to the pasted contents, or an error message.
     """
     import re
+    from urllib.error import HTTPError
     from urllib.parse import urlencode
     from urllib.request import urlopen
 
@@ -85,8 +86,11 @@ def create_new_paste(contents: str | bytes) -> str:
         response: str = (
             urlopen(url, data=urlencode(params).encode("ascii")).read().decode("utf-8")
         )
-    except OSError as exc_info:  # urllib errors
-        return f"bad response: {exc_info}"
+    except HTTPError as e:
+        with e:  # HTTPErrors are also http responses that must be closed!
+            return f"bad response: {e}"
+    except OSError as e:  # eg urllib.error.URLError
+        return f"bad response: {e}"
     m = re.search(r'href="/raw/(\w+)"', response)
     if m:
         return f"{url}/show/{m.group(1)}"
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
@@ -10,6 +10,8 @@
 import sys
 import types
 
+import setuptools
+
 from _pytest.config import ExitCode
 from _pytest.pathlib import symlink_or_skip
 from _pytest.pytester import Pytester
@@ -722,10 +724,14 @@ def test_cmdline_python_package(self, pytester: Pytester, monkeypatch) -> None:
         assert result.ret != 0
         result.stderr.fnmatch_lines(["*not*found*test_missing*"])
 
-    def test_cmdline_python_namespace_package(
+    @pytest.mark.skipif(
+        int(setuptools.__version__.split(".")[0]) >= 80,
+        reason="modern setuptools removing pkg_resources",
+    )
+    def test_cmdline_python_legacy_namespace_package(
         self, pytester: Pytester, monkeypatch
     ) -> None:
-        """Test --pyargs option with namespace packages (#1567).
+        """Test --pyargs option with legacy namespace packages (#1567).
 
         Ref: https://packaging.python.org/guides/packaging-namespace-packages/
         """
diff --git a/testing/python/raises.py b/testing/python/raises.py
@@ -1,6 +1,7 @@
 # mypy: allow-untyped-defs
 from __future__ import annotations
 
+import io
 import re
 import sys
 
@@ -399,7 +400,11 @@ def test_issue_11872(self) -> None:
 
         https://github.com/python/cpython/issues/98778
         """
+        from email.message import Message
         from urllib.error import HTTPError
 
-        with pytest.raises(HTTPError, match="Not Found"):
-            raise HTTPError(code=404, msg="Not Found", fp=None, hdrs=None, url="")  # type: ignore [arg-type]
+        with pytest.raises(HTTPError, match="Not Found") as exc_info:
+            raise HTTPError(
+                code=404, msg="Not Found", fp=io.BytesIO(), hdrs=Message(), url=""
+            )
+        exc_info.value.close()  # avoid a resource warning
diff --git a/testing/test_debugging.py b/testing/test_debugging.py
@@ -1373,6 +1373,10 @@ def do_quit(self, *args):
     result.stdout.fnmatch_lines(["*runcall_called*", "* 1 passed in *"])
 
 
+@pytest.mark.xfail(
+    sys.version_info >= (3, 14),
+    reason="C-D now quits the test session, rather than failing the test. See https://github.com/python/cpython/issues/124703",
+)
 def test_raises_bdbquit_with_eoferror(pytester: Pytester) -> None:
     """It is not guaranteed that DontReadFromInput's read is called."""
     p1 = pytester.makepyfile(
@@ -1387,6 +1391,7 @@ def test(monkeypatch):
         """
     )
     result = pytester.runpytest(str(p1))
+    result.assert_outcomes(failed=1)
     result.stdout.fnmatch_lines(["E *BdbQuit", "*= 1 failed in*"])
     assert result.ret == 1
 
diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py
@@ -8,6 +8,8 @@
 import sys
 import textwrap
 
+import setuptools
+
 from _pytest.monkeypatch import MonkeyPatch
 from _pytest.pytester import Pytester
 import pytest
@@ -429,6 +431,10 @@ class A:
 
 
 @pytest.mark.filterwarnings(r"ignore:.*\bpkg_resources\b:DeprecationWarning")
+@pytest.mark.skipif(
+    int(setuptools.__version__.split(".")[0]) >= 80,
+    reason="modern setuptools removing pkg_resources",
+)
 def test_syspath_prepend_with_namespace_packages(
     pytester: Pytester, monkeypatch: MonkeyPatch
 ) -> None:
diff --git a/testing/test_parseopt.py b/testing/test_parseopt.py
@@ -28,7 +28,7 @@ def test_no_help_by_default(self) -> None:
 
     def test_custom_prog(self, parser: parseopt.Parser) -> None:
         """Custom prog can be set for `argparse.ArgumentParser`."""
-        assert parser._getparser().prog == os.path.basename(sys.argv[0])
+        assert parser._getparser().prog == argparse.ArgumentParser().prog
         parser.prog = "custom-prog"
         assert parser._getparser().prog == "custom-prog"
 
diff --git a/testing/test_pastebin.py b/testing/test_pastebin.py
@@ -3,6 +3,7 @@
 
 import email.message
 import io
+from unittest import mock
 
 from _pytest.monkeypatch import MonkeyPatch
 from _pytest.pytester import Pytester
@@ -90,23 +91,6 @@ class TestPaste:
     def pastebin(self, request):
         return request.config.pluginmanager.getplugin("pastebin")
 
-    @pytest.fixture
-    def mocked_urlopen_fail(self, monkeypatch: MonkeyPatch):
-        """Monkeypatch the actual urlopen call to emulate a HTTP Error 400."""
-        calls = []
-
-        import urllib.error
-        import urllib.request
-
-        def mocked(url, data):
-            calls.append((url, data))
-            raise urllib.error.HTTPError(
-                url, 400, "Bad request", email.message.Message(), io.BytesIO()
-            )
-
-        monkeypatch.setattr(urllib.request, "urlopen", mocked)
-        return calls
-
     @pytest.fixture
     def mocked_urlopen_invalid(self, monkeypatch: MonkeyPatch):
         """Monkeypatch the actual urlopen calls done by the internal plugin
@@ -158,10 +142,33 @@ def test_pastebin_invalid_url(self, pastebin, mocked_urlopen_invalid) -> None:
         )
         assert len(mocked_urlopen_invalid) == 1
 
-    def test_pastebin_http_error(self, pastebin, mocked_urlopen_fail) -> None:
-        result = pastebin.create_new_paste(b"full-paste-contents")
+    def test_pastebin_http_error(self, pastebin) -> None:
+        import urllib.error
+
+        with mock.patch(
+            "urllib.request.urlopen",
+            side_effect=urllib.error.HTTPError(
+                url="https://bpa.st",
+                code=400,
+                msg="Bad request",
+                hdrs=email.message.Message(),
+                fp=io.BytesIO(),
+            ),
+        ) as mock_urlopen:
+            result = pastebin.create_new_paste(b"full-paste-contents")
         assert result == "bad response: HTTP Error 400: Bad request"
-        assert len(mocked_urlopen_fail) == 1
+        assert len(mock_urlopen.mock_calls) == 1
+
+    def test_pastebin_url_error(self, pastebin) -> None:
+        import urllib.error
+
+        with mock.patch(
+            "urllib.request.urlopen",
+            side_effect=urllib.error.URLError("the url was bad"),
+        ) as mock_urlopen:
+            result = pastebin.create_new_paste(b"full-paste-contents")
+        assert result == "bad response: <urlopen error the url was bad>"
+        assert len(mock_urlopen.mock_calls) == 1
 
     def test_create_new_paste(self, pastebin, mocked_urlopen) -> None:
         result = pastebin.create_new_paste(b"full-paste-contents")
diff --git a/testing/test_unraisableexception.py b/testing/test_unraisableexception.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Added official support for Python 3.14.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed a possible ``KeyError`` crash on PyPy during collection of tests involving higher-scoped parameters.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Improved test collection performance by optimizing path resolution used in ``FSCollector``.