Merge branch 'main' into fix-13537

gomri15 · web-flow · commit 3aa539100c86 · 2025-10-15T21:57:55.000+03:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -31,7 +31,7 @@ jobs:
         persist-credentials: false
 
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076
+      uses: hynek/build-and-inspect-python-package@efb823f52190ad02594531168b7a2d5790e66516
       with:
         attest-build-provenance-github: 'true'
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
         fetch-depth: 0
         persist-credentials: false
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@c52c3a4710070b50470d903818a7b25115dcd076
+      uses: hynek/build-and-inspect-python-package@efb823f52190ad02594531168b7a2d5790e66516
 
   build:
     needs: [package]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.13.3"
+  rev: "v0.14.0"
   hooks:
     - id: ruff-check
       args: ["--fix"]
@@ -66,13 +66,13 @@ repos:
         # Manual because passing pyright is a work in progress.
         stages: [manual]
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.7.0"
+  rev: "v2.10.0"
   hooks:
     - id: pyproject-fmt
       # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
       additional_dependencies: ["tox>=4.9"]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
+    rev: v3.21.0
     hooks:
     -   id: pyupgrade
         args:
diff --git a/changelog/13574.improvement.rst b/changelog/13574.improvement.rst
@@ -0,0 +1,7 @@
+The single argument ``--version`` no longer loads the entire plugin infrastructure, making it faster and more reliable when displaying only the pytest version.
+
+Passing ``--version`` twice (e.g., ``pytest --version --version``) retains the original behavior, showing both the pytest version and plugin information.
+
+.. note::
+
+    Since ``--version`` is now processed early, it only takes effect when passed directly via the command line. It will not work if set through other mechanisms, such as :envvar:`PYTEST_ADDOPTS` or :confval:`addopts`.
diff --git a/changelog/13807.deprecation.rst b/changelog/13807.deprecation.rst
@@ -0,0 +1,3 @@
+:meth:`monkeypatch.syspath_prepend() <pytest.MonkeyPatch.syspath_prepend>` now issues a deprecation warning when the prepended path contains legacy namespace packages (those using ``pkg_resources.declare_namespace()``).
+Users should migrate to native namespace packages (:pep:`420`).
+See :ref:`monkeypatch-fixup-namespace-packages` for details.
diff --git a/doc/en/deprecations.rst b/doc/en/deprecations.rst
@@ -15,6 +15,41 @@ Below is a complete list of all pytest features which are considered deprecated.
 :class:`~pytest.PytestWarning` or subclasses, which can be filtered using :ref:`standard warning filters <warnings>`.
 
 
+.. _monkeypatch-fixup-namespace-packages:
+
+``monkeypatch.syspath_prepend`` with legacy namespace packages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 9.0
+
+When using :meth:`monkeypatch.syspath_prepend() <pytest.MonkeyPatch.syspath_prepend>`,
+pytest automatically calls ``pkg_resources.fixup_namespace_packages()`` if ``pkg_resources`` is imported.
+This is only needed for legacy namespace packages that use ``pkg_resources.declare_namespace()``.
+
+Legacy namespace packages are deprecated in favor of native namespace packages (:pep:`420`).
+If you are using ``pkg_resources.declare_namespace()`` in your ``__init__.py`` files,
+you should migrate to native namespace packages by removing the ``__init__.py`` files from your namespace packages.
+
+This deprecation warning will only be issued when:
+
+1. ``pkg_resources`` is imported, and
+2. The specific path being prepended contains a declared namespace package (via ``pkg_resources.declare_namespace()``)
+
+To fix this warning, convert your legacy namespace packages to native namespace packages:
+
+**Legacy namespace package** (deprecated):
+
+.. code-block:: python
+
+    # mypkg/__init__.py
+    __import__("pkg_resources").declare_namespace(__name__)
+
+**Native namespace package** (recommended):
+
+Simply remove the ``__init__.py`` file entirely.
+Python 3.3+ natively supports namespace packages without ``__init__.py``.
+
+
 .. _sync-test-async-fixture:
 
 sync test depending on async fixture
diff --git a/doc/en/reference/plugin_list.rst b/doc/en/reference/plugin_list.rst
diff --git a/src/_pytest/config/__init__.py b/src/_pytest/config/__init__.py
@@ -110,6 +110,8 @@ class ExitCode(enum.IntEnum):
     #: pytest couldn't find tests.
     NO_TESTS_COLLECTED = 5
 
