Merge branch 'main' into 13759-public-interface-for-matchmarker

Author: gomri15

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.13.2"
+  rev: "v0.13.3"
   hooks:
     - id: ruff-check
       args: ["--fix"]
@@ -48,7 +48,7 @@ repos:
             # on <3.11
           - exceptiongroup>=1.0.0rc8
 -   repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.405
+    rev: v1.1.406
     hooks:
     -   id: pyright
         files: ^(src/|scripts/)
@@ -66,7 +66,7 @@ repos:
         # Manual because passing pyright is a work in progress.
         stages: [manual]
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.6.0"
+  rev: "v2.7.0"
   hooks:
     - id: pyproject-fmt
       # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version

AUTHORS

@@ -320,6 +320,7 @@ Mike Hoyle (hoylemd)
 Mike Lundy
 Milan Lesnek
 Miro Hrončok
+Mulat Mekonen
 mrbean-bremen
 Nathan Goldbaum
 Nathan Rousseau
@@ -342,6 +343,7 @@ Oleg Sushchenko
 Oleksandr Zavertniev
 Olga Matoula
 Oliver Bestwalter
+Olivier Grisel
 Omar Kohl
 Omer Hadari
 Ondřej Súkup
@@ -382,6 +384,7 @@ Reza Mousavi
 Raquel Alegre
 Ravi Chandra
 Reagan Lee
+Reilly Brogan
 Rob Arrow
 Robert Holt
 Roberto Aldera
@@ -400,6 +403,7 @@ Sadra Barikbin
 Saiprasad Kale
 Samuel Colvin
 Samuel Dion-Girardeau
+Samuel Gaist
 Samuel Jirovec
 Samuel Searles-Bryant
 Samuel Therrien (Avasam)

changelog/12083.breaking.rst

@@ -0,0 +1,9 @@
+Fixed a bug where an invocation such as `pytest a/ a/b` would cause only tests from `a/b` to run, and not other tests under `a/`.
+
+The fix entails a few breaking changes to how such overlapping arguments and duplicates are handled:
+
+1. `pytest a/b a/` or `pytest a/ a/b` are equivalent to `pytest a`; if an argument overlaps another arguments, only the prefix remains.
+
+2. `pytest x.py x.py` is equivalent to `pytest x.py`; previously such an invocation was taken as an explicit request to run the tests from the file twice.
+
+If you rely on these behaviors, consider using :ref:`--keep-duplicates <duplicate-paths>`, which retains its existing behavior (including the bug).

changelog/12244.contrib.rst

@@ -0,0 +1 @@
+Fixed self-test failures when `TERM=dumb`.

changelog/13330.improvement.rst

@@ -0,0 +1,3 @@
+Having pytest configuration spread over more than one file (for example having both a ``pytest.ini`` file and ``pyproject.toml`` with a ``[tool.pytest.ini_options]`` table) will now print a warning to make it clearer to the user that only one of them is actually used.
+
+-- by :user:`sgaist`

changelog/13678.feature.rst

@@ -0,0 +1,3 @@
+Added a new `faulthandler_exit_on_timeout` ini option set to "false" by default to let `faulthandler` interrupt the `pytest` process after a timeout in case of deadlock -- by :user:`ogrisel`.
+
+Previously, a `faulthandler` timeout would only dump the traceback of all threads to stderr, but would not interrupt the `pytest` process.

changelog/13771.contrib.rst

@@ -0,0 +1 @@
+Skip `test_do_not_collect_symlink_siblings` on Windows environments without symlink support to avoid false negatives.

changelog/13791.packaging.rst

@@ -0,0 +1,2 @@
+Minimum requirements on ``iniconfig`` and ``packaging`` were bumped
+to ``1.0.1`` and ``22.0.0``, respectively.

doc/en/example/pythoncollection.rst

@@ -55,6 +55,8 @@ You can run all of the tests within ``tests/`` *except* for ``tests/foobar/test_
 by invoking ``pytest`` with ``--deselect tests/foobar/test_foobar_01.py::test_a``.
 ``pytest`` allows multiple ``--deselect`` options.
 
+.. _duplicate-paths:
+
 Keeping duplicate paths specified from command line
 ----------------------------------------------------
 
@@ -82,18 +84,6 @@ Example:
     collected 2 items
     ...
 
-As the collector just works on directories, if you specify twice a single test file, ``pytest`` will
-still collect it twice, no matter if the ``--keep-duplicates`` is not specified.
-Example:
-
-.. code-block:: pytest
-
-    pytest test_a.py test_a.py
-
-    ...
-    collected 2 items
-    ...
-
 
 Changing directory recursion
 -----------------------------------------------------

doc/en/getting-started.rst

@@ -199,6 +199,26 @@ This is outlined below:
 
 Note that attributes added at class level are *class attributes*, so they will be shared between tests.
 
+Compare floating-point values with pytest.approx
+--------------------------------------------------------------
+
+``pytest`` also provides a number of utilities to make writing tests easier.
+For example, you can use :func:`pytest.approx` to compare floating-point
+values that may have small rounding errors:
+
+.. code-block:: python
+
+    # content of test_approx.py
+    import pytest
+
+
+    def test_sum():
+        assert (0.1 + 0.2) == pytest.approx(0.3)
+
+This avoids the need for manual tolerance checks or using
+``math.isclose`` and works with scalars, lists, and NumPy arrays.
+
+
 Request a unique temporary directory for functional tests
 --------------------------------------------------------------