Merge branch 'main' into faulthandler-exit-on-timeout

Author: ogrisel

.github/workflows/test.yml

@@ -56,32 +56,29 @@ jobs:
       fail-fast: false
       matrix:
         name: [
-          "windows-py39-unittest-asynctest",
-          "windows-py39-unittest-twisted24",
-          "windows-py39-unittest-twisted25",
-          "windows-py39-pluggy",
-          "windows-py39-xdist",
-          "windows-py310",
+          "windows-py310-unittest-asynctest",
+          "windows-py310-unittest-twisted24",
+          "windows-py310-unittest-twisted25",
+          "windows-py310-pluggy",
+          "windows-py310-xdist",
           "windows-py311",
           "windows-py312",
           "windows-py313",
           "windows-py314",
 
-          "ubuntu-py39-unittest-asynctest",
-          "ubuntu-py39-unittest-twisted24",
-          "ubuntu-py39-unittest-twisted25",
-          "ubuntu-py39-lsof-numpy-pexpect",
-          "ubuntu-py39-pluggy",
-          "ubuntu-py39-freeze",
-          "ubuntu-py39-xdist",
+          "ubuntu-py310-unittest-asynctest",
+          "ubuntu-py310-unittest-twisted24",
+          "ubuntu-py310-unittest-twisted25",
+          "ubuntu-py310-lsof-numpy-pexpect",
+          "ubuntu-py310-pluggy",
+          "ubuntu-py310-freeze",
           "ubuntu-py310-xdist",
           "ubuntu-py311",
           "ubuntu-py312",
           "ubuntu-py313-pexpect",
           "ubuntu-py314",
           "ubuntu-pypy3-xdist",
 
-          "macos-py39",
           "macos-py310",
           "macos-py312",
           "macos-py313",
@@ -93,35 +90,31 @@ jobs:
 
         include:
           # Use separate jobs for different unittest flavors (twisted, asynctest) to ensure proper coverage.
-          - name: "windows-py39-unittest-asynctest"
-            python: "3.9"
+          - name: "windows-py310-unittest-asynctest"
+            python: "3.10"
             os: windows-latest
-            tox_env: "py39-asynctest"
+            tox_env: "py310-asynctest"
             use_coverage: true
 
-          - name: "windows-py39-unittest-twisted24"
-            python: "3.9"
+          - name: "windows-py310-unittest-twisted24"
+            python: "3.10"
             os: windows-latest
-            tox_env: "py39-twisted24"
+            tox_env: "py310-twisted24"
             use_coverage: true
 
-          - name: "windows-py39-unittest-twisted25"
-            python: "3.9"
+          - name: "windows-py310-unittest-twisted25"
+            python: "3.10"
             os: windows-latest
-            tox_env: "py39-twisted25"
+            tox_env: "py310-twisted25"
             use_coverage: true
 
-          - name: "windows-py39-pluggy"
-            python: "3.9"
-            os: windows-latest
-            tox_env: "py39-pluggymain-pylib-xdist"
-
-          - name: "windows-py39-xdist"
-            python: "3.9"
+          - name: "windows-py310-pluggy"
+            python: "3.10"
             os: windows-latest
-            tox_env: "py39-xdist"
+            tox_env: "py310-pluggymain-pylib-xdist"
+            xfail: true
 
-          - name: "windows-py310"
+          - name: "windows-py310-xdist"
             python: "3.10"
             os: windows-latest
             tox_env: "py310-xdist"
@@ -140,51 +133,49 @@ jobs:
             python: "3.13"
             os: windows-latest
             tox_env: "py313"
+            xfail: true
 
           - name: "windows-py314"
             python: "3.14"
             os: windows-latest
             tox_env: "py314"
 
           # Use separate jobs for different unittest flavors (twisted, asynctest) to ensure proper coverage.
-          - name: "ubuntu-py39-unittest-asynctest"
-            python: "3.9"
+          - name: "ubuntu-py310-unittest-asynctest"
+            python: "3.10"
             os: ubuntu-latest
-            tox_env: "py39-asynctest"
+            tox_env: "py310-asynctest"
             use_coverage: true
 
-          - name: "ubuntu-py39-unittest-twisted24"
-            python: "3.9"
+          - name: "ubuntu-py310-unittest-twisted24"
+            python: "3.10"
             os: ubuntu-latest
-            tox_env: "py39-twisted24"
+            tox_env: "py310-twisted24"
             use_coverage: true
 
-          - name: "ubuntu-py39-unittest-twisted25"
-            python: "3.9"
+          - name: "ubuntu-py310-unittest-twisted25"
+            python: "3.10"
             os: ubuntu-latest
-            tox_env: "py39-twisted25"
+            tox_env: "py310-twisted25"
             use_coverage: true
 
-          - name: "ubuntu-py39-lsof-numpy-pexpect"
-            python: "3.9"
+          - name: "ubuntu-py310-lsof-numpy-pexpect"
+            python: "3.10"
             os: ubuntu-latest
-            tox_env: "py39-lsof-numpy-pexpect"
+            tox_env: "py310-lsof-numpy-pexpect"
             use_coverage: true
 
-          - name: "ubuntu-py39-pluggy"
-            python: "3.9"
-            os: ubuntu-latest
-            tox_env: "py39-pluggymain-pylib-xdist"
-
-          - name: "ubuntu-py39-freeze"
-            python: "3.9"
+          - name: "ubuntu-py310-pluggy"
+            python: "3.10"
             os: ubuntu-latest
-            tox_env: "py39-freeze"
+            tox_env: "py310-pluggymain-pylib-xdist"
+            xfail: true
 
-          - name: "ubuntu-py39-xdist"
-            python: "3.9"
+          - name: "ubuntu-py310-freeze"
+            python: "3.10"
             os: ubuntu-latest
-            tox_env: "py39-xdist"
+            tox_env: "py310-freeze"
+            xfail: true
 
           - name: "ubuntu-py310-xdist"
             python: "3.10"
@@ -208,6 +199,7 @@ jobs:
             os: ubuntu-latest
             tox_env: "py313-pexpect"
             use_coverage: true
+            xfail: true
 
           - name: "ubuntu-py314"
             python: "3.14"
@@ -216,21 +208,16 @@ jobs:
             use_coverage: true
 
           - name: "ubuntu-pypy3-xdist"
-            python: "pypy-3.9"
+            python: "pypy-3.10"
             os: ubuntu-latest
             tox_env: "pypy3-xdist"
 
 
-          - name: "macos-py39"
-            python: "3.9"
-            os: macos-latest
-            tox_env: "py39-xdist"
-            use_coverage: true
-
           - name: "macos-py310"
             python: "3.10"
             os: macos-latest
             tox_env: "py310-xdist"
+            xfail: true
 
           - name: "macos-py312"
             python: "3.12"
@@ -241,6 +228,7 @@ jobs:
             python: "3.13"
             os: macos-latest
             tox_env: "py313-xdist"
+            xfail: true
 
           - name: "macos-py314"
             python: "3.14"
@@ -254,30 +242,12 @@ jobs:
 
 
           - name: "doctesting"
-            python: "3.9"
+            python: "3.10"
             os: ubuntu-latest
             tox_env: "doctesting"
             use_coverage: true
 
-    continue-on-error: >-
-      ${{
-        contains(
-          fromJSON(
-            '[
-              "windows-py39-pluggy",
-              "windows-py313",
-              "ubuntu-py39-pluggy",
-              "ubuntu-py39-freeze",
-              "ubuntu-py313",
-              "macos-py39",
-              "macos-py313"
-            ]'
-          ),
-          matrix.name
-        )
-        && true
-        || false
-      }}
+    continue-on-error: ${{ matrix.xfail && true || false }}
 
     steps:
     - uses: actions/checkout@v5

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.12.12"
+  rev: "v0.13.1"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.12.1
+  rev: v1.13.0
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs
@@ -32,7 +32,7 @@ repos:
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
+    rev: v1.18.2
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)
@@ -76,7 +76,7 @@ repos:
     hooks:
     -   id: pyupgrade
         args:
