Merge branch 'main' into no-cache-fixture

.github/workflows/deploy.yml

@@ -31,7 +31,7 @@ jobs:
         persist-credentials: false
 
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.8.0
+      uses: hynek/build-and-inspect-python-package@v2.9.0
       with:
         attest-build-provenance-github: 'true'
 
@@ -54,7 +54,7 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.10.1
+      uses: pypa/gh-action-pypi-publish@v1.10.2
       with:
         attestations: true
 

.github/workflows/test.yml

@@ -40,7 +40,7 @@ jobs:
         fetch-depth: 0
         persist-credentials: false
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.8.0
+      uses: hynek/build-and-inspect-python-package@v2.9.0
 
   build:
     needs: [package]

.github/workflows/update-plugin-list.yml

@@ -47,7 +47,7 @@ jobs:
 
       - name: Create Pull Request
         id: pr
-        uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
         with:
           commit-message: '[automated] Update plugin list'
           author: 'pytest bot <pytestbot@users.noreply.github.com>'

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.6.3"
+  rev: "v0.6.8"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -46,7 +46,7 @@ repos:
             # on <3.11
           - exceptiongroup>=1.0.0rc8
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "2.2.1"
+  rev: "2.2.4"
   hooks:
     - id: pyproject-fmt
       # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version

AUTHORS

@@ -328,6 +328,7 @@ Paul Müller
 Paul Reece
 Pauli Virtanen
 Pavel Karateev
+Pavel Zhukov
 Paweł Adamczak
 Pedro Algarvio
 Petter Strandmark

changelog/12592.bugfix.rst

@@ -0,0 +1 @@
+Fixed :class:`KeyError` crash when using ``--import-mode=importlib`` in a directory layout where a directory contains a child directory with the same name.

changelog/12765.feature.rst

@@ -0,0 +1,3 @@
+Thresholds to trigger snippet truncation can now be set with :confval:`truncation_limit_lines` and :confval:`truncation_limit_chars`.
+
+See :ref:`truncation-params` for more information.

doc/en/how-to/capture-stdout-stderr.rst

@@ -106,9 +106,10 @@ of the failing function and hide the other one:
 Accessing captured output from a test function
 ---------------------------------------------------
 
-The ``capsys``, ``capsysbinary``, ``capfd``, and ``capfdbinary`` fixtures
-allow access to stdout/stderr output created during test execution.  Here is
-an example test function that performs some output related checks:
+The :fixture:`capsys`, :fixture:`capsysbinary`, :fixture:`capfd`, and :fixture:`capfdbinary` fixtures
+allow access to ``stdout``/``stderr`` output created during test execution.
+
+Here is an example test function that performs some output related checks:
 
 .. code-block:: python
 
@@ -125,40 +126,27 @@ an example test function that performs some output related checks:
 The ``readouterr()`` call snapshots the output so far -
 and capturing will be continued.  After the test
 function finishes the original streams will
-be restored.  Using ``capsys`` this way frees your
+be restored.  Using :fixture:`capsys` this way frees your
 test from having to care about setting/resetting
 output streams and also interacts well with pytest's
 own per-test capturing.
 
-If you want to capture on filedescriptor level you can use
-the ``capfd`` fixture which offers the exact
-same interface but allows to also capture output from
-libraries or subprocesses that directly write to operating
-system level output streams (FD1 and FD2).
-
-
-
 The return value from ``readouterr`` changed to a ``namedtuple`` with two attributes, ``out`` and ``err``.
 
-
-
-If the code under test writes non-textual data, you can capture this using
-the ``capsysbinary`` fixture which instead returns ``bytes`` from
+If the code under test writes non-textual data (``bytes``), you can capture this using
+the :fixture:`capsysbinary` fixture which instead returns ``bytes`` from
 the ``readouterr`` method.
 
+If you want to capture at the file descriptor level you can use
+the :fixture:`capfd` fixture which offers the exact
+same interface but allows to also capture output from
+libraries or subprocesses that directly write to operating
+system level output streams (FD1 and FD2). Similarly to :fixture:`capsysbinary`, :fixture:`capfdbinary` can be
+used to capture ``bytes`` at the file descriptor level.
 
 
-
-If the code under test writes non-textual data, you can capture this using
-the ``capfdbinary`` fixture which instead returns ``bytes`` from
-the ``readouterr`` method.  The ``capfdbinary`` fixture operates on the
-filedescriptor level.
-
-
-
-
-To temporarily disable capture within a test, both ``capsys``
-and ``capfd`` have a ``disabled()`` method that can be used
+To temporarily disable capture within a test, the capture fixtures
+have a ``disabled()`` method that can be used
 as a context manager, disabling capture inside the ``with`` block:
 
 .. code-block:: python

doc/en/how-to/output.rst

@@ -549,6 +549,28 @@ captured output:
     By default, parametrized variants of skipped tests are grouped together if
     they share the same skip reason. You can use ``--no-fold-skipped`` to print each skipped test separately.
 
+
+.. _truncation-params:
+
+Modifying truncation limits
+--------------------------------------------------
+
+.. versionadded: 8.4
+
+Default truncation limits are 8 lines or 640 characters, whichever comes first.
+To set custom truncation limits you can use following ``pytest.ini`` file options:
+
+.. code-block:: ini
+
+    [pytest]
+    truncation_limit_lines = 10
+    truncation_limit_chars = 90
+
+That will cause pytest to truncate the assertions to 10 lines or 90 characters, whichever comes first.
+
+Setting both :confval:`truncation_limit_lines` and :confval:`truncation_limit_chars` to ``0`` will disable the truncation.
+However, setting only one of those values will disable one truncation mode, but will leave the other one intact.
+
 Creating resultlog format files
 --------------------------------------------------