Merge remote-tracking branch 'origin/main' into support-python-3.14

# Conflicts:
#	.github/workflows/test.yml
#	ci/test_custom_linters.py

Author: adamtheturtle

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.14']
+        python-version: ['3.13']
         ci_pattern:
           - tests/mock_vws/test_query.py::TestContentType
           - tests/mock_vws/test_query.py::TestSuccess
@@ -114,13 +114,13 @@ jobs:
           - tests/mock_vws/test_update_target.py::TestInactiveProject
           - tests/mock_vws/test_requests_mock_usage.py
           - tests/mock_vws/test_respx_mock_usage.py
-          - tests/mock_vws/test_target_validators.py
           - tests/mock_vws/test_flask_app_usage.py
           - tests/mock_vws/test_vumark_generation_api.py
+          - tests/mock_vws/test_target_validators.py
           - tests/mock_vws/test_docker.py
+          - ci/test_custom_linters.py
           - README.rst
-          - docs/source/basic-example.rst
-          - docs/source/httpx-example.rst
+          - docs/
 
     steps:
       - uses: actions/checkout@v6
@@ -191,7 +191,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.14']
+        python-version: ['3.13']
         platform: [ubuntu-latest]
 
     steps:
@@ -237,7 +237,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ['3.14']
+        python-version: ['3.13']
 
     steps:
       - uses: actions/checkout@v6

ci/test_custom_linters.py

@@ -1,17 +1,11 @@
 """Custom lint tests."""
 
-import subprocess
-import sys
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 import pytest
 import yaml
 from beartype import beartype
 
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-
 
 @beartype
 def _ci_patterns(*, repository_root: Path) -> set[str]:
@@ -25,34 +19,44 @@ def _ci_patterns(*, repository_root: Path) -> set[str]:
     return ci_patterns
 
 
+class _CollectPlugin:
+    """Pytest plugin that records the node IDs of collected items."""
+
+    def __init__(self) -> None:
+        """Start with an empty set of collected node IDs."""
+        self.collected: set[str] = set()
+
+    def pytest_itemcollected(self, item: pytest.Item) -> None:
+        """Record each collected item's node ID."""
+        self.collected.add(item.nodeid)
+
+
 @beartype
-def _collect(
-    *, ci_pattern: str, repository_root: Path
-) -> subprocess.CompletedProcess[str]:
-    """Run ``pytest --collect-only`` for ``ci_pattern`` in a fresh
-    subprocess.
-
-    A real subprocess (not ``pytest.main``) is used so that plugin state
-    (notably ``pytest-beartype-tests`` re-wrapping the same test
-    functions) does not accumulate across iterations and trigger
-    ``Cannot stringify annotation containing string formatting`` under
-    Python 3.14 deferred annotations.
-    """
-    return subprocess.run(
+def _tests_from_pattern(*, ci_pattern: str) -> set[str]:
+    """From a CI pattern, get all tests ``pytest`` would collect."""
+    plugin = _CollectPlugin()
+    pytest.main(
         args=[
-            sys.executable,
-            "-m",
-            "pytest",
             "-q",
             "--collect-only",
+            # Disable pytest-retry to avoid:
+            # ```
+            # ValueError: no option named 'filtered_exceptions'
+            # ```
+            # which causes the nested run to exit with INTERNAL_ERROR
+            # before any items are collected.
+            "-p",
+            "no:pytest-retry",
+            # Disable warnings to avoid many instances of:
+            # ```
+            # Unknown config option: retry_delay
+            # ```
             "--disable-warnings",
             ci_pattern,
         ],
-        check=False,
-        cwd=repository_root,
-        capture_output=True,
-        text=True,
+        plugins=[plugin],
     )
+    return plugin.collected
 
 
 def test_ci_patterns_valid(request: pytest.FixtureRequest) -> None:
@@ -61,38 +65,43 @@ def test_ci_patterns_valid(request: pytest.FixtureRequest) -> None:
     test in
     the test suite.
     """
-    repository_root = request.config.rootpath
-    ci_patterns = _ci_patterns(repository_root=repository_root)
+    ci_patterns = _ci_patterns(repository_root=request.config.rootpath)
 
     for ci_pattern in ci_patterns:
-        result = _collect(
-            ci_pattern=ci_pattern,
-            repository_root=repository_root,
-        )
-        message = (
-            f'"{ci_pattern}" does not match any tests.\n'
-            f"stdout:\n{result.stdout}\nstderr:\n{result.stderr}"
+        collect_only_result = pytest.main(
+            args=[
+                "--collect-only",
+                ci_pattern,
+                # Disable pytest-retry to avoid:
+                # ```
+                # ValueError: no option named 'filtered_exceptions'
+                # ````
+                "-p",
+                "no:pytest-retry",
+                # Disable warnings to avoid many instances of:
+                # ```
+                # Unknown config option: retry_delay
+                # ```
+                "--disable-warnings",
+            ],
         )
-        assert result.returncode == 0, message
 
+        message = f'"{ci_pattern}" does not match any tests.'
+        assert collect_only_result == 0, message
 
-def test_tests_collected_once(
-    *,
-    request: pytest.FixtureRequest,
-) -> None:
+
+def test_tests_collected_once(request: pytest.FixtureRequest) -> None:
     """Each test in the test suite is collected exactly once.
 
     This does not necessarily mean that they are run - they may be skipped.
     """
-    repository_root = request.config.rootpath
-    ci_patterns = _ci_patterns(repository_root=repository_root)
+    ci_patterns = _ci_patterns(repository_root=request.config.rootpath)
+    all_tests = _tests_from_pattern(ci_pattern=".")
+    assert all_tests
     tests_to_patterns: dict[str, set[str]] = {}
 
     for pattern in ci_patterns:
-        tests = _tests_from_pattern(
-            ci_pattern=pattern,
-            repository_root=repository_root,
-        )
+        tests = _tests_from_pattern(ci_pattern=pattern)
         for test in tests:
             if test in tests_to_patterns:
                 tests_to_patterns[test].add(pattern)
@@ -107,32 +116,5 @@ def test_tests_collected_once(
         )
         assert len(patterns) == 1, message
 
-    all_tests = _tests_from_pattern(
-        ci_pattern=".",
-        repository_root=repository_root,
-    )
-    # Exclude this file's own meta-tests from the comparison: they are
-    # not part of any CI pattern by design (they validate the patterns).
-    all_tests = {t for t in all_tests if not t.startswith("ci/")}
     assert tests_to_patterns.keys() - all_tests == set()
     assert all_tests - tests_to_patterns.keys() == set()
-
-
-@beartype
-def _tests_from_pattern(
-    *,
-    ci_pattern: str,
-    repository_root: Path,
-) -> set[str]:
-    """From a CI pattern, get all tests ``pytest`` would collect."""
-    result = _collect(
-        ci_pattern=ci_pattern,
-        repository_root=repository_root,
-    )
-    tests: Iterable[str] = set()
-    for line in result.stdout.splitlines():
-        # We filter empty lines and lines which look like
-        # "9 tests collected in 0.01s".
-        if line and "collected in" not in line:
-            tests = {*tests, line}
-    return set(tests)

pyproject.toml

@@ -423,6 +423,7 @@ ignore_names = [
     # pytest configuration
     "pytest_collect_file",
     "pytest_collection_modifyitems",
+    "pytest_itemcollected",
     "pytest_plugins",
     "pytest_set_filtered_exceptions",
     "pytest_addoption",