-          - "--py39-plus"
+          - "--py310-plus"
         # Manual because ruff does what pyupgrade does and the two are not out of sync
         # often enough to make launching pyupgrade everytime worth it
         stages: [manual]

AUTHORS

@@ -201,6 +201,7 @@ Ilya Konstantinov
 Ionuț Turturică
 Isaac Virshup
 Israel Fruchter
+Israël Hallé
 Itxaso Aizpurua
 Iwan Briquemont
 Jaap Broekhuizen

CONTRIBUTING.rst

@@ -197,7 +197,7 @@ Short version
 #. Follow `PEP-8 <https://www.python.org/dev/peps/pep-0008/>`_ for naming.
 #. Tests are run using ``tox``::
 
-    tox -e linting,py39
+    tox -e linting,py313
 
    The test environments above are usually enough to cover most cases locally.
 
@@ -269,24 +269,24 @@ Here is a simple overview, with pytest-specific bits:
 
 #. Run all the tests
 
-   You need to have Python 3.9 or later available in your system.  Now
+   You need to have a supported Python version available in your system.  Now
    running tests is as simple as issuing this command::
 
-    $ tox -e linting,py39
+    $ tox -e linting,py
 
-   This command will run tests via the "tox" tool against Python 3.9
-   and also perform "lint" coding-style checks.
+   This command will run tests via the "tox" tool against your default Python
+   version and also perform "lint" coding-style checks.
 
 #. You can now edit your local working copy and run the tests again as necessary. Please follow `PEP-8 <https://www.python.org/dev/peps/pep-0008/>`_ for naming.
 