+    __module__ = "pytest"
+
 
 class ConftestImportFailure(Exception):
     def __init__(
@@ -149,11 +151,17 @@ def main(
 
     :returns: An exit code.
     """
+    # Handle a single `--version` argument early to avoid starting up the entire pytest infrastructure.
+    new_args = sys.argv[1:] if args is None else args
+    if isinstance(new_args, Sequence) and new_args.count("--version") == 1:
+        sys.stdout.write(f"pytest {__version__}\n")
+        return ExitCode.OK
+
     old_pytest_version = os.environ.get("PYTEST_VERSION")
     try:
         os.environ["PYTEST_VERSION"] = __version__
         try:
-            config = _prepareconfig(args, plugins)
+            config = _prepareconfig(new_args, plugins)
         except ConftestImportFailure as e:
             exc_info = ExceptionInfo.from_exception(e.cause)
             tw = TerminalWriter(sys.stderr)
@@ -261,7 +269,6 @@ def directory_arg(path: str, optname: str) -> str:
     "junitxml",
     "doctest",
     "cacheprovider",
-    "freeze_support",
     "setuponly",
     "setupplan",
     "stepwise",
@@ -317,12 +324,10 @@ def get_plugin_manager() -> PytestPluginManager:
 
 
 def _prepareconfig(
-    args: list[str] | os.PathLike[str] | None = None,
+    args: list[str] | os.PathLike[str],
     plugins: Sequence[str | _PluggyPlugin] | None = None,
 ) -> Config:
-    if args is None:
-        args = sys.argv[1:]
-    elif isinstance(args, os.PathLike):
+    if isinstance(args, os.PathLike):
         args = [os.fspath(args)]
     elif not isinstance(args, list):
         msg = (  # type:ignore[unreachable]
@@ -1145,13 +1150,15 @@ def pytest_cmdline_parse(
         try:
             self.parse(args)
         except UsageError:
-            # Handle --version and --help here in a minimal fashion.
+            # Handle `--version --version` and `--help` here in a minimal fashion.
             # This gets done via helpconfig normally, but its
             # pytest_cmdline_main is not called in case of errors.
             if getattr(self.option, "version", False) or "--version" in args:
-                from _pytest.helpconfig import showversion
+                from _pytest.helpconfig import show_version_verbose
 
-                showversion(self)
+                # Note that `--version` (single argument) is handled early by `Config.main()`, so the only
+                # way we are reaching this point is via `--version --version`.
+                show_version_verbose(self)
             elif (
                 getattr(self.option, "help", False) or "--help" in args or "-h" in args
             ):
diff --git a/src/_pytest/config/exceptions.py b/src/_pytest/config/exceptions.py
@@ -7,6 +7,8 @@
 class UsageError(Exception):
     """Error in pytest usage or invocation."""
 
+    __module__ = "pytest"
+
 
 class PrintHelp(Exception):
     """Raised when pytest should print its help to skip the rest of the
diff --git a/src/_pytest/deprecated.py b/src/_pytest/deprecated.py
@@ -15,6 +15,7 @@
 
 from _pytest.warning_types import PytestDeprecationWarning
 from _pytest.warning_types import PytestRemovedIn9Warning
+from _pytest.warning_types import PytestRemovedIn10Warning
 from _pytest.warning_types import UnformattedWarning
 
 
@@ -66,6 +67,13 @@
     "See docs: https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function"
 )
 
+MONKEYPATCH_LEGACY_NAMESPACE_PACKAGES = PytestRemovedIn10Warning(
+    "monkeypatch.syspath_prepend() called with pkg_resources legacy namespace packages detected.\n"
+    "Legacy namespace packages (using pkg_resources.declare_namespace) are deprecated.\n"
+    "Please use native namespace packages (PEP 420) instead.\n"
+    "See https://docs.pytest.org/en/stable/deprecations.html#monkeypatch-fixup-namespace-packages"
+)
+
 # You want to make some `__init__` or function "private".
 #
 #   def my_private_function(some, args):
diff --git a/src/_pytest/helpconfig.py b/src/_pytest/helpconfig.py
@@ -140,28 +140,28 @@ def unset_tracing() -> None:
     return config
 
 
-def showversion(config: Config) -> None:
-    if config.option.version > 1:
-        sys.stdout.write(
-            f"This is pytest version {pytest.__version__}, imported from {pytest.__file__}\n"
-        )
-        plugininfo = getpluginversioninfo(config)
-        if plugininfo:
-            for line in plugininfo:
-                sys.stdout.write(line + "\n")
-    else:
-        sys.stdout.write(f"pytest {pytest.__version__}\n")
+def show_version_verbose(config: Config) -> None:
+    """Show verbose pytest version installation, including plugins."""
+    sys.stdout.write(
+        f"This is pytest version {pytest.__version__}, imported from {pytest.__file__}\n"
+    )
+    plugininfo = getpluginversioninfo(config)
+    if plugininfo:
+        for line in plugininfo:
+            sys.stdout.write(line + "\n")
 
 
 def pytest_cmdline_main(config: Config) -> int | ExitCode | None:
-    if config.option.version > 0:
-        showversion(config)
-        return 0
+    # Note: a single `--version` argument is handled directly by `Config.main()` to avoid starting up the entire
+    # pytest infrastructure just to display the version (#13574).
+    if config.option.version > 1:
+        show_version_verbose(config)
+        return ExitCode.OK
     elif config.option.help:
         config._do_configure()
         showhelp(config)
         config._ensure_unconfigure()
-        return 0
+        return ExitCode.OK
     return None
 
 
diff --git a/src/_pytest/monkeypatch.py b/src/_pytest/monkeypatch.py
@@ -8,6 +8,7 @@
 from collections.abc import MutableMapping
 from contextlib import contextmanager
 import os
+from pathlib import Path
 import re
 import sys
 from typing import Any
@@ -16,6 +17,7 @@
 from typing import TypeVar
 import warnings
 
+from _pytest.deprecated import MONKEYPATCH_LEGACY_NAMESPACE_PACKAGES
 from _pytest.fixtures import fixture
 from _pytest.warning_types import PytestWarning
 
@@ -346,8 +348,26 @@ def syspath_prepend(self, path) -> None:
         # https://github.com/pypa/setuptools/blob/d8b901bc/docs/pkg_resources.txt#L162-L171
         # this is only needed when pkg_resources was already loaded by the namespace package
         if "pkg_resources" in sys.modules:
+            import pkg_resources
             from pkg_resources import fixup_namespace_packages
 
+            # Only issue deprecation warning if this call would actually have an
+            # effect for this specific path.
+            if (
+                hasattr(pkg_resources, "_namespace_packages")
+                and pkg_resources._namespace_packages
+            ):
+                path_obj = Path(str(path))
+                for ns_pkg in pkg_resources._namespace_packages:
+                    if ns_pkg is None:
+                        continue
+                    ns_pkg_path = path_obj / ns_pkg.replace(".", os.sep)
+                    if ns_pkg_path.is_dir():
+                        warnings.warn(
+                            MONKEYPATCH_LEGACY_NAMESPACE_PACKAGES, stacklevel=2
+                        )
+                        break
+
             fixup_namespace_packages(str(path))
 
         # A call to syspathinsert() usually means that the caller wants to
diff --git a/testing/plugins_integration/requirements.txt b/testing/plugins_integration/requirements.txt
@@ -7,7 +7,7 @@ pytest-django==4.11.1
 pytest-flakes==4.0.5
 pytest-html==4.1.1
 pytest-mock==3.15.1
-pytest-rerunfailures==16.0.1
+pytest-rerunfailures==16.1
 pytest-sugar==1.1.1
 pytest-trio==0.8.0
 pytest-twisted==1.14.3
diff --git a/testing/test_capture.py b/testing/test_capture.py
@@ -868,7 +868,7 @@ def bad_snap(self):
         FDCapture.snap = bad_snap
     """
     )
-    result = pytester.runpytest_subprocess("-p", "pytest_xyz", "--version")
+    result = pytester.runpytest_subprocess("-p", "pytest_xyz")
     result.stderr.fnmatch_lines(
         ["*in bad_snap", "    raise Exception('boom')", "Exception: boom"]
     )
diff --git a/testing/test_config.py b/testing/test_config.py
@@ -612,20 +612,14 @@ def pytest_addoption(parser):
         assert config.getini("custom") == "1"
 
     def test_absolute_win32_path(self, pytester: Pytester) -> None:
-        temp_ini_file = pytester.makefile(
-            ".ini",
-            custom="""
-            [pytest]
-            addopts = --version
-        """,
-        )
+        temp_ini_file = pytester.makeini("[pytest]")
         from os.path import normpath
 
         temp_ini_file_norm = normpath(str(temp_ini_file))
         ret = pytest.main(["-c", temp_ini_file_norm])
-        assert ret == ExitCode.OK
+        assert ret == ExitCode.NO_TESTS_COLLECTED
         ret = pytest.main(["--config-file", temp_ini_file_norm])
-        assert ret == ExitCode.OK
+        assert ret == ExitCode.NO_TESTS_COLLECTED
 
 
 class TestConfigAPI:
@@ -2121,7 +2115,7 @@ def pytest_addoption(parser):
 
     result = pytester.runpytest("--version")
     result.stdout.fnmatch_lines([f"pytest {pytest.__version__}"])
-    assert result.ret == ExitCode.USAGE_ERROR
+    assert result.ret == ExitCode.OK
 
 
 def test_help_formatter_uses_py_get_terminal_width(monkeypatch: MonkeyPatch) -> None:
diff --git a/testing/test_helpconfig.py b/testing/test_helpconfig.py
@@ -10,29 +10,29 @@ def test_version_verbose(pytester: Pytester, pytestconfig, monkeypatch) -> None:
     monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD")
     monkeypatch.delenv("PYTEST_PLUGINS", raising=False)
     result = pytester.runpytest("--version", "--version")
-    assert result.ret == 0
+    assert result.ret == ExitCode.OK
     result.stdout.fnmatch_lines([f"*pytest*{pytest.__version__}*imported from*"])
     if pytestconfig.pluginmanager.list_plugin_distinfo():
         result.stdout.fnmatch_lines(["*registered third-party plugins:", "*at*"])
 
 
-def test_version_less_verbose(pytester: Pytester, pytestconfig, monkeypatch) -> None:
-    monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD")
-    monkeypatch.delenv("PYTEST_PLUGINS", raising=False)
-    result = pytester.runpytest("--version")
-    assert result.ret == 0
-    result.stdout.fnmatch_lines([f"pytest {pytest.__version__}"])
+def test_version_less_verbose(pytester: Pytester) -> None:
+    """Single ``--version`` parameter should display only the pytest version, without loading plugins (#13574)."""
+    pytester.makeconftest("print('This should not be printed')")
+    result = pytester.runpytest_subprocess("--version")
+    assert result.ret == ExitCode.OK
+    assert result.stdout.str().strip() == f"pytest {pytest.__version__}"
 
 
-def test_versions():
+def test_versions() -> None:
     """Regression check for the public version attributes in pytest."""
     assert isinstance(pytest.__version__, str)
     assert isinstance(pytest.version_tuple, tuple)
 
 
 def test_help(pytester: Pytester) -> None:
     result = pytester.runpytest("--help")
-    assert result.ret == 0
+    assert result.ret == ExitCode.OK
     result.stdout.fnmatch_lines(
         """
           -m MARKEXPR           Only run tests matching given mark expression. For
@@ -73,7 +73,7 @@ def pytest_addoption(parser):
     """
     )
     result = pytester.runpytest("--help")
-    assert result.ret == 0
+    assert result.ret == ExitCode.OK
     lines = [
         "  required_plugins (args):",
         "                        Plugins that must be present for pytest to run*",
@@ -91,7 +91,7 @@ def pytest_hello(xyz):
     """
     )
     result = pytester.runpytest()
-    assert result.ret != 0
+    assert result.ret != ExitCode.OK
     result.stdout.fnmatch_lines(["*unknown hook*pytest_hello*"])
 
 
diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+:meth:`monkeypatch.syspath_prepend() <pytest.MonkeyPatch.syspath_prepend>` now issues a deprecation warning when the prepended path contains legacy namespace packages (those using ``pkg_resources.declare_namespace()``).
	`2`	+Users should migrate to native namespace packages (:pep:`420`).
	`3`	+See :ref:`monkeypatch-fixup-namespace-packages` for details.