-   You can pass different options to ``tox``. For example, to run tests on Python 3.9 and pass options to pytest
+   You can pass different options to ``tox``. For example, to run tests on Python 3.13 and pass options to pytest
    (e.g. enter pdb on failure) to pytest you can do::
 
-    $ tox -e py39 -- --pdb
+    $ tox -e py313 -- --pdb
 
-   Or to only run tests in a particular test module on Python 3.9::
+   Or to only run tests in a particular test module on Python 3.12::
 
-    $ tox -e py39 -- testing/test_config.py
+    $ tox -e py312 -- testing/test_config.py
 
 
    When committing, ``pre-commit`` will re-format the files if necessary.

README.rst

@@ -97,7 +97,7 @@ Features
 - Can run `unittest <https://docs.pytest.org/en/stable/how-to/unittest.html>`_ (or trial)
   test suites out of the box
 
-- Python 3.9+ or PyPy3
+- Python 3.10+ or PyPy3
 
 - Rich plugin architecture, with over 1300+ `external plugins <https://docs.pytest.org/en/latest/reference/plugin_list.html>`_ and thriving community
 

changelog/13716.bugfix.rst

@@ -0,0 +1 @@
+Fixed a bug where a nonsensical invocation like ``pytest x.py[a]`` (a file cannot be parametrized) was silently treated as ``pytest x.py``. This is now a usage error.

changelog/13719.breaking.rst

@@ -0,0 +1 @@
+Support for Python 3.9 is dropped following its end of life.

changelog/13722.bugfix.rst

@@ -0,0 +1 @@
+Fixed a misleading assertion failure message when using :func:`pytest.approx` on mappings with differing lengths.

changelog/13732.improvement.rst

@@ -0,0 +1 @@
+Previously, when filtering warnings, pytest would fail if the filter referenced a class that could not be imported. Now, this only outputs a message indicating the problem.

doc/en/example/.ruff.toml

@@ -0,0 +1 @@
+ignore = ["RUF059"]