[automated] Update plugin list

.github/workflows/backport.yml

@@ -22,7 +22,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
         persist-credentials: true

.github/workflows/deploy.yml

@@ -1,44 +1,35 @@
 name: deploy
 
 on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release version'
-        required: true
-        default: '1.2.3'
+  push:
+    tags:
+      # These tags are protected, see:
+      # https://github.com/pytest-dev/pytest/settings/tag_protection
+      - "[0-9]+.[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
 
 
 # Set permissions at the job level.
 permissions: {}
 
 jobs:
-  package:
+
+  deploy:
+    if: github.repository == 'pytest-dev/pytest'
+
     runs-on: ubuntu-latest
-    env:
-      SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }}
-    timeout-minutes: 10
+    timeout-minutes: 30
+    permissions:
+      contents: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
         persist-credentials: false
 
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v1.5.4
-
-  deploy:
-    if: github.repository == 'pytest-dev/pytest'
-    needs: [package]
-    runs-on: ubuntu-latest
-    environment: deploy
-    timeout-minutes: 30
-    permissions:
-      id-token: write
-      contents: write
-    steps:
-    - uses: actions/checkout@v4
+      uses: hynek/build-and-inspect-python-package@v1.5
 
     - name: Download Package
       uses: actions/download-artifact@v3
@@ -47,35 +38,14 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.8.11
-
-    - name: Push tag
-      run: |
-        git config user.name "pytest bot"
-        git config user.email "pytestbot@gmail.com"
-        git tag --annotate --message=v${{ github.event.inputs.version }} ${{ github.event.inputs.version }} ${{ github.sha }}
-        git push origin ${{ github.event.inputs.version }}
-
-  release-notes:
-
-    # todo: generate the content in the build  job
-    #       the goal being of using a github action script to push the release data
-    #       after success instead of creating a complete python/tox env
-    needs: [deploy]
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/checkout@v4
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        fetch-depth: 0
-        persist-credentials: false
+        password: ${{ secrets.pypi_token }}
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
-        python-version: "3.11"
+        python-version: "3.7"
 
     - name: Install tox
       run: |

.github/workflows/prepare-release-pr.yml

@@ -27,12 +27,12 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: "3.8"
 

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
         with:
           debug-only: false
           days-before-issue-stale: 14

.github/workflows/test.yml

@@ -27,19 +27,7 @@ concurrency:
 permissions: {}
 
 jobs:
-  package:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-    - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v1.5.4
-
   build:
-    needs: [package]
-
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     permissions:
@@ -49,41 +37,48 @@ jobs:
       fail-fast: false
       matrix:
         name: [
+          "windows-py37",
+          "windows-py37-pluggy",
           "windows-py38",
-          "windows-py38-pluggy",
           "windows-py39",
           "windows-py310",
           "windows-py311",
           "windows-py312",
 
+          "ubuntu-py37",
+          "ubuntu-py37-pluggy",
+          "ubuntu-py37-freeze",
           "ubuntu-py38",
-          "ubuntu-py38-pluggy",
-          "ubuntu-py38-freeze",
           "ubuntu-py39",
           "ubuntu-py310",
           "ubuntu-py311",
           "ubuntu-py312",
           "ubuntu-pypy3",
 
-          "macos-py38",
+          "macos-py37",
           "macos-py39",
           "macos-py310",
           "macos-py312",
 
+          "docs",
           "doctesting",
           "plugins",
         ]
 
         include:
+          - name: "windows-py37"
+            python: "3.7"
+            os: windows-latest
+            tox_env: "py37-numpy"
+          - name: "windows-py37-pluggy"
+            python: "3.7"
+            os: windows-latest
+            tox_env: "py37-pluggymain-pylib-xdist"
           - name: "windows-py38"
             python: "3.8"
             os: windows-latest
             tox_env: "py38-unittestextras"
             use_coverage: true
-          - name: "windows-py38-pluggy"
-            python: "3.8"
-            os: windows-latest
-            tox_env: "py38-pluggymain-pylib-xdist"
           - name: "windows-py39"
             python: "3.9"
             os: windows-latest
@@ -101,19 +96,23 @@ jobs:
             os: windows-latest
             tox_env: "py312"
 
+          - name: "ubuntu-py37"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-lsof-numpy-pexpect"
+            use_coverage: true
+          - name: "ubuntu-py37-pluggy"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-pluggymain-pylib-xdist"
+          - name: "ubuntu-py37-freeze"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-freeze"
           - name: "ubuntu-py38"
             python: "3.8"
             os: ubuntu-latest
-            tox_env: "py38-lsof-numpy-pexpect"
-            use_coverage: true
-          - name: "ubuntu-py38-pluggy"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "py38-pluggymain-pylib-xdist"
-          - name: "ubuntu-py38-freeze"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "py38-freeze"
+            tox_env: "py38-xdist"
           - name: "ubuntu-py39"
             python: "3.9"
             os: ubuntu-latest
@@ -133,14 +132,14 @@ jobs:
             tox_env: "py312"
             use_coverage: true
           - name: "ubuntu-pypy3"
-            python: "pypy-3.8"
+            python: "pypy-3.7"
             os: ubuntu-latest
             tox_env: "pypy3-xdist"
 
-          - name: "macos-py38"
-            python: "3.8"
+          - name: "macos-py37"
+            python: "3.7"
             os: macos-latest
-            tox_env: "py38-xdist"
+            tox_env: "py37-xdist"
           - name: "macos-py39"
             python: "3.9"
             os: macos-latest
@@ -156,30 +155,28 @@ jobs:
             tox_env: "py312-xdist"
 
           - name: "plugins"
-            python: "3.12"
+            python: "3.9"
             os: ubuntu-latest
             tox_env: "plugins"
 
+          - name: "docs"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "docs"
           - name: "doctesting"
-            python: "3.8"
+            python: "3.7"
             os: ubuntu-latest
             tox_env: "doctesting"
             use_coverage: true
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
         persist-credentials: false
 
-    - name: Download Package
-      uses: actions/download-artifact@v3
-      with:
-        name: Packages
-        path: dist
-
     - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python }}
         check-latest: ${{ endsWith(matrix.python, '-dev') }}
@@ -191,13 +188,11 @@ jobs:
 
     - name: Test without coverage
       if: "! matrix.use_coverage"
-      shell: bash
-      run: tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz`
+      run: "tox -e ${{ matrix.tox_env }}"
 
     - name: Test with coverage
       if: "matrix.use_coverage"
-      shell: bash
-      run: tox run -e ${{ matrix.tox_env }}-coverage --installpkg `find dist/*.tar.gz`
+      run: "tox -e ${{ matrix.tox_env }}-coverage"
 
     - name: Generate coverage report
       if: "matrix.use_coverage"
@@ -211,3 +206,10 @@ jobs:
         fail_ci_if_error: true
         files: ./coverage.xml
         verbose: true
+
+  check-package:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build and Check Package
+      uses: hynek/build-and-inspect-python-package@v1.5

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

@@ -20,33 +20,25 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
-          cache: pip
-      - name: requests-cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/pytest-plugin-list/
-          key: plugins-http-cache-${{ github.run_id }} # Can use time based key as well
-          restore-keys: plugins-http-cache-
+          python-version: 3.8
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install packaging requests tabulate[widechars] tqdm requests-cache platformdirs
-
+          pip install packaging requests tabulate[widechars] tqdm
 
       - name: Update Plugin List
         run: python scripts/update-plugin-list.py
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        uses: peter-evans/create-pull-request@5b4a9f6a9e2af26e5f02351490b90d01eb8ec1e5
         with:
           commit-message: '[automated] Update plugin list'
           author: 'pytest bot <pytestbot@users.noreply.github.com>'

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 23.3.0
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: 1.16.0
+    rev: 1.13.0
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==23.7.0]
+        additional_dependencies: [black==23.1.0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.4.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -21,7 +21,7 @@ repos:
         exclude: _pytest/(debugging|hookspec).py
         language_version: python3
 -   repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
+    rev: v2.1.1
     hooks:
     -   id: autoflake
         name: autoflake
@@ -29,7 +29,7 @@ repos:
         language: python
         files: \.py$
 -   repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 6.0.0
     hooks:
     -   id: flake8
         language_version: python3
@@ -37,17 +37,17 @@ repos:
           - flake8-typing-imports==1.12.0
           - flake8-docstrings==1.5.0
 -   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+    rev: v3.9.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py38-plus]
+        args: ['--application-directories=.:src', --py37-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.4.0
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
+        args: [--py37-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.5.0
+    rev: v2.3.0
     hooks:
     -   id: setup-cfg-fmt
         args: ["--max-py-version=3.12", "--include-version-classifiers"]
@@ -56,7 +56,7 @@ repos:
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.8.0
+    rev: v1.3.0
     hooks:
     -   id: mypy
         files: ^(src/|testing/)

.readthedocs.yml

@@ -9,10 +9,6 @@ python:
        path: .
      - requirements: doc/en/requirements.txt
 
-sphinx:
-  configuration: doc/en/conf.py
-  fail_on_warning: true
-
 build:
   os: ubuntu-20.04
   tools:

AUTHORS

@@ -11,7 +11,6 @@ Adam Johnson
 Adam Stewart
 Adam Uhlir
 Ahn Ki-Wook
-Akhilesh Ramakrishnan
 Akiomi Kamakura
 Alan Velasco
 Alessio Izzo
@@ -48,7 +47,6 @@ Ariel Pillemer
 Armin Rigo
 Aron Coyle
 Aron Curzon
-Arthur Richard
 Ashish Kurmi
 Aviral Verma
 Aviv Palivoda
@@ -57,9 +55,7 @@ Barney Gale
 Ben Gartner
 Ben Webb
 Benjamin Peterson
-Benjamin Schubert
 Bernard Pratz
-Bo Wu
 Bob Ippolito
 Brian Dorsey
 Brian Larsen
@@ -133,7 +129,6 @@ Eric Hunsberger
 Eric Liu
 Eric Siegerman
 Erik Aronesty
-Erik Hasse
 Erik M. Bray
 Evan Kepner
 Evgeny Seliverstov
@@ -145,7 +140,6 @@ Feng Ma
 Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
-Fraser Stark
 Gabriel Landau
 Gabriel Reis
 Garvit Shubham
@@ -172,8 +166,6 @@ Ian Bicking
 Ian Lesperance
 Ilya Konstantinov
 Ionuț Turturică
-Isaac Virshup
-Israel Fruchter
 Itxaso Aizpurua
 Iwan Briquemont
 Jaap Broekhuizen
@@ -189,7 +181,6 @@ Javier Romero
 Jeff Rackauckas
 Jeff Widman
 Jenni Rinker
-Jens Tröger
 John Eddie Ayson
 John Litborn
 John Towler
@@ -238,7 +229,6 @@ Maho
 Maik Figura
 Mandeep Bhutani
 Manuel Krebber
-Marc Mueller
 Marc Schlaich
 Marcelo Duarte Trevisani
 Marcin Bachry
@@ -266,19 +256,15 @@ Michael Goerz
 Michael Krebs
 Michael Seifert
 Michal Wajszczuk
-Michał Górny
 Michał Zięba
 Mickey Pashov
 Mihai Capotă
-Mihail Milushev
 Mike Hoyle (hoylemd)
 Mike Lundy
-Milan Lesnek
 Miro Hrončok
 Nathaniel Compton
 Nathaniel Waisbrot
 Ned Batchelder
-Neil Martin
 Neven Mundar
 Nicholas Devenish
 Nicholas Murphy
@@ -296,7 +282,6 @@ Ondřej Súkup
 Oscar Benjamin
 Parth Patel
 Patrick Hayes
-Patrick Lannigan
 Paul Müller
 Paul Reece
 Pauli Virtanen
@@ -325,7 +310,6 @@ Raphael Pierzina
 Rafal Semik
 Raquel Alegre
 Ravi Chandra
-Reagan Lee
 Robert Holt
 Roberto Aldera
 Roberto Polli
@@ -336,32 +320,25 @@ Ronny Pfannschmidt
 Ross Lawley
 Ruaridh Williamson
 Russel Winder
-Ryan Puddephatt
 Ryan Wooden
-Sadra Barikbin
 Saiprasad Kale
 Samuel Colvin
 Samuel Dion-Girardeau
 Samuel Searles-Bryant
-Samuel Therrien (Avasam)
 Samuele Pedroni
 Sanket Duthade
 Sankt Petersbug
 Saravanan Padmanaban
-Sean Malloy
 Segev Finer
 Serhii Mozghovyi
 Seth Junot
 Shantanu Jain
-Sharad Nair
 Shubham Adep
-Simon Blanchard
 Simon Gomizelj
 Simon Holesch
 Simon Kerr
 Skylar Downes
 Srinivas Reddy Thatiparthy
-Stefaan Lippens
 Stefan Farmbauer
 Stefan Scherfke
 Stefan Zimmermann
@@ -375,7 +352,6 @@ Tadek Teleżyński
 Takafumi Arakaki
 Taneli Hukkinen
 Tanvi Mehta
-Tanya Agarwal
 Tarcisio Fischer
 Tareq Alayan
 Tatiana Ovary
@@ -394,16 +370,13 @@ Tomer Keren
 Tony Narlock
 Tor Colvin
 Trevor Bekolay
-Tushar Sadhwani
 Tyler Goodlet
-Tyler Smart
 Tzu-ping Chung
 Vasily Kuznetsov
 Victor Maryama
 Victor Rodriguez
 Victor Uriarte
 Vidar T. Fauske
-Vijay Arora
 Virgil Dupras
 Vitaly Lashmanov
 Vivaan Verma

CONTRIBUTING.rst

@@ -50,7 +50,7 @@ Fix bugs
 --------
 
 Look through the `GitHub issues for bugs <https://github.com/pytest-dev/pytest/labels/type:%20bug>`_.
-See also the `"good first issue" issues <https://github.com/pytest-dev/pytest/labels/good%20first%20issue>`_
+See also the `"status: easy" issues <https://github.com/pytest-dev/pytest/labels/status%3A%20easy>`_
 that are friendly to new contributors.
 
 :ref:`Talk <contact>` to developers to find out how you can fix specific bugs. To indicate that you are going
@@ -197,12 +197,11 @@ Short version
 ~~~~~~~~~~~~~
 
 #. Fork the repository.
-#. Fetch tags from upstream if necessary (if you cloned only main `git fetch --tags https://github.com/pytest-dev/pytest`).
 #. Enable and install `pre-commit <https://pre-commit.com>`_ to ensure style-guides and code checks are followed.
-#. Follow `PEP-8 <https://www.python.org/dev/peps/pep-0008/>`_ for naming.
+#. Follow **PEP-8** for naming and `black <https://github.com/psf/black>`_ for formatting.
 #. Tests are run using ``tox``::
 
-    tox -e linting,py39
+    tox -e linting,py37
 
    The test environments above are usually enough to cover most cases locally.
 
@@ -237,7 +236,6 @@ Here is a simple overview, with pytest-specific bits:
 
     $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git
     $ cd pytest
-    $ git fetch --tags https://github.com/pytest-dev/pytest
     # now, create your own branch off "main":
 
         $ git checkout -b your-bugfix-branch-name main
@@ -274,24 +272,24 @@ Here is a simple overview, with pytest-specific bits:
 
 #. Run all the tests
 
-   You need to have Python 3.8 or later available in your system.  Now
+   You need to have Python 3.7 available in your system.  Now
    running tests is as simple as issuing this command::
 
-    $ tox -e linting,py39
+    $ tox -e linting,py37
 
-   This command will run tests via the "tox" tool against Python 3.9
+   This command will run tests via the "tox" tool against Python 3.7
    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 now edit your local working copy and run the tests again as necessary. Please follow PEP-8 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.7 and pass options to pytest
    (e.g. enter pdb on failure) to pytest you can do::
 
-    $ tox -e py39 -- --pdb
+    $ tox -e py37 -- --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.7::
 
-    $ tox -e py39 -- testing/test_config.py
+    $ tox -e py37 -- testing/test_config.py
 
 
    When committing, ``pre-commit`` will re-format the files if necessary.

README.rst

@@ -20,7 +20,7 @@
     :target: https://codecov.io/gh/pytest-dev/pytest
     :alt: Code coverage Status
 
-.. image:: https://github.com/pytest-dev/pytest/actions/workflows/test.yml/badge.svg
+.. image:: https://github.com/pytest-dev/pytest/workflows/test/badge.svg
     :target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Atest
 
 .. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
@@ -100,7 +100,7 @@ Features
 - Can run `unittest <https://docs.pytest.org/en/stable/how-to/unittest.html>`_ (or trial),
   `nose <https://docs.pytest.org/en/stable/how-to/nose.html>`_ test suites out of the box
 
-- Python 3.8+ or PyPy3
+- Python 3.7+ or PyPy3
 
 - Rich plugin architecture, with over 850+ `external plugins <https://docs.pytest.org/en/latest/reference/plugin_list.html>`_ and thriving community
 

RELEASING.rst

@@ -133,12 +133,14 @@ Releasing
 
 Both automatic and manual processes described above follow the same steps from this point onward.
 
-#. After all tests pass and the PR has been approved, trigger the ``deploy`` job
-   in https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml, using the ``release-MAJOR.MINOR.PATCH`` branch
-   as source.
+#. After all tests pass and the PR has been approved, tag the release commit
+   in the ``release-MAJOR.MINOR.PATCH`` branch and push it. This will publish to PyPI::
 
-   This job will require approval from ``pytest-dev/core``, after which it will publish to PyPI
-   and tag the repository.
+     git fetch upstream
+     git tag MAJOR.MINOR.PATCH upstream/release-MAJOR.MINOR.PATCH
+     git push upstream MAJOR.MINOR.PATCH
+
+   Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
 
 #. Merge the PR. **Make sure it's not squash-merged**, so that the tagged commit ends up in the main branch.
 

changelog/10831.bugfix.rst

@@ -0,0 +1 @@
+Terminal Reporting: Fixed bug when running in ``--tb=line`` mode where ``pytest.fail(pytrace=False)`` tests report ``None``.

changelog/10872.improvement.rst

@@ -0,0 +1 @@
+Update test log report annotation to named tuple and fixed inconsistency in docs for :hook:`pytest_report_teststatus` hook.

changelog/10901.feature.rst

@@ -0,0 +1,2 @@
+Added :func:`ExceptionInfo.from_exception() <pytest.ExceptionInfo.from_exception>`, a simpler way to create an :class:`~pytest.ExceptionInfo` from an exception.
+This can replace :func:`ExceptionInfo.from_exc_info() <pytest.ExceptionInfo.from_exc_info()>` for most uses.

changelog/10907.improvement.rst

@@ -0,0 +1,5 @@
+When an exception traceback to be displayed is completely filtered out (by mechanisms such as ``__tracebackhide__``, internal frames, and similar), now only the exception string and the following message are shown:
+
+"All traceback entries are hidden. Pass `--full-trace` to see hidden and internal frames.".
+
+Previously, the last frame of the traceback was shown, even though it was hidden.

changelog/10940.improvement.rst

@@ -0,0 +1,3 @@
+Improved verbose output (``-vv``) of ``skip`` and ``xfail`` reasons by performing text wrapping while leaving a clear margin for progress output.
+
+Added :func:`TerminalReporter.wrap_write() <pytest.TerminalReporter.wrap_write>` as a helper for that.

changelog/10991.improvement.rst

@@ -0,0 +1 @@
+Added handling of ``%f`` directive to print microseconds in log format options, such as ``log-date-format``.

changelog/11005.improvement.rst

@@ -0,0 +1 @@
+Added underlying exception to cache provider path creation and write warning messages.

changelog/11013.improvement.rst

@@ -0,0 +1 @@
+Added warning when :confval:`testpaths` is set, but paths are not found by glob. In this case, pytest will fall back to searching from the current directory.

changelog/11031.trivial.rst

@@ -0,0 +1 @@
+Enhanced the CLI flag for ``-c`` to now include ``--config-file`` to make it clear that this flag applies to the usage of a custom config file.

changelog/11043.improvement.rst

@@ -0,0 +1,3 @@
+When `--confcutdir` is not specified, and there is no config file present, the conftest cutoff directory (`--confcutdir`) is now set to the :ref:`rootdir`.
+Previously in such cases, `conftest.py` files would be probed all the way to the root directory of the filesystem.
+If you are badly affected by this change, consider adding an empty config file to your desired cutoff directory, or explicitly set `--confcutdir`.

changelog/11068.bugfix.rst

@@ -0,0 +1 @@
+Fixed the ``--last-failed`` whole-file skipping functionality ("skipped N files") for :ref:`non-python test files <non-python tests>`.

changelog/11081.improvement.rst

@@ -0,0 +1,7 @@
+The :confval:`norecursedir` check is now performed in a :hook:`pytest_ignore_collect` implementation, so plugins can affect it.
+
+If after updating to this version you see that your `norecursedir` setting is not being respected,
+it means that a conftest or a plugin you use has a bad `pytest_ignore_collect` implementation.
+Most likely, your hook returns `False` for paths it does not want to ignore,
+which ends the processing and doesn't allow other plugins, including pytest itself, to ignore the path.
+The fix is to return `None` instead of `False` for paths your hook doesn't want to ignore.

changelog/1904.bugfix.rst

@@ -0,0 +1 @@
+Fixed traceback entries hidden with ``__tracebackhide__ = True`` still being shown for chained exceptions (parts after "... the above exception ..." message).

changelog/8711.improvement.rst

@@ -0,0 +1,3 @@
+:func:`_pytest.logging.LogCaptureFixture.set_level` and :func:`_pytest.logging.LogCaptureFixture.at_level`
+will temporarily enable the requested ``level`` if ``level`` was disabled globally via
+``logging.disable(LEVEL)``.

changelog/README.rst

@@ -14,7 +14,7 @@ Each file should be named like ``<ISSUE>.<TYPE>.rst``, where
 ``<ISSUE>`` is an issue number, and ``<TYPE>`` is one of:
 
 * ``feature``: new user facing features, like new command-line options and new behavior.
-* ``improvement``: improvement of existing functionality, usually without requiring user intervention (for example, new fields being written in ``--junit-xml``, improved colors in terminal, etc).
+* ``improvement``: improvement of existing functionality, usually without requiring user intervention (for example, new fields being written in ``--junitxml``, improved colors in terminal, etc).
 * ``bugfix``: fixes a bug.
 * ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
 * ``deprecation``: feature deprecation.

doc/en/announce/index.rst

@@ -6,12 +6,6 @@ Release announcements
    :maxdepth: 2
 
 
-   release-8.0.0rc1
-   release-7.4.4
-   release-7.4.3
-   release-7.4.2
-   release-7.4.1
-   release-7.4.0
    release-7.3.2
    release-7.3.1
    release-7.3.0

doc/en/announce/release-7.4.0.rst

@@ -1,49 +0,0 @@
-pytest-7.4.0
-=======================================
-
-The pytest team is proud to announce the 7.4.0 release!
-
-This release contains new features, improvements, and bug fixes,
-the full list of changes is available in the changelog:
-
-    https://docs.pytest.org/en/stable/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/stable/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all of the contributors to this release:
-
-* Adam J. Stewart
-* Alessio Izzo
-* Alex
-* Alex Lambson
-* Brian Larsen
-* Bruno Oliveira
-* Bryan Ricker
-* Chris Mahoney
-* Facundo Batista
-* Florian Bruhin
-* Jarrett Keifer
-* Kenny Y
-* Miro Hrončok
-* Ran Benita
-* Roberto Aldera
-* Ronny Pfannschmidt
-* Sergey Kim
-* Stefanie Molin
-* Vijay Arora
-* Ville Skyttä
-* Zac Hatfield-Dodds
-* bzoracler
-* leeyueh
-* nondescryptid
-* theirix
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.4.1.rst

@@ -1,20 +0,0 @@
-pytest-7.4.1
-=======================================
-
-pytest 7.4.1 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Florian Bruhin
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.4.2.rst

@@ -1,18 +0,0 @@
-pytest-7.4.2
-=======================================
-
-pytest 7.4.2 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.4.3.rst

@@ -1,19 +0,0 @@
-pytest-7.4.3
-=======================================
-
-pytest 7.4.3 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Marc Mueller
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.4.4.rst

@@ -1,20 +0,0 @@
-pytest-7.4.4
-=======================================
-
-pytest 7.4.4 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Ran Benita
-* Zac Hatfield-Dodds
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-8.0.0rc1.rst

@@ -1,82 +0,0 @@
-pytest-8.0.0rc1
-=======================================
-
-The pytest team is proud to announce the 8.0.0rc1 release!
-
-This release contains new features, improvements, bug fixes, and breaking changes, so users
-are encouraged to take a look at the CHANGELOG carefully:
-
-    https://docs.pytest.org/en/stable/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/stable/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all of the contributors to this release:
-
-* Akhilesh Ramakrishnan
-* Aleksandr Brodin
-* Anthony Sottile
-* Arthur Richard
-* Avasam
-* Benjamin Schubert
-* Bruno Oliveira
-* Carsten Grohmann
-* Cheukting
-* Chris Mahoney
-* Christoph Anton Mitterer
-* DetachHead
-* Erik Hasse
-* Florian Bruhin
-* Fraser Stark
-* Ha Pam
-* Hugo van Kemenade
-* Isaac Virshup
-* Israel Fruchter
-* Jens Tröger
-* Jon Parise
-* Kenny Y
-* Lesnek
-* Marc Mueller
-* Michał Górny
-* Mihail Milushev
-* Milan Lesnek
-* Miro Hrončok
-* Patrick Lannigan
-* Ran Benita
-* Reagan Lee
-* Ronny Pfannschmidt
-* Sadra Barikbin
-* Sean Malloy
-* Sean Patrick Malloy
-* Sharad Nair
-* Simon Blanchard
-* Sourabh Beniwal
-* Stefaan Lippens
-* Tanya Agarwal
-* Thomas Grainger
-* Tom Mortimer-Jones
-* Tushar Sadhwani
-* Tyler Smart
-* Uday Kumar
-* Warren Markham
-* WarrenTheRabbit
-* Zac Hatfield-Dodds
-* Ziad Kermadi
-* akhilramkee
-* antosikv
-* bowugit
-* mickeypash
-* neilmartin2000
-* pomponchik
-* ryanpudd
-* touilleWoman
-* ubaumann
-
-
-Happy testing,
-The pytest Development Team

doc/en/backwards-compatibility.rst

@@ -22,7 +22,7 @@ b) transitional: the old and new API don't conflict
 
    We will only start the removal of deprecated functionality in major releases (e.g. if we deprecate something in 3.0 we will start to remove it in 4.0), and keep it around for at least two minor releases (e.g. if we deprecate something in 3.9 and 4.0 is the next release, we start to remove it in 5.0, not in 4.0).
 
-   A deprecated feature scheduled to be removed in major version X will use the warning class `PytestRemovedInXWarning` (a subclass of :class:`~pytest.PytestDeprecationWarning`).
+   A deprecated feature scheduled to be removed in major version X will use the warning class `PytestRemovedInXWarning` (a subclass of :class:`~pytest.PytestDeprecationwarning`).
 
    When the deprecation expires (e.g. 4.0 is released), we won't remove the deprecated functionality immediately, but will use the standard warning filters to turn `PytestRemovedInXWarning` (e.g. `PytestRemovedIn4Warning`) into **errors** by default. This approach makes it explicit that removal is imminent, and still gives you time to turn the deprecated feature into a warning instead of an error so it can be dealt with in your own time. In the next minor release (e.g. 4.1), the feature will be effectively removed.
 
@@ -87,7 +87,6 @@ Released pytest versions support all Python versions that are actively maintaine
 ==============  ===================
 pytest version  min. Python version
 ==============  ===================
-8.0+            3.8+
 7.1+            3.7+
 6.2 - 7.0       3.6+
 5.0 - 6.1       3.5+

doc/en/builtin.rst

@@ -18,11 +18,11 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
     $ pytest  --fixtures -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collected 0 items
-    cache -- .../_pytest/cacheprovider.py:526
+    cache -- .../_pytest/cacheprovider.py:510
         Return a cache object that can persist state between testing sessions.
 
         cache.get(key, default)
@@ -33,7 +33,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         Values can be any object handled by the json stdlib module.
 
-    capsysbinary -- .../_pytest/capture.py:1008
+    capsysbinary -- .../_pytest/capture.py:1001
         Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.
 
         The captured output is made available via ``capsysbinary.readouterr()``
@@ -51,7 +51,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                 captured = capsysbinary.readouterr()
                 assert captured.out == b"hello\n"
 
-    capfd -- .../_pytest/capture.py:1036
+    capfd -- .../_pytest/capture.py:1029
         Enable text capturing of writes to file descriptors ``1`` and ``2``.
 
         The captured output is made available via ``capfd.readouterr()`` method
@@ -69,7 +69,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                 captured = capfd.readouterr()
                 assert captured.out == "hello\n"
 
-    capfdbinary -- .../_pytest/capture.py:1064
+    capfdbinary -- .../_pytest/capture.py:1057
         Enable bytes capturing of writes to file descriptors ``1`` and ``2``.
 
         The captured output is made available via ``capfd.readouterr()`` method
@@ -87,7 +87,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                 captured = capfdbinary.readouterr()
                 assert captured.out == b"hello\n"
 
-    capsys -- .../_pytest/capture.py:980
+    capsys -- .../_pytest/capture.py:973
         Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.
 
         The captured output is made available via ``capsys.readouterr()`` method
@@ -105,7 +105,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                 captured = capsys.readouterr()
                 assert captured.out == "hello\n"
 
-    doctest_namespace [session scope] -- .../_pytest/doctest.py:743
+    doctest_namespace [session scope] -- .../_pytest/doctest.py:737
         Fixture that returns a :py:class:`dict` that will be injected into the
         namespace of doctests.
 
@@ -119,7 +119,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         For more details: :ref:`doctest_namespace`.
 
-    pytestconfig [session scope] -- .../_pytest/fixtures.py:1365
+    pytestconfig [session scope] -- .../_pytest/fixtures.py:1360
         Session-scoped fixture that returns the session's :class:`pytest.Config`
         object.
 
@@ -174,10 +174,10 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             `pytest-xdist <https://github.com/pytest-dev/pytest-xdist>`__ plugin. See
             :issue:`7767` for details.
 
-    tmpdir_factory [session scope] -- .../_pytest/legacypath.py:300
+    tmpdir_factory [session scope] -- .../_pytest/legacypath.py:302
         Return a :class:`pytest.TempdirFactory` instance for the test session.
 
-    tmpdir -- .../_pytest/legacypath.py:307
+    tmpdir -- .../_pytest/legacypath.py:309
         Return a temporary directory path object which is unique to each test
         function invocation, created as a sub directory of the base temporary
         directory.
@@ -196,7 +196,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         .. _legacy_path: https://py.readthedocs.io/en/latest/path.html
 
-    caplog -- .../_pytest/logging.py:593
+    caplog -- .../_pytest/logging.py:498
         Access and control log capturing.
 
         Captured logs are available through the following properties/methods::
@@ -237,10 +237,10 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
         See https://docs.pytest.org/en/latest/how-to/capture-warnings.html for information
         on warning categories.
 
-    tmp_path_factory [session scope] -- .../_pytest/tmpdir.py:239
+    tmp_path_factory [session scope] -- .../_pytest/tmpdir.py:245
         Return a :class:`pytest.TempPathFactory` instance for the test session.
 
-    tmp_path -- .../_pytest/tmpdir.py:254
+    tmp_path -- .../_pytest/tmpdir.py:260
         Return a temporary directory path object which is unique to each test
         function invocation, created as a sub directory of the base temporary
         directory.

doc/en/changelog.rst

@@ -28,551 +28,6 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
-pytest 8.0.0rc1 (2023-12-30)
-============================
-
-Breaking Changes
-----------------
-
-Old Deprecations Are Now Errors
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- `#7363 <https://github.com/pytest-dev/pytest/issues/7363>`_: **PytestRemovedIn8Warning deprecation warnings are now errors by default.**
-
-  Following our plan to remove deprecated features with as little disruption as
-  possible, all warnings of type ``PytestRemovedIn8Warning`` now generate errors
-  instead of warning messages by default.
-
-  **The affected features will be effectively removed in pytest 8.1**, so please consult the
-  :ref:`deprecations` section in the docs for directions on how to update existing code.
-
-  In the pytest ``8.0.X`` series, it is possible to change the errors back into warnings as a
-  stopgap measure by adding this to your ``pytest.ini`` file:
-
-  .. code-block:: ini
-
-      [pytest]
-      filterwarnings =
-          ignore::pytest.PytestRemovedIn8Warning
-
-  But this will stop working when pytest ``8.1`` is released.
-
-  **If you have concerns** about the removal of a specific feature, please add a
-  comment to :issue:`7363`.
-
-
-Version Compatibility
-^^^^^^^^^^^^^^^^^^^^^
-
-- `#11151 <https://github.com/pytest-dev/pytest/issues/11151>`_: Dropped support for Python 3.7, which `reached end-of-life on 2023-06-27 <https://devguide.python.org/versions/>`__.
-
-
-- ``pluggy>=1.3.0`` is now required.
-
-
-Collection Changes
-^^^^^^^^^^^^^^^^^^
-
-In this version we've made several breaking changes to pytest's collection phase,
-particularly around how filesystem directories and Python packages are collected,
-fixing deficiencies and allowing for cleanups and improvements to pytest's internals.
-A deprecation period for these changes was not possible.
-
-
-- `#7777 <https://github.com/pytest-dev/pytest/issues/7777>`_: Files and directories are now collected in alphabetical order jointly, unless changed by a plugin.
-  Previously, files were collected before directories.
-  See below for an example.
-
-
-- `#8976 <https://github.com/pytest-dev/pytest/issues/8976>`_: Running `pytest pkg/__init__.py` now collects the `pkg/__init__.py` file (module) only.
-  Previously, it collected the entire `pkg` package, including other test files in the directory, but excluding tests in the `__init__.py` file itself
-  (unless :confval:`python_files` was changed to allow `__init__.py` file).
-
-  To collect the entire package, specify just the directory: `pytest pkg`.
-
-
-- `#11137 <https://github.com/pytest-dev/pytest/issues/11137>`_: :class:`pytest.Package` is no longer a :class:`pytest.Module` or :class:`pytest.File`.
-
-  The ``Package`` collector node designates a Python package, that is, a directory with an `__init__.py` file.
-  Previously ``Package`` was a subtype of ``pytest.Module`` (which represents a single Python module),
-  the module being the `__init__.py` file.
-  This has been deemed a design mistake (see :issue:`11137` and :issue:`7777` for details).
-
-  The ``path`` property of ``Package`` nodes now points to the package directory instead of the ``__init__.py`` file.
-
-  Note that a ``Module`` node for ``__init__.py`` (which is not a ``Package``) may still exist,
-  if it is picked up during collection (e.g. if you configured :confval:`python_files` to include ``__init__.py`` files).
-
-
-- `#7777 <https://github.com/pytest-dev/pytest/issues/7777>`_: Added a new :class:`pytest.Directory` base collection node, which all collector nodes for filesystem directories are expected to subclass.
-  This is analogous to the existing :class:`pytest.File` for file nodes.
-
-  Changed :class:`pytest.Package` to be a subclass of :class:`pytest.Directory`.
-  A ``Package`` represents a filesystem directory which is a Python package,
-  i.e. contains an ``__init__.py`` file.
-
-  :class:`pytest.Package` now only collects files in its own directory; previously it collected recursively.
-  Sub-directories are collected as their own collector nodes, which then collect themselves, thus creating a collection tree which mirrors the filesystem hierarchy.
-
-  Added a new :class:`pytest.Dir` concrete collection node, a subclass of :class:`pytest.Directory`.
-  This node represents a filesystem directory, which is not a :class:`pytest.Package`,
-  that is, does not contain an ``__init__.py`` file.
-  Similarly to ``Package``, it only collects the files in its own directory.
-
-  :class:`pytest.Session` now only collects the initial arguments, without recursing into directories.
-  This work is now done by the :func:`recursive expansion process <pytest.Collector.collect>` of directory collector nodes.
-
-  :attr:`session.name <pytest.Session.name>` is now ``""``; previously it was the rootdir directory name.
-  This matches :attr:`session.nodeid <_pytest.nodes.Node.nodeid>` which has always been `""`.
-
-  The collection tree now contains directories/packages up to the :ref:`rootdir <rootdir>`,
-  for initial arguments that are found within the rootdir.
-  For files outside the rootdir, only the immediate directory/package is collected --
-  note however that collecting from outside the rootdir is discouraged.
-
-  As an example, given the following filesystem tree::
-
-      myroot/
-          pytest.ini
-          top/
-          ├── aaa
-          │   └── test_aaa.py
-          ├── test_a.py
-          ├── test_b
-          │   ├── __init__.py
-          │   └── test_b.py
-          ├── test_c.py
-          └── zzz
-              ├── __init__.py
-              └── test_zzz.py
-
-  the collection tree, as shown by `pytest --collect-only top/` but with the otherwise-hidden :class:`~pytest.Session` node added for clarity,
-  is now the following::
-
-      <Session>
-        <Dir myroot>
-          <Dir top>
-            <Dir aaa>
-              <Module test_aaa.py>
-                <Function test_it>
-            <Module test_a.py>
-              <Function test_it>
-            <Package test_b>
-              <Module test_b.py>
-                <Function test_it>
-            <Module test_c.py>
-              <Function test_it>
-            <Package zzz>
-              <Module test_zzz.py>
-                <Function test_it>
-
-  Previously, it was::
-
-      <Session>
-        <Module top/test_a.py>
-          <Function test_it>
-        <Module top/test_c.py>
-          <Function test_it>
-        <Module top/aaa/test_aaa.py>
-          <Function test_it>
-        <Package test_b>
-          <Module test_b.py>
-            <Function test_it>
-        <Package zzz>
-          <Module test_zzz.py>
-            <Function test_it>
-
-  Code/plugins which rely on a specific shape of the collection tree might need to update.
-
-
-- `#11676 <https://github.com/pytest-dev/pytest/issues/11676>`_: The classes :class:`~_pytest.nodes.Node`, :class:`~pytest.Collector`, :class:`~pytest.Item`, :class:`~pytest.File`, :class:`~_pytest.nodes.FSCollector` are now marked abstract (see :mod:`abc`).
-
-  We do not expect this change to affect users and plugin authors, it will only cause errors when the code is already wrong or problematic.
-
-
-Other breaking changes
-^^^^^^^^^^^^^^^^^^^^^^
-
-These are breaking changes where deprecation was not possible.
-
-
-- `#11282 <https://github.com/pytest-dev/pytest/issues/11282>`_: Sanitized the handling of the ``default`` parameter when defining configuration options.
-
-  Previously if ``default`` was not supplied for :meth:`parser.addini <pytest.Parser.addini>` and the configuration option value was not defined in a test session, then calls to :func:`config.getini <pytest.Config.getini>` returned an *empty list* or an *empty string* depending on whether ``type`` was supplied or not respectively, which is clearly incorrect. Also, ``None`` was not honored even if ``default=None`` was used explicitly while defining the option.
-
-  Now the behavior of :meth:`parser.addini <pytest.Parser.addini>` is as follows:
-
-  * If ``default`` is NOT passed but ``type`` is provided, then a type-specific default will be returned. For example ``type=bool`` will return ``False``, ``type=str`` will return ``""``, etc.
-  * If ``default=None`` is passed and the option is not defined in a test session, then ``None`` will be returned, regardless of the ``type``.
-  * If neither ``default`` nor ``type`` are provided, assume ``type=str`` and return ``""`` as default (this is as per previous behavior).
-
-  The team decided to not introduce a deprecation period for this change, as doing so would be complicated both in terms of communicating this to the community as well as implementing it, and also because the team believes this change should not break existing plugins except in rare cases.
-
-
-- `#11667 <https://github.com/pytest-dev/pytest/issues/11667>`_: pytest's ``setup.py`` file is removed.
-  If you relied on this file, e.g. to install pytest using ``setup.py install``,
-  please see `Why you shouldn't invoke setup.py directly <https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html#summary>`_ for alternatives.
-
-
-- `#9288 <https://github.com/pytest-dev/pytest/issues/9288>`_: :func:`~pytest.warns` now re-emits unmatched warnings when the context
-  closes -- previously it would consume all warnings, hiding those that were not
-  matched by the function.
-
-  While this is a new feature, we announce it as a breaking change
-  because many test suites are configured to error-out on warnings, and will
-  therefore fail on the newly-re-emitted warnings.
-
-
-
-Deprecations
-------------
-
-- `#10465 <https://github.com/pytest-dev/pytest/issues/10465>`_: Test functions returning a value other than ``None`` will now issue a :class:`pytest.PytestWarning` instead of :class:`pytest.PytestRemovedIn8Warning`, meaning this will stay a warning instead of becoming an error in the future.
-
-
-- `#3664 <https://github.com/pytest-dev/pytest/issues/3664>`_: Applying a mark to a fixture function now issues a warning: marks in fixtures never had any effect, but it is a common user error to apply a mark to a fixture (for example ``usefixtures``) and expect it to work.
-
-  This will become an error in pytest 9.0.
-
-
-
-Features and Improvements
--------------------------
-
-Improved Diffs
-^^^^^^^^^^^^^^
-
-These changes improve the diffs that pytest prints when an assertion fails.
-Note that syntax highlighting requires the ``pygments`` package.
-
-
-- `#11520 <https://github.com/pytest-dev/pytest/issues/11520>`_: The very verbose (``-vv``) diff output is now colored as a diff instead of a big chunk of red.
-
-  Python code in error reports is now syntax-highlighted as Python.
-
-  The sections in the error reports are now better separated.
-
-
-- `#1531 <https://github.com/pytest-dev/pytest/issues/1531>`_: The very verbose diff (``-vv``) for every standard library container type is improved. The indentation is now consistent and the markers are on their own separate lines, which should reduce the diffs shown to users.
-
-  Previously, the standard Python pretty printer was used to generate the output, which puts opening and closing
-  markers on the same line as the first/last entry, in addition to not having consistent indentation.
-
-
-- `#10617 <https://github.com/pytest-dev/pytest/issues/10617>`_: Added more comprehensive set assertion rewrites for comparisons other than equality ``==``, with
-  the following operations now providing better failure messages: ``!=``, ``<=``, ``>=``, ``<``, and ``>``.
-
-
-Separate Control For Assertion Verbosity
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- `#11387 <https://github.com/pytest-dev/pytest/issues/11387>`_: Added the new :confval:`verbosity_assertions` configuration option for fine-grained control of failed assertions verbosity.
-
-  If you've ever wished that pytest always show you full diffs, but without making everything else verbose, this is for you.
-
-  See :ref:`Fine-grained verbosity <pytest.fine_grained_verbosity>` for more details.
-
-  For plugin authors, :attr:`config.get_verbosity <pytest.Config.get_verbosity>` can be used to retrieve the verbosity level for a specific verbosity type.
-
-
-Additional Support For Exception Groups and ``__notes__``
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-These changes improve pytest's support for exception groups.
-
-
-- `#10441 <https://github.com/pytest-dev/pytest/issues/10441>`_: Added :func:`ExceptionInfo.group_contains() <pytest.ExceptionInfo.group_contains>`, an assertion helper that tests if an :class:`ExceptionGroup` contains a matching exception.
-
-  See :ref:`assert-matching-exception-groups` for an example.
-
-
-- `#11227 <https://github.com/pytest-dev/pytest/issues/11227>`_: Allow :func:`pytest.raises` ``match`` argument to match against `PEP-678 <https://peps.python.org/pep-0678/>` ``__notes__``.
-
-
-Custom Directory collectors
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- `#7777 <https://github.com/pytest-dev/pytest/issues/7777>`_: Added a new hook :hook:`pytest_collect_directory`,
-  which is called by filesystem-traversing collector nodes,
-  such as :class:`pytest.Session`, :class:`pytest.Dir` and :class:`pytest.Package`,
-  to create a collector node for a sub-directory.
-  It is expected to return a subclass of :class:`pytest.Directory`.
-  This hook allows plugins to :ref:`customize the collection of directories <custom directory collectors>`.
-
-
-"New-style" Hook Wrappers
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-- `#11122 <https://github.com/pytest-dev/pytest/issues/11122>`_: pytest now uses "new-style" hook wrappers internally, available since pluggy 1.2.0.
-  See `pluggy's 1.2.0 changelog <https://pluggy.readthedocs.io/en/latest/changelog.html#pluggy-1-2-0-2023-06-21>`_ and the :ref:`updated docs <hookwrapper>` for details.
-
-  Plugins which want to use new-style wrappers can do so if they require ``pytest>=8``.
-
-
-Other Improvements
-^^^^^^^^^^^^^^^^^^
-
-- `#11216 <https://github.com/pytest-dev/pytest/issues/11216>`_: If a test is skipped from inside an :ref:`xunit setup fixture <classic xunit>`, the test summary now shows the test location instead of the fixture location.
-
-
-- `#11314 <https://github.com/pytest-dev/pytest/issues/11314>`_: Logging to a file using the ``--log-file`` option will use ``--log-level``, ``--log-format`` and ``--log-date-format`` as fallback
-  if ``--log-file-level``, ``--log-file-format`` and ``--log-file-date-format`` are not provided respectively.
-
-
-- `#11610 <https://github.com/pytest-dev/pytest/issues/11610>`_: Added the :func:`LogCaptureFixture.filtering() <pytest.LogCaptureFixture.filtering>` context manager which
-  adds a given :class:`logging.Filter` object to the :fixture:`caplog` fixture.
-
-
-- `#11447 <https://github.com/pytest-dev/pytest/issues/11447>`_: :func:`pytest.deprecated_call` now also considers warnings of type :class:`FutureWarning`.
-
-
-- `#11600 <https://github.com/pytest-dev/pytest/issues/11600>`_: Improved the documentation and type signature for :func:`pytest.mark.xfail <pytest.mark.xfail>`'s ``condition`` param to use ``False`` as the default value.
-
-
-- `#7469 <https://github.com/pytest-dev/pytest/issues/7469>`_: :class:`~pytest.FixtureDef` is now exported as ``pytest.FixtureDef`` for typing purposes.
-
-
-- `#11353 <https://github.com/pytest-dev/pytest/issues/11353>`_: Added typing to :class:`~pytest.PytestPluginManager`.
-
-
-Bug Fixes
----------
-
-- `#10701 <https://github.com/pytest-dev/pytest/issues/10701>`_: :meth:`pytest.WarningsRecorder.pop` will return the most-closely-matched warning in the list,
-  rather than the first warning which is an instance of the requested type.
-
-
-- `#11255 <https://github.com/pytest-dev/pytest/issues/11255>`_: Fixed crash on `parametrize(..., scope="package")` without a package present.
-
-
-- `#11277 <https://github.com/pytest-dev/pytest/issues/11277>`_: Fixed a bug that when there are multiple fixtures for an indirect parameter,
-  the scope of the highest-scope fixture is picked for the parameter set, instead of that of the one with the narrowest scope.
-
-
-- `#11456 <https://github.com/pytest-dev/pytest/issues/11456>`_: Parametrized tests now *really do* ensure that the ids given to each input are unique - for
-  example, ``a, a, a0`` now results in ``a1, a2, a0`` instead of the previous (buggy) ``a0, a1, a0``.
-  This necessarily means changing nodeids where these were previously colliding, and for
-  readability adds an underscore when non-unique ids end in a number.
-
-
-- `#11563 <https://github.com/pytest-dev/pytest/issues/11563>`_: Fixed a crash when using an empty string for the same parametrized value more than once.
-
-
-- `#11712 <https://github.com/pytest-dev/pytest/issues/11712>`_: Fixed handling ``NO_COLOR`` and ``FORCE_COLOR`` to ignore an empty value.
-
-
-- `#9036 <https://github.com/pytest-dev/pytest/issues/9036>`_: ``pytest.warns`` and similar functions now capture warnings when an exception is raised inside a ``with`` block.
-
-
-
-Improved Documentation
-----------------------
-
-- `#11011 <https://github.com/pytest-dev/pytest/issues/11011>`_: Added a warning about modifying the root logger during tests when using ``caplog``.
-
-
-- `#11065 <https://github.com/pytest-dev/pytest/issues/11065>`_: Use ``pytestconfig`` instead of ``request.config`` in cache example to be consistent with the API documentation.
-
-
-Trivial/Internal Changes
-------------------------
-
-- `#11208 <https://github.com/pytest-dev/pytest/issues/11208>`_: The (internal) ``FixtureDef.cached_result`` type has changed.
-  Now the third item ``cached_result[2]``, when set, is an exception instance instead of an exception triplet.
-
-
-- `#11218 <https://github.com/pytest-dev/pytest/issues/11218>`_: (This entry is meant to assist plugins which access private pytest internals to instantiate ``FixtureRequest`` objects.)
-
-  :class:`~pytest.FixtureRequest` is now an abstract class which can't be instantiated directly.
-  A new concrete ``TopRequest`` subclass of ``FixtureRequest`` has been added for the ``request`` fixture in test functions,
-  as counterpart to the existing ``SubRequest`` subclass for the ``request`` fixture in fixture functions.
-
-
-- `#11315 <https://github.com/pytest-dev/pytest/issues/11315>`_: The :fixture:`pytester` fixture now uses the :fixture:`monkeypatch` fixture to manage the current working directory.
-  If you use ``pytester`` in combination with :func:`monkeypatch.undo() <pytest.MonkeyPatch.undo>`, the CWD might get restored.
-  Use :func:`monkeypatch.context() <pytest.MonkeyPatch.context>` instead.
-
-
-- `#11333 <https://github.com/pytest-dev/pytest/issues/11333>`_: Corrected the spelling of ``Config.ArgsSource.INVOCATION_DIR``.
-  The previous spelling ``INCOVATION_DIR`` remains as an alias.
-
-
-- `#11638 <https://github.com/pytest-dev/pytest/issues/11638>`_: Fixed the selftests to pass correctly if ``FORCE_COLOR``, ``NO_COLOR`` or ``PY_COLORS`` is set in the calling environment.
-
-pytest 7.4.4 (2023-12-31)
-=========================
-
-Bug Fixes
----------
-
-- `#11140 <https://github.com/pytest-dev/pytest/issues/11140>`_: Fix non-string constants at the top of file being detected as docstrings on Python>=3.8.
-
-
-- `#11572 <https://github.com/pytest-dev/pytest/issues/11572>`_: Handle an edge case where :data:`sys.stderr` and :data:`sys.__stderr__` might already be closed when :ref:`faulthandler` is tearing down.
-
-
-- `#11710 <https://github.com/pytest-dev/pytest/issues/11710>`_: Fixed tracebacks from collection errors not getting pruned.
-
-
-- `#7966 <https://github.com/pytest-dev/pytest/issues/7966>`_: Removed unhelpful error message from assertion rewrite mechanism when exceptions are raised in ``__iter__`` methods. Now they are treated un-iterable instead.
-
-
-
-Improved Documentation
-----------------------
-
-- `#11091 <https://github.com/pytest-dev/pytest/issues/11091>`_: Updated documentation to refer to hyphenated options: replaced ``--junitxml`` with ``--junit-xml`` and ``--collectonly`` with ``--collect-only``.
-
-
-pytest 7.4.3 (2023-10-24)
-=========================
-
-Bug Fixes
----------
-
-- `#10447 <https://github.com/pytest-dev/pytest/issues/10447>`_: Markers are now considered in the reverse mro order to ensure base  class markers are considered first -- this resolves a regression.
-
-
-- `#11239 <https://github.com/pytest-dev/pytest/issues/11239>`_: Fixed ``:=`` in asserts impacting unrelated test cases.
-
-
-- `#11439 <https://github.com/pytest-dev/pytest/issues/11439>`_: Handled an edge case where :data:`sys.stderr` might already be closed when :ref:`faulthandler` is tearing down.
-
-
-pytest 7.4.2 (2023-09-07)
-=========================
-
-Bug Fixes
----------
-
-- `#11237 <https://github.com/pytest-dev/pytest/issues/11237>`_: Fix doctest collection of `functools.cached_property` objects.
-
-
-- `#11306 <https://github.com/pytest-dev/pytest/issues/11306>`_: Fixed bug using ``--importmode=importlib`` which would cause package ``__init__.py`` files to be imported more than once in some cases.
-
-
-- `#11367 <https://github.com/pytest-dev/pytest/issues/11367>`_: Fixed bug where `user_properties` where not being saved in the JUnit XML file if a fixture failed during teardown.
-
-
-- `#11394 <https://github.com/pytest-dev/pytest/issues/11394>`_: Fixed crash when parsing long command line arguments that might be interpreted as files.
-
-
-
-Improved Documentation
-----------------------
-
-- `#11391 <https://github.com/pytest-dev/pytest/issues/11391>`_: Improved disclaimer on pytest plugin reference page to better indicate this is an automated, non-curated listing.
-
-
-pytest 7.4.1 (2023-09-02)
-=========================
-
-Bug Fixes
----------
-
-- `#10337 <https://github.com/pytest-dev/pytest/issues/10337>`_: Fixed bug where fake intermediate modules generated by ``--import-mode=importlib`` would not include the
-  child modules as attributes of the parent modules.
-
-
-- `#10702 <https://github.com/pytest-dev/pytest/issues/10702>`_: Fixed error assertion handling in :func:`pytest.approx` when ``None`` is an expected or received value when comparing dictionaries.
-
-
-- `#10811 <https://github.com/pytest-dev/pytest/issues/10811>`_: Fixed issue when using ``--import-mode=importlib`` together with ``--doctest-modules`` that caused modules
-  to be imported more than once, causing problems with modules that have import side effects.
-
-
-pytest 7.4.0 (2023-06-23)
-=========================
-
-Features
---------
-
-- `#10901 <https://github.com/pytest-dev/pytest/issues/10901>`_: Added :func:`ExceptionInfo.from_exception() <pytest.ExceptionInfo.from_exception>`, a simpler way to create an :class:`~pytest.ExceptionInfo` from an exception.
-  This can replace :func:`ExceptionInfo.from_exc_info() <pytest.ExceptionInfo.from_exc_info()>` for most uses.
-
-
-
-Improvements
-------------
-
-- `#10872 <https://github.com/pytest-dev/pytest/issues/10872>`_: Update test log report annotation to named tuple and fixed inconsistency in docs for :hook:`pytest_report_teststatus` hook.
-
-
-- `#10907 <https://github.com/pytest-dev/pytest/issues/10907>`_: When an exception traceback to be displayed is completely filtered out (by mechanisms such as ``__tracebackhide__``, internal frames, and similar), now only the exception string and the following message are shown:
-
-  "All traceback entries are hidden. Pass `--full-trace` to see hidden and internal frames.".
-
-  Previously, the last frame of the traceback was shown, even though it was hidden.
-
-
-- `#10940 <https://github.com/pytest-dev/pytest/issues/10940>`_: Improved verbose output (``-vv``) of ``skip`` and ``xfail`` reasons by performing text wrapping while leaving a clear margin for progress output.
-
-  Added ``TerminalReporter.wrap_write()`` as a helper for that.
-
-
-- `#10991 <https://github.com/pytest-dev/pytest/issues/10991>`_: Added handling of ``%f`` directive to print microseconds in log format options, such as ``log-date-format``.
-
-
-- `#11005 <https://github.com/pytest-dev/pytest/issues/11005>`_: Added the underlying exception to the cache provider's path creation and write warning messages.
-
-
-- `#11013 <https://github.com/pytest-dev/pytest/issues/11013>`_: Added warning when :confval:`testpaths` is set, but paths are not found by glob. In this case, pytest will fall back to searching from the current directory.
-
-
-- `#11043 <https://github.com/pytest-dev/pytest/issues/11043>`_: When `--confcutdir` is not specified, and there is no config file present, the conftest cutoff directory (`--confcutdir`) is now set to the :ref:`rootdir <rootdir>`.
-  Previously in such cases, `conftest.py` files would be probed all the way to the root directory of the filesystem.
-  If you are badly affected by this change, consider adding an empty config file to your desired cutoff directory, or explicitly set `--confcutdir`.
-
-
-- `#11081 <https://github.com/pytest-dev/pytest/issues/11081>`_: The :confval:`norecursedirs` check is now performed in a :hook:`pytest_ignore_collect` implementation, so plugins can affect it.
-
-  If after updating to this version you see that your `norecursedirs` setting is not being respected,
-  it means that a conftest or a plugin you use has a bad `pytest_ignore_collect` implementation.
-  Most likely, your hook returns `False` for paths it does not want to ignore,
-  which ends the processing and doesn't allow other plugins, including pytest itself, to ignore the path.
-  The fix is to return `None` instead of `False` for paths your hook doesn't want to ignore.
-
-
-- `#8711 <https://github.com/pytest-dev/pytest/issues/8711>`_: :func:`caplog.set_level() <pytest.LogCaptureFixture.set_level>` and :func:`caplog.at_level() <pytest.LogCaptureFixture.at_level>`
-  will temporarily enable the requested ``level`` if ``level`` was disabled globally via
-  ``logging.disable(LEVEL)``.
-
-
-
-Bug Fixes
----------
-
-- `#10831 <https://github.com/pytest-dev/pytest/issues/10831>`_: Terminal Reporting: Fixed bug when running in ``--tb=line`` mode where ``pytest.fail(pytrace=False)`` tests report ``None``.
-
-
-- `#11068 <https://github.com/pytest-dev/pytest/issues/11068>`_: Fixed the ``--last-failed`` whole-file skipping functionality ("skipped N files") for :ref:`non-python test files <non-python tests>`.
-
-
-- `#11104 <https://github.com/pytest-dev/pytest/issues/11104>`_: Fixed a regression in pytest 7.3.2 which caused to :confval:`testpaths` to be considered for loading initial conftests,
-  even when it was not utilized (e.g. when explicit paths were given on the command line).
-  Now the ``testpaths`` are only considered when they are in use.
-
-
-- `#1904 <https://github.com/pytest-dev/pytest/issues/1904>`_: Fixed traceback entries hidden with ``__tracebackhide__ = True`` still being shown for chained exceptions (parts after "... the above exception ..." message).
-
-
-- `#7781 <https://github.com/pytest-dev/pytest/issues/7781>`_: Fix writing non-encodable text to log file when using ``--debug``.
-
-
-
-Improved Documentation
-----------------------
-
-- `#9146 <https://github.com/pytest-dev/pytest/issues/9146>`_: Improved documentation for :func:`caplog.set_level() <pytest.LogCaptureFixture.set_level>`.
-
-
-
-Trivial/Internal Changes
-------------------------
-
-- `#11031 <https://github.com/pytest-dev/pytest/issues/11031>`_: Enhanced the CLI flag for ``-c`` to now include ``--config-file`` to make it clear that this flag applies to the usage of a custom config file.
-
-
 pytest 7.3.2 (2023-06-10)
 =========================
 
@@ -809,7 +264,7 @@ Improvements
 
 
 - `#8508 <https://github.com/pytest-dev/pytest/issues/8508>`_: Introduce multiline display for warning matching  via :py:func:`pytest.warns` and
-  enhance match comparison for :py:func:`pytest.ExceptionInfo.match` as returned by :py:func:`pytest.raises`.
+  enhance match comparison for :py:func:`_pytest._code.ExceptionInfo.match` as returned by :py:func:`pytest.raises`.
 
 
 - `#8646 <https://github.com/pytest-dev/pytest/issues/8646>`_: Improve :py:func:`pytest.raises`. Previously passing an empty tuple would give a confusing
@@ -818,7 +273,7 @@ Improvements
 
 - `#9741 <https://github.com/pytest-dev/pytest/issues/9741>`_: On Python 3.11, use the standard library's :mod:`tomllib` to parse TOML.
 
-  `tomli` is no longer a dependency on Python 3.11.
+  :mod:`tomli` is no longer a dependency on Python 3.11.
 
 
 - `#9742 <https://github.com/pytest-dev/pytest/issues/9742>`_: Display assertion message without escaped newline characters with ``-vv``.
@@ -853,7 +308,7 @@ Bug Fixes
 
   When inheriting marks from super-classes, marks from the sub-classes are now ordered before marks from the super-classes, in MRO order. Previously it was the reverse.
 
-  When inheriting marks from super-classes, the `pytestmark` attribute of the sub-class now only contains the marks directly applied to it. Previously, it also contained marks from its super-classes. Please note that this attribute should not normally be accessed directly; use :func:`Node.iter_markers <_pytest.nodes.Node.iter_markers>` instead.
+  When inheriting marks from super-classes, the `pytestmark` attribute of the sub-class now only contains the marks directly applied to it. Previously, it also contained marks from its super-classes. Please note that this attribute should not normally be accessed directly; use :func:`pytest.Node.iter_markers` instead.
 
 
 - `#9159 <https://github.com/pytest-dev/pytest/issues/9159>`_: Showing inner exceptions by forcing native display in ``ExceptionGroups`` even when using display options other than ``--tb=native``. A temporary step before full implementation of pytest-native display for inner exceptions in ``ExceptionGroups``.
@@ -1106,7 +561,7 @@ Bug Fixes
 - `#9355 <https://github.com/pytest-dev/pytest/issues/9355>`_: Fixed error message prints function decorators when using assert in Python 3.8 and above.
 
 
-- `#9396 <https://github.com/pytest-dev/pytest/issues/9396>`_: Ensure `pytest.Config.inifile` is available during the :hook:`pytest_cmdline_main` hook (regression during ``7.0.0rc1``).
+- `#9396 <https://github.com/pytest-dev/pytest/issues/9396>`_: Ensure :attr:`pytest.Config.inifile` is available during the :func:`pytest_cmdline_main <_pytest.hookspec.pytest_cmdline_main>` hook (regression during ``7.0.0rc1``).
 
 
 
@@ -1251,7 +706,7 @@ Deprecations
   - ``parser.addoption(..., type="int/string/float/complex")`` - use ``type=int`` etc. instead.
 
 
-- `#8447 <https://github.com/pytest-dev/pytest/issues/8447>`_: Defining a custom pytest node type which is both an :class:`~pytest.Item` and a :class:`~pytest.Collector` (e.g. :class:`~pytest.File`) now issues a warning.
+- `#8447 <https://github.com/pytest-dev/pytest/issues/8447>`_: Defining a custom pytest node type which is both an :class:`pytest.Item <Item>` and a :class:`pytest.Collector <Collector>` (e.g. :class:`pytest.File <File>`) now issues a warning.
   It was never sanely supported and triggers hard to debug errors.
 
   See :ref:`the deprecation note <diamond-inheritance-deprecated>` for full details.
@@ -1293,7 +748,7 @@ Features
 - `#7132 <https://github.com/pytest-dev/pytest/issues/7132>`_: Added two environment variables :envvar:`PYTEST_THEME` and :envvar:`PYTEST_THEME_MODE` to let the users customize the pygments theme used.
 
 
-- `#7259 <https://github.com/pytest-dev/pytest/issues/7259>`_: Added :meth:`cache.mkdir() <pytest.Cache.mkdir>`, which is similar to the existing ``cache.makedir()``,
+- `#7259 <https://github.com/pytest-dev/pytest/issues/7259>`_: Added :meth:`cache.mkdir() <pytest.Cache.mkdir>`, which is similar to the existing :meth:`cache.makedir() <pytest.Cache.makedir>`,
   but returns a :class:`pathlib.Path` instead of a legacy ``py.path.local``.
 
   Added a ``paths`` type to :meth:`parser.addini() <pytest.Parser.addini>`,
@@ -1319,7 +774,7 @@ Features
   - ``pytest.HookRecorder`` for the :class:`HookRecorder <pytest.HookRecorder>` type returned from :class:`~pytest.Pytester`.
   - ``pytest.RecordedHookCall`` for the :class:`RecordedHookCall <pytest.HookRecorder>` type returned from :class:`~pytest.HookRecorder`.
   - ``pytest.RunResult`` for the :class:`RunResult <pytest.RunResult>` type returned from :class:`~pytest.Pytester`.
-  - ``pytest.LineMatcher`` for the :class:`LineMatcher <pytest.LineMatcher>` type used in :class:`~pytest.RunResult` and others.
+  - ``pytest.LineMatcher`` for the :class:`LineMatcher <pytest.RunResult>` type used in :class:`~pytest.RunResult` and others.
   - ``pytest.TestReport`` for the :class:`TestReport <pytest.TestReport>` type used in various hooks.
   - ``pytest.CollectReport`` for the :class:`CollectReport <pytest.CollectReport>` type used in various hooks.
 
@@ -1352,7 +807,7 @@ Features
 
 
 - `#8251 <https://github.com/pytest-dev/pytest/issues/8251>`_: Implement ``Node.path`` as a ``pathlib.Path``. Both the old ``fspath`` and this new attribute gets set no matter whether ``path`` or ``fspath`` (deprecated) is passed to the constructor. It is a replacement for the ``fspath`` attribute (which represents the same path as ``py.path.local``). While ``fspath`` is not deprecated yet
-  due to the ongoing migration of methods like :meth:`~pytest.Item.reportinfo`, we expect to deprecate it in a future release.
+  due to the ongoing migration of methods like :meth:`~_pytest.Item.reportinfo`, we expect to deprecate it in a future release.
 
   .. note::
       The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
@@ -1384,7 +839,7 @@ Features
   See :ref:`plugin-stash` for details.
 
 
-- `#8953 <https://github.com/pytest-dev/pytest/issues/8953>`_: :class:`~pytest.RunResult` method :meth:`~pytest.RunResult.assert_outcomes` now accepts a
+- `#8953 <https://github.com/pytest-dev/pytest/issues/8953>`_: :class:`RunResult <_pytest.pytester.RunResult>` method :meth:`assert_outcomes <_pytest.pytester.RunResult.assert_outcomes>` now accepts a
   ``warnings`` argument to assert the total number of warnings captured.
 
 
@@ -1396,7 +851,7 @@ Features
   used.
 
 
-- `#9113 <https://github.com/pytest-dev/pytest/issues/9113>`_: :class:`~pytest.RunResult` method :meth:`~pytest.RunResult.assert_outcomes` now accepts a
+- `#9113 <https://github.com/pytest-dev/pytest/issues/9113>`_: :class:`RunResult <_pytest.pytester.RunResult>` method :meth:`assert_outcomes <_pytest.pytester.RunResult.assert_outcomes>` now accepts a
   ``deselected`` argument to assert the total number of deselected tests.
 
 
@@ -1409,7 +864,7 @@ Improvements
 
 - `#7480 <https://github.com/pytest-dev/pytest/issues/7480>`_: A deprecation scheduled to be removed in a major version X (e.g. pytest 7, 8, 9, ...) now uses warning category `PytestRemovedInXWarning`,
   a subclass of :class:`~pytest.PytestDeprecationWarning`,
-  instead of :class:`~pytest.PytestDeprecationWarning` directly.
+  instead of :class:`PytestDeprecationWarning` directly.
 
   See :ref:`backwards-compatibility` for more details.
 
@@ -1448,7 +903,7 @@ Improvements
 
 - `#8803 <https://github.com/pytest-dev/pytest/issues/8803>`_: It is now possible to add colors to custom log levels on cli log.
 
-  By using ``add_color_level`` from a :hook:`pytest_configure` hook, colors can be added::
+  By using :func:`add_color_level <_pytest.logging.add_color_level>` from a ``pytest_configure`` hook, colors can be added::
 
       logging_plugin = config.pluginmanager.get_plugin('logging-plugin')
       logging_plugin.log_cli_handler.formatter.add_color_level(logging.INFO, 'cyan')
@@ -1513,7 +968,7 @@ Bug Fixes
 
 - `#8503 <https://github.com/pytest-dev/pytest/issues/8503>`_: :meth:`pytest.MonkeyPatch.syspath_prepend` no longer fails when
   ``setuptools`` is not installed.
-  It now only calls ``pkg_resources.fixup_namespace_packages`` if
+  It now only calls :func:`pkg_resources.fixup_namespace_packages` if
   ``pkg_resources`` was previously imported, because it is not needed otherwise.
 
 
@@ -1740,7 +1195,7 @@ Features
 
   This is part of the movement to use :class:`pathlib.Path` objects internally, in order to remove the dependency to ``py`` in the future.
 
-  Internally, the old ``pytest.Testdir`` is now a thin wrapper around :class:`~pytest.Pytester`, preserving the old interface.
+  Internally, the old :class:`Testdir <_pytest.pytester.Testdir>` is now a thin wrapper around :class:`Pytester <_pytest.pytester.Pytester>`, preserving the old interface.
 
 
 - :issue:`7695`: A new hook was added, `pytest_markeval_namespace` which should return a dictionary.
@@ -1778,7 +1233,7 @@ Features
 Improvements
 ------------
 
-- :issue:`1265`: Added an ``__str__`` implementation to the :class:`~pytest.LineMatcher` class which is returned from ``pytester.run_pytest().stdout`` and similar. It returns the entire output, like the existing ``str()`` method.
+- :issue:`1265`: Added an ``__str__`` implementation to the :class:`~pytest.pytester.LineMatcher` class which is returned from ``pytester.run_pytest().stdout`` and similar. It returns the entire output, like the existing ``str()`` method.
 
 
 - :issue:`2044`: Verbose mode now shows the reason that a test was skipped in the test's terminal line after the "SKIPPED", "XFAIL" or "XPASS".
@@ -1842,7 +1297,7 @@ Bug Fixes
 - :issue:`7911`: Directories created by by :fixture:`tmp_path` and :fixture:`tmpdir` are now considered stale after 3 days without modification (previous value was 3 hours) to avoid deleting directories still in use in long running test suites.
 
 
-- :issue:`7913`: Fixed a crash or hang in :meth:`pytester.spawn <pytest.Pytester.spawn>` when the :mod:`readline` module is involved.
+- :issue:`7913`: Fixed a crash or hang in :meth:`pytester.spawn <_pytest.pytester.Pytester.spawn>` when the :mod:`readline` module is involved.
 
 
 - :issue:`7951`: Fixed handling of recursive symlinks when collecting tests.
@@ -1959,7 +1414,7 @@ Deprecations
   if you use this and want a replacement.
 
 
-- :issue:`7255`: The ``pytest_warning_captured`` hook is deprecated in favor
+- :issue:`7255`: The :hook:`pytest_warning_captured` hook is deprecated in favor
   of :hook:`pytest_warning_recorded`, and will be removed in a future version.
 
 
@@ -1987,8 +1442,8 @@ Improvements
 - :issue:`7572`: When a plugin listed in ``required_plugins`` is missing or an unknown config key is used with ``--strict-config``, a simple error message is now shown instead of a stacktrace.
 
 
-- :issue:`7685`: Added two new attributes :attr:`rootpath <pytest.Config.rootpath>` and :attr:`inipath <pytest.Config.inipath>` to :class:`~pytest.Config`.
-  These attributes are :class:`pathlib.Path` versions of the existing ``rootdir`` and ``inifile`` attributes,
+- :issue:`7685`: Added two new attributes :attr:`rootpath <_pytest.config.Config.rootpath>` and :attr:`inipath <_pytest.config.Config.inipath>` to :class:`Config <_pytest.config.Config>`.
+  These attributes are :class:`pathlib.Path` versions of the existing :attr:`rootdir <_pytest.config.Config.rootdir>` and :attr:`inifile <_pytest.config.Config.inifile>` attributes,
   and should be preferred over them when possible.
 
 
@@ -2059,7 +1514,7 @@ Trivial/Internal Changes
 - :issue:`7587`: The dependency on the ``more-itertools`` package has been removed.
 
 
-- :issue:`7631`: The result type of :meth:`capfd.readouterr() <pytest.CaptureFixture.readouterr>` (and similar) is no longer a namedtuple,
+- :issue:`7631`: The result type of :meth:`capfd.readouterr() <_pytest.capture.CaptureFixture.readouterr>` (and similar) is no longer a namedtuple,
   but should behave like one in all respects. This was done for technical reasons.
 
 
@@ -2437,10 +1892,10 @@ Improvements
 - :issue:`7128`: `pytest --version` now displays just the pytest version, while `pytest --version --version` displays more verbose information including plugins. This is more consistent with how other tools show `--version`.
 
 
-- :issue:`7133`: :meth:`caplog.set_level() <pytest.LogCaptureFixture.set_level>` will now override any :confval:`log_level` set via the CLI or configuration file.
+- :issue:`7133`: :meth:`caplog.set_level() <_pytest.logging.LogCaptureFixture.set_level>` will now override any :confval:`log_level` set via the CLI or configuration file.
 
 
-- :issue:`7159`: :meth:`caplog.set_level() <pytest.LogCaptureFixture.set_level>` and :meth:`caplog.at_level() <pytest.LogCaptureFixture.at_level>` no longer affect
+- :issue:`7159`: :meth:`caplog.set_level() <_pytest.logging.LogCaptureFixture.set_level>` and :meth:`caplog.at_level() <_pytest.logging.LogCaptureFixture.at_level>` no longer affect
   the level of logs that are shown in the *Captured log report* report section.
 
 
@@ -2535,7 +1990,7 @@ Bug Fixes
   parameter when Python is called with the ``-bb`` flag.
 
 
-- :issue:`7143`: Fix :meth:`pytest.File.from_parent <_pytest.nodes.Node.from_parent>` so it forwards extra keyword arguments to the constructor.
+- :issue:`7143`: Fix :meth:`pytest.File.from_parent` so it forwards extra keyword arguments to the constructor.
 
 
 - :issue:`7145`: Classes with broken ``__getattribute__`` methods are displayed correctly during failures.
@@ -2786,7 +2241,7 @@ Improvements
 - :issue:`6384`: Make `--showlocals` work also with `--tb=short`.
 
 
-- :issue:`6653`: Add support for matching lines consecutively with :class:`~pytest.LineMatcher`'s :func:`~pytest.LineMatcher.fnmatch_lines` and :func:`~pytest.LineMatcher.re_match_lines`.
+- :issue:`6653`: Add support for matching lines consecutively with :attr:`LineMatcher <_pytest.pytester.LineMatcher>`'s :func:`~_pytest.pytester.LineMatcher.fnmatch_lines` and :func:`~_pytest.pytester.LineMatcher.re_match_lines`.
 
 
 - :issue:`6658`: Code is now highlighted in tracebacks when ``pygments`` is installed.
@@ -2854,7 +2309,7 @@ Bug Fixes
 - :issue:`6597`: Fix node ids which contain a parametrized empty-string variable.
 
 
-- :issue:`6646`: Assertion rewriting hooks are (re)stored for the current item, which fixes them being still used after e.g. pytester's ``testdir.runpytest`` etc.
+- :issue:`6646`: Assertion rewriting hooks are (re)stored for the current item, which fixes them being still used after e.g. pytester's :func:`testdir.runpytest <_pytest.pytester.Testdir.runpytest>` etc.
 
 
 - :issue:`6660`: :py:func:`pytest.exit` is handled when emitted from the :hook:`pytest_sessionfinish` hook.  This includes quitting from a debugger.
@@ -2920,7 +2375,7 @@ Bug Fixes
   ``multiprocessing`` module.
 
 
-- :issue:`6436`: :class:`~pytest.FixtureDef` objects now properly register their finalizers with autouse and
+- :issue:`6436`: :class:`FixtureDef <_pytest.fixtures.FixtureDef>` objects now properly register their finalizers with autouse and
   parameterized fixtures that execute before them in the fixture stack so they are torn
   down at the right times, and in the right order.
 
@@ -2976,7 +2431,7 @@ Improvements
 Bug Fixes
 ---------
 
-- :issue:`5914`: pytester: fix :py:func:`~pytest.LineMatcher.no_fnmatch_line` when used after positive matching.
+- :issue:`5914`: pytester: fix :py:func:`~_pytest.pytester.LineMatcher.no_fnmatch_line` when used after positive matching.
 
 
 - :issue:`6082`: Fix line detection for doctest samples inside :py:class:`python:property` docstrings, as a workaround to :bpo:`17446`.
@@ -3040,8 +2495,8 @@ Features
   rather than implicitly.
 
 
-- :issue:`5914`: :fixture:`testdir` learned two new functions, :py:func:`~pytest.LineMatcher.no_fnmatch_line` and
-  :py:func:`~pytest.LineMatcher.no_re_match_line`.
+- :issue:`5914`: :fixture:`testdir` learned two new functions, :py:func:`~_pytest.pytester.LineMatcher.no_fnmatch_line` and
+  :py:func:`~_pytest.pytester.LineMatcher.no_re_match_line`.
 
   The functions are used to ensure the captured text *does not* match the given
   pattern.
@@ -6893,7 +6348,7 @@ Changes
 * fix :issue:`2013`: turn RecordedWarning into ``namedtuple``,
   to give it a comprehensible repr while preventing unwarranted modification.
 
-* fix :issue:`2208`: ensure an iteration limit for ``_pytest.compat.get_real_func``.
+* fix :issue:`2208`: ensure an iteration limit for _pytest.compat.get_real_func.
   Thanks :user:`RonnyPfannschmidt` for the report and PR.
 
 * Hooks are now verified after collection is complete, rather than right after loading installed plugins. This

doc/en/conf.py

@@ -15,10 +15,12 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
+import ast
 import os
 import shutil
 import sys
 from textwrap import dedent
+from typing import List
 from typing import TYPE_CHECKING
 
 from _pytest import __version__ as version
@@ -169,50 +171,6 @@ extlinks = {
 }
 
 
-nitpicky = True
-nitpick_ignore = [
-    # TODO (fix in pluggy?)
-    ("py:class", "HookCaller"),
-    ("py:class", "HookspecMarker"),
-    ("py:exc", "PluginValidationError"),
-    # Might want to expose/TODO (https://github.com/pytest-dev/pytest/issues/7469)
-    ("py:class", "ExceptionRepr"),
-    ("py:class", "Exit"),
-    ("py:class", "SubRequest"),
-    ("py:class", "SubRequest"),
-    ("py:class", "TerminalReporter"),
-    ("py:class", "_pytest._code.code.TerminalRepr"),
-    ("py:class", "_pytest.fixtures.FixtureFunctionMarker"),
-    ("py:class", "_pytest.logging.LogCaptureHandler"),
-    ("py:class", "_pytest.mark.structures.ParameterSet"),
-    # Intentionally undocumented/private
-    ("py:class", "_pytest._code.code.Traceback"),
-    ("py:class", "_pytest._py.path.LocalPath"),
-    ("py:class", "_pytest.capture.CaptureResult"),
-    ("py:class", "_pytest.compat.NotSetType"),
-    ("py:class", "_pytest.python.PyCollector"),
-    ("py:class", "_pytest.python.PyobjMixin"),
-    ("py:class", "_pytest.python_api.RaisesContext"),
-    ("py:class", "_pytest.recwarn.WarningsChecker"),
-    ("py:class", "_pytest.reports.BaseReport"),
-    # Undocumented third parties
-    ("py:class", "_tracing.TagTracerSub"),
-    ("py:class", "warnings.WarningMessage"),
-    # Undocumented type aliases
-    ("py:class", "LEGACY_PATH"),
-    ("py:class", "_PluggyPlugin"),
-    # TypeVars
-    ("py:class", "_pytest._code.code.E"),
-    ("py:class", "_pytest.fixtures.FixtureFunction"),
-    ("py:class", "_pytest.nodes._NodeType"),
-    ("py:class", "_pytest.python_api.E"),
-    ("py:class", "_pytest.recwarn.T"),
-    ("py:class", "_pytest.runner.TResult"),
-    ("py:obj", "_pytest.fixtures.FixtureValue"),
-    ("py:obj", "_pytest.stash.T"),
-]
-
-
 # -- Options for HTML output ---------------------------------------------------
 
 sys.path.append(os.path.abspath("_themes"))
@@ -493,6 +451,25 @@ def setup(app: "sphinx.application.Sphinx") -> None:
 
     configure_logging(app)
 
+    # Make Sphinx mark classes with "final" when decorated with @final.
+    # We need this because we import final from pytest._compat, not from
+    # typing (for Python < 3.8 compat), so Sphinx doesn't detect it.
+    # To keep things simple we accept any `@final` decorator.
+    # Ref: https://github.com/pytest-dev/pytest/pull/7780
+    import sphinx.pycode.ast
+    import sphinx.pycode.parser
+
+    original_is_final = sphinx.pycode.parser.VariableCommentPicker.is_final
+
+    def patched_is_final(self, decorators: List[ast.expr]) -> bool:
+        if original_is_final(self, decorators):
+            return True
+        return any(
+            sphinx.pycode.ast.unparse(decorator) == "final" for decorator in decorators
+        )
+
+    sphinx.pycode.parser.VariableCommentPicker.is_final = patched_is_final
+
     # legacypath.py monkey-patches pytest.Testdir in. Import the file so
     # that autodoc can discover references to it.
     import _pytest.legacypath  # noqa: F401

doc/en/deprecations.rst

@@ -177,7 +177,7 @@ arguments they only pass on to the superclass.
     resolved in future versions as we slowly get rid of the :pypi:`py`
     dependency (see :issue:`9283` for a longer discussion).
 
-Due to the ongoing migration of methods like :meth:`~pytest.Item.reportinfo`
+Due to the ongoing migration of methods like :meth:`~_pytest.Item.reportinfo`
 which still is expected to return a ``py.path.local`` object, nodes still have
 both ``fspath`` (``py.path.local``) and ``path`` (``pathlib.Path``) attributes,
 no matter what argument was used in the constructor. We expect to deprecate the
@@ -336,7 +336,7 @@ Diamond inheritance between :class:`pytest.Collector` and :class:`pytest.Item`
 
 .. deprecated:: 7.0
 
-Defining a custom pytest node type which is both an :class:`~pytest.Item` and a :class:`~pytest.Collector` (e.g. :class:`~pytest.File`) now issues a warning.
+Defining a custom pytest node type which is both an :class:`pytest.Item <Item>` and a :class:`pytest.Collector <Collector>` (e.g. :class:`pytest.File <File>`) now issues a warning.
 It was never sanely supported and triggers hard to debug errors.
 
 Some plugins providing linting/code analysis have been using this as a hack.
@@ -348,8 +348,8 @@ Instead, a separate collector node should be used, which collects the item. See
 
 .. _uncooperative-constructors-deprecated:
 
-Constructors of custom :class:`~_pytest.nodes.Node` subclasses should take ``**kwargs``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Constructors of custom :class:`pytest.Node` subclasses should take ``**kwargs``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. deprecated:: 7.0
 
@@ -380,25 +380,6 @@ conflicts (such as :class:`pytest.File` now taking ``path`` instead of
 ``fspath``, as :ref:`outlined above <node-ctor-fspath-deprecation>`), a
 deprecation warning is now raised.
 
-Applying a mark to a fixture function
--------------------------------------
-
-.. deprecated:: 7.4
-
-Applying a mark to a fixture function never had any effect, but it is a common user error.
-
-.. code-block:: python
-
-    @pytest.mark.usefixtures("clean_database")
-    @pytest.fixture
-    def user() -> User:
-        ...
-
-Users expected in this case that the ``usefixtures`` mark would have its intended effect of using the ``clean_database`` fixture when ``user`` was invoked, when in fact it has no effect at all.
-
-Now pytest will issue a warning when it encounters this problem, and will raise an error in the future versions.
-
-
 Backward compatibilities in ``Parser.addoption``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -486,127 +467,12 @@ The ``yield_fixture`` function/decorator
 It has been so for a very long time, so can be search/replaced safely.
 
 
-Removed Features and Breaking Changes
--------------------------------------
+Removed Features
+----------------
 
 As stated in our :ref:`backwards-compatibility` policy, deprecated features are removed only in major releases after
 an appropriate period of deprecation has passed.
 
-Some breaking changes which could not be deprecated are also listed.
-
-
-Collection changes in pytest 8
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Added a new :class:`pytest.Directory` base collection node, which all collector nodes for filesystem directories are expected to subclass.
-This is analogous to the existing :class:`pytest.File` for file nodes.
-
-Changed :class:`pytest.Package` to be a subclass of :class:`pytest.Directory`.
-A ``Package`` represents a filesystem directory which is a Python package,
-i.e. contains an ``__init__.py`` file.
-
-:class:`pytest.Package` now only collects files in its own directory; previously it collected recursively.
-Sub-directories are collected as sub-collector nodes, thus creating a collection tree which mirrors the filesystem hierarchy.
-
-:attr:`session.name <pytest.Session.name>` is now ``""``; previously it was the rootdir directory name.
-This matches :attr:`session.nodeid <_pytest.nodes.Node.nodeid>` which has always been `""`.
-
-Added a new :class:`pytest.Dir` concrete collection node, a subclass of :class:`pytest.Directory`.
-This node represents a filesystem directory, which is not a :class:`pytest.Package`,
-i.e. does not contain an ``__init__.py`` file.
-Similarly to ``Package``, it only collects the files in its own directory,
-while collecting sub-directories as sub-collector nodes.
-
-Files and directories are now collected in alphabetical order jointly, unless changed by a plugin.
-Previously, files were collected before directories.
-
-The collection tree now contains directories/packages up to the :ref:`rootdir <rootdir>`,
-for initial arguments that are found within the rootdir.
-For files outside the rootdir, only the immediate directory/package is collected --
-note however that collecting from outside the rootdir is discouraged.
-
-As an example, given the following filesystem tree::
-
-    myroot/
-        pytest.ini
-        top/
-        ├── aaa
-        │   └── test_aaa.py
-        ├── test_a.py
-        ├── test_b
-        │   ├── __init__.py
-        │   └── test_b.py
-        ├── test_c.py
-        └── zzz
-            ├── __init__.py
-            └── test_zzz.py
-
-the collection tree, as shown by `pytest --collect-only top/` but with the otherwise-hidden :class:`~pytest.Session` node added for clarity,
-is now the following::
-
-    <Session>
-      <Dir myroot>
-        <Dir top>
-          <Dir aaa>
-            <Module test_aaa.py>
-              <Function test_it>
-          <Module test_a.py>
-            <Function test_it>
-          <Package test_b>
-            <Module test_b.py>
-              <Function test_it>
-          <Module test_c.py>
-            <Function test_it>
-          <Package zzz>
-            <Module test_zzz.py>
-              <Function test_it>
-
-Previously, it was::
-
-    <Session>
-      <Module top/test_a.py>
-        <Function test_it>
-      <Module top/test_c.py>
-        <Function test_it>
-      <Module top/aaa/test_aaa.py>
-        <Function test_it>
-      <Package test_b>
-        <Module test_b.py>
-          <Function test_it>
-      <Package zzz>
-        <Module test_zzz.py>
-          <Function test_it>
-
-Code/plugins which rely on a specific shape of the collection tree might need to update.
-
-
-:class:`pytest.Package` is no longer a :class:`pytest.Module` or :class:`pytest.File`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionchanged:: 8.0
-
-The ``Package`` collector node designates a Python package, that is, a directory with an `__init__.py` file.
-Previously ``Package`` was a subtype of ``pytest.Module`` (which represents a single Python module),
-the module being the `__init__.py` file.
-This has been deemed a design mistake (see :issue:`11137` and :issue:`7777` for details).
-
-The ``path`` property of ``Package`` nodes now points to the package directory instead of the ``__init__.py`` file.
-
-Note that a ``Module`` node for ``__init__.py`` (which is not a ``Package``) may still exist,
-if it is picked up during collection (e.g. if you configured :confval:`python_files` to include ``__init__.py`` files).
-
-
-Collecting ``__init__.py`` files no longer collects package
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionremoved:: 8.0
-
-Running `pytest pkg/__init__.py` now collects the `pkg/__init__.py` file (module) only.
-Previously, it collected the entire `pkg` package, including other test files in the directory, but excluding tests in the `__init__.py` file itself
-(unless :confval:`python_files` was changed to allow `__init__.py` file).
-
-To collect the entire package, specify just the directory: `pytest pkg`.
-
 
 The ``pytest.collect`` module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -730,7 +596,7 @@ By using ``legacy`` you will keep using the legacy/xunit1 format when upgrading
 pytest 6.0, where the default format will be ``xunit2``.
 
 In order to let users know about the transition, pytest will issue a warning in case
-the ``--junit-xml`` option is given in the command line but ``junit_family`` is not explicitly
+the ``--junitxml`` option is given in the command line but ``junit_family`` is not explicitly
 configured in ``pytest.ini``.
 
 Services known to support the ``xunit2`` format:

doc/en/example/conftest.py

@@ -1 +1 @@
-collect_ignore = ["nonpython", "customdirectory"]
+collect_ignore = ["nonpython"]

doc/en/example/customdirectory.rst

@@ -1,77 +0,0 @@
-.. _`custom directory collectors`:
-
-Using a custom directory collector
-====================================================
-
-By default, pytest collects directories using :class:`pytest.Package`, for directories with ``__init__.py`` files,
-and :class:`pytest.Dir` for other directories.
-If you want to customize how a directory is collected, you can write your own :class:`pytest.Directory` collector,
-and use :hook:`pytest_collect_directory` to hook it up.
-
-.. _`directory manifest plugin`:
-
-A basic example for a directory manifest file
---------------------------------------------------------------
-
-Suppose you want to customize how collection is done on a per-directory basis.
-Here is an example ``conftest.py`` plugin that allows directories to contain a ``manifest.json`` file,
-which defines how the collection should be done for the directory.
-In this example, only a simple list of files is supported,
-however you can imagine adding other keys, such as exclusions and globs.
-
-.. include:: customdirectory/conftest.py
-    :literal:
-
-You can create a ``manifest.json`` file and some test files:
-
-.. include:: customdirectory/tests/manifest.json
-    :literal:
-
-.. include:: customdirectory/tests/test_first.py
-    :literal:
-
-.. include:: customdirectory/tests/test_second.py
-    :literal:
-
-.. include:: customdirectory/tests/test_third.py
-    :literal:
-
-An you can now execute the test specification:
-
-.. code-block:: pytest
-
-    customdirectory $ pytest
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
-    rootdir: /home/sweet/project/customdirectory
-    configfile: pytest.ini
-    collected 2 items
-
-    tests/test_first.py .                                                [ 50%]
-    tests/test_second.py .                                               [100%]
-
-    ============================ 2 passed in 0.12s =============================
-
-.. regendoc:wipe
-
-Notice how ``test_three.py`` was not executed, because it is not listed in the manifest.
-
-You can verify that your custom collector appears in the collection tree:
-
-.. code-block:: pytest
-
-    customdirectory $ pytest --collect-only
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
-    rootdir: /home/sweet/project/customdirectory
-    configfile: pytest.ini
-    collected 2 items
-
-    <Dir customdirectory>
-      <ManifestDirectory tests>
-        <Module test_first.py>
-          <Function test_1>
-        <Module test_second.py>
-          <Function test_2>
-
-    ======================== 2 tests collected in 0.12s ========================

doc/en/example/customdirectory/conftest.py

@@ -1,28 +0,0 @@
-# content of conftest.py
-import json
-
-import pytest
-
-
-class ManifestDirectory(pytest.Directory):
-    def collect(self):
-        # The standard pytest behavior is to loop over all `test_*.py` files and
-        # call `pytest_collect_file` on each file. This collector instead reads
-        # the `manifest.json` file and only calls `pytest_collect_file` for the
-        # files defined there.
-        manifest_path = self.path / "manifest.json"
-        manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
-        ihook = self.ihook
-        for file in manifest["files"]:
-            yield from ihook.pytest_collect_file(
-                file_path=self.path / file, parent=self
-            )
-
-
-@pytest.hookimpl
-def pytest_collect_directory(path, parent):
-    # Use our custom collector for directories containing a `mainfest.json` file.
-    if path.joinpath("manifest.json").is_file():
-        return ManifestDirectory.from_parent(parent=parent, path=path)
-    # Otherwise fallback to the standard behavior.
-    return None

doc/en/example/customdirectory/tests/manifest.json

@@ -1,6 +0,0 @@
-{
-    "files": [
-        "test_first.py",
-        "test_second.py"
-    ]
-}

doc/en/example/customdirectory/tests/test_first.py

@@ -1,3 +0,0 @@
-# content of test_first.py
-def test_1():
-    pass

doc/en/example/customdirectory/tests/test_second.py

@@ -1,3 +0,0 @@
-# content of test_second.py
-def test_2():
-    pass

doc/en/example/customdirectory/tests/test_third.py

@@ -1,3 +0,0 @@
-# content of test_third.py
-def test_3():
-    pass

doc/en/example/index.rst

@@ -32,4 +32,3 @@ The following examples aim at various use cases you might encounter.
    special
    pythoncollection
    nonpython
-   customdirectory

doc/en/example/markers.rst

@@ -45,7 +45,7 @@ You can then restrict a test run to only run tests marked with ``webtest``:
 
     $ pytest -v -m webtest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 4 items / 3 deselected / 1 selected
@@ -60,7 +60,7 @@ Or the inverse, running all tests except the webtest ones:
 
     $ pytest -v -m "not webtest"
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 4 items / 1 deselected / 3 selected
@@ -82,7 +82,7 @@ tests based on their module, class, method, or function name:
 
     $ pytest -v test_server.py::TestClass::test_method
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 1 item
@@ -97,7 +97,7 @@ You can also select on the class:
 
     $ pytest -v test_server.py::TestClass
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 1 item
@@ -112,7 +112,7 @@ Or select multiple nodes:
 
     $ pytest -v test_server.py::TestClass test_server.py::test_send_http
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 2 items
@@ -136,7 +136,7 @@ Or select multiple nodes:
 
     Node IDs for failing tests are displayed in the test summary info
     when running pytest with the ``-rf`` option.  You can also
-    construct Node IDs from the output of ``pytest --collect-only``.
+    construct Node IDs from the output of ``pytest --collectonly``.
 
 Using ``-k expr`` to select tests based on their name
 -------------------------------------------------------
@@ -156,7 +156,7 @@ The expression matching is now case-insensitive.
 
     $ pytest -v -k http  # running with the above defined example module
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 4 items / 3 deselected / 1 selected
@@ -171,7 +171,7 @@ And you can also run all tests except the ones that match the keyword:
 
     $ pytest -k "not send_http" -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 4 items / 1 deselected / 3 selected
@@ -188,7 +188,7 @@ Or to select "http" and "quick" tests:
 
     $ pytest -k "http or quick" -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 4 items / 2 deselected / 2 selected
@@ -397,7 +397,7 @@ the test needs:
 
     $ pytest -E stage2
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -411,7 +411,7 @@ and here is one that specifies exactly the environment needed:
 
     $ pytest -E stage1
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -604,7 +604,7 @@ then you will see two tests skipped and two executed tests as expected:
 
     $ pytest -rs # this option reports skip reasons
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items
 
@@ -620,7 +620,7 @@ Note that if you specify a platform via the marker-command line option like this
 
     $ pytest -m linux
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items / 3 deselected / 1 selected
 
@@ -683,7 +683,7 @@ We can now use the ``-m option`` to select one set:
 
     $ pytest -m interface --tb=short
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items / 2 deselected / 2 selected
 
@@ -709,7 +709,7 @@ or to select both "event" and "interface" tests:
 
     $ pytest -m "interface or event" --tb=short
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items / 1 deselected / 3 selected
 

doc/en/example/multipython.py

@@ -1,13 +1,14 @@
-"""Module containing a parametrized tests testing cross-python serialization
-via the pickle module."""
+"""
+module containing a parametrized tests testing cross-python
+serialization via the pickle module.
+"""
 import shutil
 import subprocess
 import textwrap
 
 import pytest
 
-
-pythonlist = ["python3.9", "python3.10", "python3.11"]
+pythonlist = ["python3.5", "python3.6", "python3.7"]
 
 
 @pytest.fixture(params=pythonlist)
@@ -42,7 +43,7 @@ class Python:
                 )
             )
         )
-        subprocess.run((self.pythonpath, str(dumpfile)), check=True)
+        subprocess.check_call((self.pythonpath, str(dumpfile)))
 
     def load_and_is_true(self, expression):
         loadfile = self.picklefile.with_name("load.py")
@@ -62,7 +63,7 @@ class Python:
             )
         )
         print(loadfile)
-        subprocess.run((self.pythonpath, str(loadfile)), check=True)
+        subprocess.check_call((self.pythonpath, str(loadfile)))
 
 
 @pytest.mark.parametrize("obj", [42, {}, {1: 3}])

doc/en/example/nonpython.rst

@@ -28,7 +28,7 @@ now execute the test specification:
 
     nonpython $ pytest test_simple.yaml
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project/nonpython
     collected 2 items
 
@@ -64,7 +64,7 @@ consulted when reporting in ``verbose`` mode:
 
     nonpython $ pytest -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project/nonpython
     collecting ... collected 2 items
@@ -90,7 +90,7 @@ interesting to just look at the collection tree:
 
     nonpython $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project/nonpython
     collected 2 items
 

doc/en/example/nonpython/conftest.py

@@ -12,7 +12,7 @@ class YamlFile(pytest.File):
         # We need a yaml parser, e.g. PyYAML.
         import yaml
 
-        raw = yaml.safe_load(self.path.open(encoding="utf-8"))
+        raw = yaml.safe_load(self.path.open())
         for name, spec in sorted(raw.items()):
             yield YamlItem.from_parent(self, name=name, spec=spec)
 

doc/en/example/parametrize.rst

@@ -4,6 +4,8 @@
 Parametrizing tests
 =================================================
 
+.. currentmodule:: _pytest.python
+
 ``pytest`` allows to easily parametrize test functions.
 For basic docs, see :ref:`parametrize-basics`.
 
@@ -158,20 +160,19 @@ objects, they are still using the default pytest representation:
 
     $ pytest test_time.py --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 8 items
 
-    <Dir parametrize.rst-189>
-      <Module test_time.py>
-        <Function test_timedistance_v0[a0-b0-expected0]>
-        <Function test_timedistance_v0[a1-b1-expected1]>
-        <Function test_timedistance_v1[forward]>
-        <Function test_timedistance_v1[backward]>
-        <Function test_timedistance_v2[20011212-20011211-expected0]>
-        <Function test_timedistance_v2[20011211-20011212-expected1]>
-        <Function test_timedistance_v3[forward]>
-        <Function test_timedistance_v3[backward]>
+    <Module test_time.py>
+      <Function test_timedistance_v0[a0-b0-expected0]>
+      <Function test_timedistance_v0[a1-b1-expected1]>
+      <Function test_timedistance_v1[forward]>
+      <Function test_timedistance_v1[backward]>
+      <Function test_timedistance_v2[20011212-20011211-expected0]>
+      <Function test_timedistance_v2[20011211-20011212-expected1]>
+      <Function test_timedistance_v3[forward]>
+      <Function test_timedistance_v3[backward]>
 
     ======================== 8 tests collected in 0.12s ========================
 
@@ -184,7 +185,7 @@ A quick port of "testscenarios"
 Here is a quick port to run tests configured with :pypi:`testscenarios`,
 an add-on from Robert Collins for the standard unittest framework. We
 only have to work a bit to construct the correct arguments for pytest's
-:py:func:`Metafunc.parametrize <pytest.Metafunc.parametrize>`:
+:py:func:`Metafunc.parametrize`:
 
 .. code-block:: python
 
@@ -221,7 +222,7 @@ this is a fully self-contained example which you can run with:
 
     $ pytest test_scenarios.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items
 
@@ -235,17 +236,16 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia
 
     $ pytest --collect-only test_scenarios.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items
 
-    <Dir parametrize.rst-189>
-      <Module test_scenarios.py>
-        <Class TestSampleWithScenarios>
-          <Function test_demo1[basic]>
-          <Function test_demo2[basic]>
-          <Function test_demo1[advanced]>
-          <Function test_demo2[advanced]>
+    <Module test_scenarios.py>
+      <Class TestSampleWithScenarios>
+        <Function test_demo1[basic]>
+        <Function test_demo2[basic]>
+        <Function test_demo1[advanced]>
+        <Function test_demo2[advanced]>
 
     ======================== 4 tests collected in 0.12s ========================
 
@@ -314,14 +314,13 @@ Let's first see how it looks like at collection time:
 
     $ pytest test_backends.py --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
-    <Dir parametrize.rst-189>
-      <Module test_backends.py>
-        <Function test_db_initialized[d1]>
-        <Function test_db_initialized[d2]>
+    <Module test_backends.py>
+      <Function test_db_initialized[d1]>
+      <Function test_db_initialized[d2]>
 
     ======================== 2 tests collected in 0.12s ========================
 
@@ -413,7 +412,7 @@ The result of this test will be successful:
 
     $ pytest -v test_indirect_list.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 1 item
@@ -484,8 +483,8 @@ argument sets to use for each test function.  Let's run it:
     FAILED test_parametrize.py::TestClass::test_equals[1-2] - assert 1 == 2
     1 failed, 2 passed in 0.12s
 
-Parametrization with multiple fixtures
---------------------------------------
+Indirect parametrization with multiple fixtures
+--------------------------------------------------------------
 
 Here is a stripped down real-life example of using parametrized
 testing for testing serialization of objects between different python
@@ -503,14 +502,15 @@ Running it results in some skips if we don't have all the python interpreters in
 .. code-block:: pytest
 
    . $ pytest -rs -q multipython.py
-   ssssssssssss...ssssssssssss                                          [100%]
+   sssssssssssssssssssssssssss                                          [100%]
    ========================= short test summary info ==========================
-   SKIPPED [12] multipython.py:68: 'python3.9' not found
-   SKIPPED [12] multipython.py:68: 'python3.11' not found
-   3 passed, 24 skipped in 0.12s
+   SKIPPED [9] multipython.py:69: 'python3.5' not found
+   SKIPPED [9] multipython.py:69: 'python3.6' not found
+   SKIPPED [9] multipython.py:69: 'python3.7' not found
+   27 skipped in 0.12s
 
-Parametrization of optional implementations/imports
----------------------------------------------------
+Indirect parametrization of optional implementations/imports
+--------------------------------------------------------------------
 
 If you want to compare the outcomes of several implementations of a given
 API, you can write test functions that receive the already imported implementations
@@ -567,7 +567,7 @@ If you run this with reporting for skips enabled:
 
     $ pytest -rs test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
@@ -628,7 +628,7 @@ Then run ``pytest`` with verbose mode and with only the ``basic`` marker:
 
     $ pytest -v -m basic
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 24 items / 21 deselected / 3 selected
@@ -657,16 +657,13 @@ Use :func:`pytest.raises` with the
 :ref:`pytest.mark.parametrize ref` decorator to write parametrized tests
 in which some tests raise exceptions and others do not.
 
-``contextlib.nullcontext`` can be used to test cases that are not expected to
-raise exceptions but that should result in some value. The value is given as the
-``enter_result`` parameter, which will be available as the ``with`` statement’s
-target (``e`` in the example below).
+It may be helpful to use ``nullcontext`` as a complement to ``raises``.
 
 For example:
 
 .. code-block:: python
 
-    from contextlib import nullcontext
+    from contextlib import nullcontext as does_not_raise
 
     import pytest
 
@@ -674,17 +671,16 @@ For example:
     @pytest.mark.parametrize(
         "example_input,expectation",
         [
-            (3, nullcontext(2)),
-            (2, nullcontext(3)),
-            (1, nullcontext(6)),
+            (3, does_not_raise()),
+            (2, does_not_raise()),
+            (1, does_not_raise()),
             (0, pytest.raises(ZeroDivisionError)),
         ],
     )
     def test_division(example_input, expectation):
         """Test how much I know division."""
-        with expectation as e:
-            assert (6 / example_input) == e
+        with expectation:
+            assert (6 / example_input) is not None
 
-In the example above, the first three test cases should run without any
-exceptions, while the fourth should raise a``ZeroDivisionError`` exception,
-which is expected by pytest.
+In the example above, the first three test cases should run unexceptionally,
+while the fourth should raise ``ZeroDivisionError``.

doc/en/example/pythoncollection.rst

@@ -147,16 +147,15 @@ The test collection would look like this:
 
     $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     configfile: pytest.ini
     collected 2 items
 
-    <Dir pythoncollection.rst-190>
-      <Module check_myapp.py>
-        <Class CheckMyApp>
-          <Function simple_check>
-          <Function complex_check>
+    <Module check_myapp.py>
+      <Class CheckMyApp>
+        <Function simple_check>
+        <Function complex_check>
 
     ======================== 2 tests collected in 0.12s ========================
 
@@ -210,18 +209,16 @@ You can always peek at the collection tree without running tests like this:
 
     . $ pytest --collect-only pythoncollection.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     configfile: pytest.ini
     collected 3 items
 
-    <Dir pythoncollection.rst-190>
-      <Dir CWD>
-        <Module pythoncollection.py>
-          <Function test_function>
-          <Class TestClass>
-            <Function test_method>
-            <Function test_anothermethod>
+    <Module CWD/pythoncollection.py>
+      <Function test_function>
+      <Class TestClass>
+        <Function test_method>
+        <Function test_anothermethod>
 
     ======================== 3 tests collected in 0.12s ========================
 
@@ -294,7 +291,7 @@ file will be left out:
 
     $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     configfile: pytest.ini
     collected 0 items

doc/en/example/reportingdemo.rst

@@ -9,7 +9,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
 
     assertion $ pytest failure_demo.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project/assertion
     collected 44 items
 
@@ -80,7 +80,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_text(self):
     >       assert "spam" == "eggs"
     E       AssertionError: assert 'spam' == 'eggs'
-    E
     E         - eggs
     E         + spam
 
@@ -92,7 +91,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_similar_text(self):
     >       assert "foo 1 bar" == "foo 2 bar"
     E       AssertionError: assert 'foo 1 bar' == 'foo 2 bar'
-    E
     E         - foo 2 bar
     E         ?     ^
     E         + foo 1 bar
@@ -106,7 +104,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_multiline_text(self):
     >       assert "foo\nspam\nbar" == "foo\neggs\nbar"
     E       AssertionError: assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
-    E
     E           foo
     E         - eggs
     E         + spam
@@ -122,7 +119,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             b = "1" * 100 + "b" + "2" * 100
     >       assert a == b
     E       AssertionError: assert '111111111111...2222222222222' == '111111111111...2222222222222'
-    E
     E         Skipping 90 identical leading characters in diff, use -v to show
     E         Skipping 91 identical trailing characters in diff, use -v to show
     E         - 1111111111b222222222
@@ -140,15 +136,15 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             b = "1\n" * 100 + "b" + "2\n" * 100
     >       assert a == b
     E       AssertionError: assert '1\n1\n1\n1\n...n2\n2\n2\n2\n' == '1\n1\n1\n1\n...n2\n2\n2\n2\n'
-    E
     E         Skipping 190 identical leading characters in diff, use -v to show
     E         Skipping 191 identical trailing characters in diff, use -v to show
     E           1
     E           1
     E           1
+    E           1
     E           1...
     E
-    E         ...Full output truncated (7 lines hidden), use '-vv' to show
+    E         ...Full output truncated (6 lines hidden), use '-vv' to show
 
     failure_demo.py:60: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_list _________________
@@ -158,7 +154,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_list(self):
     >       assert [0, 1, 2] == [0, 1, 3]
     E       assert [0, 1, 2] == [0, 1, 3]
-    E
     E         At index 2 diff: 2 != 3
     E         Use -v to get more diff
 
@@ -172,7 +167,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             b = [0] * 100 + [2] + [3] * 100
     >       assert a == b
     E       assert [0, 0, 0, 0, 0, 0, ...] == [0, 0, 0, 0, 0, 0, ...]
-    E
     E         At index 100 diff: 1 != 2
     E         Use -v to get more diff
 
@@ -184,7 +178,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_dict(self):
     >       assert {"a": 0, "b": 1, "c": 0} == {"a": 0, "b": 2, "d": 0}
     E       AssertionError: assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
-    E
     E         Omitting 1 identical items, use -vv to show
     E         Differing items:
     E         {'b': 1} != {'b': 2}
@@ -202,7 +195,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_set(self):
     >       assert {0, 10, 11, 12} == {0, 20, 21}
     E       assert {0, 10, 11, 12} == {0, 20, 21}
-    E
     E         Extra items in the left set:
     E         10
     E         11
@@ -220,7 +212,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
         def test_eq_longer_list(self):
     >       assert [1, 2] == [1, 2, 3]
     E       assert [1, 2] == [1, 2, 3]
-    E
     E         Right contains one more item: 3
     E         Use -v to get more diff
 
@@ -242,7 +233,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             text = "some multiline\ntext\nwhich\nincludes foo\nand a\ntail"
     >       assert "foo" not in text
     E       AssertionError: assert 'foo' not in 'some multil...nand a\ntail'
-    E
     E         'foo' is contained here:
     E           some multiline
     E           text
@@ -261,7 +251,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             text = "single foo line"
     >       assert "foo" not in text
     E       AssertionError: assert 'foo' not in 'single foo line'
-    E
     E         'foo' is contained here:
     E           single foo line
     E         ?        +++
@@ -275,7 +264,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             text = "head " * 50 + "foo " + "tail " * 20
     >       assert "foo" not in text
     E       AssertionError: assert 'foo' not in 'head head h...l tail tail '
-    E
     E         'foo' is contained here:
     E           head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
     E         ?           +++
@@ -289,7 +277,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
             text = "head " * 50 + "f" * 70 + "tail " * 20
     >       assert "f" * 70 not in text
     E       AssertionError: assert 'fffffffffff...ffffffffffff' not in 'head head h...l tail tail '
-    E
     E         'ffffffffffffffffff...fffffffffffffffffff' is contained here:
     E           head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
     E         ?           ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

doc/en/example/simple.rst

@@ -168,7 +168,7 @@ Now we'll get feedback on a bad argument:
 
 
 If you need to provide more detailed error messages, you can use the
-``type`` parameter and raise :exc:`pytest.UsageError`:
+``type`` parameter and raise ``pytest.UsageError``:
 
 .. code-block:: python
 
@@ -232,7 +232,7 @@ directory with the above conftest.py:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 0 items
 
@@ -296,7 +296,7 @@ and when running it will see a skipped "slow" test:
 
     $ pytest -rs    # "-rs" means report details on the little 's'
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
@@ -312,7 +312,7 @@ Or run it including the ``slow`` marked test:
 
     $ pytest --runslow
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
@@ -456,7 +456,7 @@ which will add the string to the test header accordingly:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     project deps: mylib-1.1
     rootdir: /home/sweet/project
     collected 0 items
@@ -484,7 +484,7 @@ which will add info only when run with "--v":
 
     $ pytest -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     info1: did you know that ...
     did you?
@@ -499,7 +499,7 @@ and nothing when run plainly:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 0 items
 
@@ -538,7 +538,7 @@ Now we can profile which test functions execute the slowest:
 
     $ pytest --durations=3
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 3 items
 
@@ -644,7 +644,7 @@ If we run this:
 
     $ pytest -rx
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 4 items
 
@@ -726,14 +726,14 @@ We can run this:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 7 items
 
-    a/test_db.py F                                                       [ 14%]
-    a/test_db2.py F                                                      [ 28%]
-    b/test_error.py E                                                    [ 42%]
-    test_step.py .Fx.                                                    [100%]
+    test_step.py .Fx.                                                    [ 57%]
+    a/test_db.py F                                                       [ 71%]
+    a/test_db2.py F                                                      [ 85%]
+    b/test_error.py E                                                    [100%]
 
     ================================== ERRORS ==================================
     _______________________ ERROR at setup of test_root ________________________
@@ -745,39 +745,39 @@ We can run this:
 
     /home/sweet/project/b/test_error.py:1
     ================================= FAILURES =================================
-    _________________________________ test_a1 __________________________________
-
-    db = <conftest.DB object at 0xdeadbeef0002>
-
-        def test_a1(db):
-    >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB object at 0xdeadbeef0002>
-    E       assert 0
-
-    a/test_db.py:2: AssertionError
-    _________________________________ test_a2 __________________________________
-
-    db = <conftest.DB object at 0xdeadbeef0002>
-
-        def test_a2(db):
-    >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB object at 0xdeadbeef0002>
-    E       assert 0
-
-    a/test_db2.py:2: AssertionError
     ____________________ TestUserHandling.test_modification ____________________
 
-    self = <test_step.TestUserHandling object at 0xdeadbeef0003>
+    self = <test_step.TestUserHandling object at 0xdeadbeef0002>
 
         def test_modification(self):
     >       assert 0
     E       assert 0
 
     test_step.py:11: AssertionError
+    _________________________________ test_a1 __________________________________
+
+    db = <conftest.DB object at 0xdeadbeef0003>
+
+        def test_a1(db):
+    >       assert 0, db  # to show value
+    E       AssertionError: <conftest.DB object at 0xdeadbeef0003>
+    E       assert 0
+
+    a/test_db.py:2: AssertionError
+    _________________________________ test_a2 __________________________________
+
+    db = <conftest.DB object at 0xdeadbeef0003>
+
+        def test_a2(db):
+    >       assert 0, db  # to show value
+    E       AssertionError: <conftest.DB object at 0xdeadbeef0003>
+    E       assert 0
+
+    a/test_db2.py:2: AssertionError
     ========================= short test summary info ==========================
+    FAILED test_step.py::TestUserHandling::test_modification - assert 0
     FAILED a/test_db.py::test_a1 - AssertionError: <conftest.DB object at 0x7...
     FAILED a/test_db2.py::test_a2 - AssertionError: <conftest.DB object at 0x...
-    FAILED test_step.py::TestUserHandling::test_modification - assert 0
     ERROR b/test_error.py::test_root
     ============= 3 failed, 2 passed, 1 xfailed, 1 error in 0.12s ==============
 
@@ -808,15 +808,16 @@ case we just write some information out to a ``failures`` file:
     import pytest
 
 
-    @pytest.hookimpl(wrapper=True, tryfirst=True)
+    @pytest.hookimpl(tryfirst=True, hookwrapper=True)
     def pytest_runtest_makereport(item, call):
         # execute all other hooks to obtain the report object
-        rep = yield
+        outcome = yield
+        rep = outcome.get_result()
 
         # we only look at actual failing test calls, not setup/teardown
         if rep.when == "call" and rep.failed:
             mode = "a" if os.path.exists("failures") else "w"
-            with open("failures", mode, encoding="utf-8") as f:
+            with open("failures", mode) as f:
                 # let's also access a fixture for the fun of it
                 if "tmp_path" in item.fixturenames:
                     extra = " ({})".format(item.funcargs["tmp_path"])
@@ -825,8 +826,6 @@ case we just write some information out to a ``failures`` file:
 
                 f.write(rep.nodeid + extra + "\n")
 
-        return rep
-
 
 if you then have failing tests:
 
@@ -846,7 +845,7 @@ and run them:
 
     $ pytest test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
@@ -900,17 +899,16 @@ here is a little example implemented via a local plugin:
     phase_report_key = StashKey[Dict[str, CollectReport]]()
 
 
-    @pytest.hookimpl(wrapper=True, tryfirst=True)
+    @pytest.hookimpl(tryfirst=True, hookwrapper=True)
     def pytest_runtest_makereport(item, call):
         # execute all other hooks to obtain the report object
-        rep = yield
+        outcome = yield
+        rep = outcome.get_result()
 
         # store test results for each phase of a call, which can
         # be "setup", "call", "teardown"
         item.stash.setdefault(phase_report_key, {})[rep.when] = rep
 
-        return rep
-
 
     @pytest.fixture
     def something(request):
@@ -955,7 +953,7 @@ and run it:
 
     $ pytest -s test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 3 items
 
@@ -1090,4 +1088,4 @@ application with standard ``pytest`` command-line options:
 
 .. code-block:: bash
 
-    ./app_main --pytest --verbose --tb=long --junit=xml=results.xml test-suite/
+    ./app_main --pytest --verbose --tb=long --junitxml=results.xml test-suite/

doc/en/explanation/anatomy.rst

@@ -34,7 +34,7 @@ a function/method call.
 
 **Assert** is where we look at that resulting state and check if it looks how
 we'd expect after the dust has settled. It's where we gather evidence to say the
-behavior does or does not align with what we expect. The ``assert`` in our test
+behavior does or does not aligns with what we expect. The ``assert`` in our test
 is where we take that measurement/observation and apply our judgement to it. If
 something should be green, we'd say ``assert thing == "green"``.
 

doc/en/explanation/fixtures.rst

@@ -162,7 +162,7 @@ A note about fixture cleanup
 ----------------------------
 
 pytest does not do any special processing for :data:`SIGTERM <signal.SIGTERM>` and
-``SIGQUIT`` signals (:data:`SIGINT <signal.SIGINT>` is handled naturally
+:data:`SIGQUIT <signal.SIGQUIT>` signals (:data:`SIGINT <signal.SIGINT>` is handled naturally
 by the Python runtime via :class:`KeyboardInterrupt`), so fixtures that manage external resources which are important
 to be cleared when the Python process is terminated (by those signals) might leak resources.
 

doc/en/funcarg_compare.rst

@@ -11,6 +11,8 @@ funcarg mechanism, see :ref:`historical funcargs and pytest.funcargs`.
 If you are new to pytest, then you can simply ignore this
 section and read the other sections.
 
+.. currentmodule:: _pytest
+
 Shortcomings of the previous ``pytest_funcarg__`` mechanism
 --------------------------------------------------------------
 
@@ -44,7 +46,7 @@ There are several limitations and difficulties with this approach:
 
 2. parametrizing the "db" resource is not straight forward:
    you need to apply a "parametrize" decorator or implement a
-   :hook:`pytest_generate_tests` hook
+   :py:func:`~hookspec.pytest_generate_tests` hook
    calling :py:func:`~pytest.Metafunc.parametrize` which
    performs parametrization at the places where the resource
    is used.  Moreover, you need to modify the factory to use an
@@ -92,7 +94,7 @@ Direct parametrization of funcarg resource factories
 
 Previously, funcarg factories could not directly cause parametrization.
 You needed to specify a ``@parametrize`` decorator on your test function
-or implement a :hook:`pytest_generate_tests` hook to perform
+or implement a ``pytest_generate_tests`` hook to perform
 parametrization, i.e. calling a test multiple times with different value
 sets.  pytest-2.3 introduces a decorator for use on the factory itself:
 

doc/en/getting-started.rst

@@ -9,7 +9,7 @@ Get Started
 Install ``pytest``
 ----------------------------------------
 
-``pytest`` requires: Python 3.8+ or PyPy3.
+``pytest`` requires: Python 3.7+ or PyPy3.
 
 1. Run the following command in your command line:
 
@@ -22,7 +22,7 @@ Install ``pytest``
 .. code-block:: bash
 
     $ pytest --version
-    pytest 8.0.0rc1
+    pytest 7.3.2
 
 .. _`simpletest`:
 
@@ -47,7 +47,7 @@ The test
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -97,30 +97,6 @@ Use the :ref:`raises <assertraises>` helper to assert that some code raises an e
         with pytest.raises(SystemExit):
             f()
 
-You can also use the context provided by :ref:`raises <assertraises>` to
-assert that an expected exception is part of a raised :class:`ExceptionGroup`:
-
-.. code-block:: python
-
-    # content of test_exceptiongroup.py
-    import pytest
-
-
-    def f():
-        raise ExceptionGroup(
-            "Group message",
-            [
-                RuntimeError(),
-            ],
-        )
-
-
-    def test_exception_in_group():
-        with pytest.raises(ExceptionGroup) as excinfo:
-            f()
-        assert excinfo.group_contains(RuntimeError)
-        assert not excinfo.group_contains(TypeError)
-
 Execute the test function with “quiet” reporting mode:
 
 .. code-block:: pytest

doc/en/historical-notes.rst

@@ -112,7 +112,7 @@ More details can be found in the :pull:`original PR <3317>`.
 .. note::
 
     in a future major release of pytest we will introduce class based markers,
-    at which point markers will no longer be limited to instances of :py:class:`~pytest.Mark`.
+    at which point markers will no longer be limited to instances of :py:class:`~_pytest.mark.Mark`.
 
 
 cache plugin integrated into the core

doc/en/how-to/assert.rst

@@ -29,7 +29,7 @@ you will see the return value of the function call:
 
     $ pytest test_assert1.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -54,13 +54,14 @@ operators. (See :ref:`tbreportdemo`).  This allows you to use the
 idiomatic python constructs without boilerplate code while not losing
 introspection information.
 
-If a message is specified with the assertion like this:
+However, if you specify a message with the assertion like this:
 
 .. code-block:: python
 
     assert a % 2 == 0, "value was odd, should be even"
 
-it is printed alongside the assertion introspection in the traceback.
+then no assertion introspection takes places at all and the message
+will be simply shown in the traceback.
 
 See :ref:`assert-details` for more information on assertion introspection.
 
@@ -98,27 +99,6 @@ and if you need to have access to the actual exception info you may use:
 the actual exception raised.  The main attributes of interest are
 ``.type``, ``.value`` and ``.traceback``.
 
-Note that ``pytest.raises`` will match the exception type or any subclasses (like the standard ``except`` statement).
-If you want to check if a block of code is raising an exact exception type, you need to check that explicitly:
-
-
-.. code-block:: python
-
-    def test_foo_not_implemented():
-        def foo():
-            raise NotImplementedError
-
-        with pytest.raises(RuntimeError) as excinfo:
-            foo()
-        assert excinfo.type is RuntimeError
-
-The :func:`pytest.raises` call will succeed, even though the function raises :class:`NotImplementedError`, because
-:class:`NotImplementedError` is a subclass of :class:`RuntimeError`; however the following `assert` statement will
-catch the problem.
-
-Matching exception messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 You can pass a ``match`` keyword parameter to the context-manager to test
 that a regular expression matches on the string representation of an exception
 (similar to the ``TestCase.assertRaisesRegex`` method from ``unittest``):
@@ -136,113 +116,36 @@ that a regular expression matches on the string representation of an exception
         with pytest.raises(ValueError, match=r".* 123 .*"):
             myfunc()
 
-Notes:
+The regexp parameter of the ``match`` method is matched with the ``re.search``
+function, so in the above example ``match='123'`` would have worked as
+well.
 
-* The ``match`` parameter is matched with the :func:`re.search`
-  function, so in the above example ``match='123'`` would have worked as well.
-* The ``match`` parameter also matches against `PEP-678 <https://peps.python.org/pep-0678/>`__ ``__notes__``.
-
-
-.. _`assert-matching-exception-groups`:
-
-Matching exception groups
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can also use the :func:`excinfo.group_contains() <pytest.ExceptionInfo.group_contains>`
-method to test for exceptions returned as part of an :class:`ExceptionGroup`:
+There's an alternate form of the :func:`pytest.raises` function where you pass
+a function that will be executed with the given ``*args`` and ``**kwargs`` and
+assert that the given exception is raised:
 
 .. code-block:: python
 
-    def test_exception_in_group():
-        with pytest.raises(RuntimeError) as excinfo:
-            raise ExceptionGroup(
-                "Group message",
-                [
-                    RuntimeError("Exception 123 raised"),
-                ],
-            )
-        assert excinfo.group_contains(RuntimeError, match=r".* 123 .*")
-        assert not excinfo.group_contains(TypeError)
-
-The optional ``match`` keyword parameter works the same way as for
-:func:`pytest.raises`.
-
-By default ``group_contains()`` will recursively search for a matching
-exception at any level of nested ``ExceptionGroup`` instances. You can
-specify a ``depth`` keyword parameter if you only want to match an
-exception at a specific level; exceptions contained directly in the top
-``ExceptionGroup`` would match ``depth=1``.
-
-.. code-block:: python
-
-    def test_exception_in_group_at_given_depth():
-        with pytest.raises(RuntimeError) as excinfo:
-            raise ExceptionGroup(
-                "Group message",
-                [
-                    RuntimeError(),
-                    ExceptionGroup(
-                        "Nested group",
-                        [
-                            TypeError(),
-                        ],
-                    ),
-                ],
-            )
-        assert excinfo.group_contains(RuntimeError, depth=1)
-        assert excinfo.group_contains(TypeError, depth=2)
-        assert not excinfo.group_contains(RuntimeError, depth=2)
-        assert not excinfo.group_contains(TypeError, depth=1)
-
-Alternate form (legacy)
-~~~~~~~~~~~~~~~~~~~~~~~
-
-There is an alternate form where you pass
-a function that will be executed, along ``*args`` and ``**kwargs``, and :func:`pytest.raises`
-will execute the function with the arguments and assert that the given exception is raised:
-
-.. code-block:: python
-
-    def func(x):
-        if x <= 0:
-            raise ValueError("x needs to be larger than zero")
-
-
-    pytest.raises(ValueError, func, x=-1)
+    pytest.raises(ExpectedException, func, *args, **kwargs)
 
 The reporter will provide you with helpful output in case of failures such as *no
 exception* or *wrong exception*.
 
-This form was the original :func:`pytest.raises` API, developed before the ``with`` statement was
-added to the Python language. Nowadays, this form is rarely used, with the context-manager form (using ``with``)
-being considered more readable.
-Nonetheless, this form is fully supported and not deprecated in any way.
-
-xfail mark and pytest.raises
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It is also possible to specify a ``raises`` argument to
-:ref:`pytest.mark.xfail <pytest.mark.xfail ref>`, which checks that the test is failing in a more
+Note that it is also possible to specify a "raises" argument to
+``pytest.mark.xfail``, which checks that the test is failing in a more
 specific way than just having any exception raised:
 
 .. code-block:: python
 
-    def f():
-        raise IndexError()
-
-
     @pytest.mark.xfail(raises=IndexError)
     def test_f():
         f()
 
-
-This will only "xfail" if the test fails by raising ``IndexError`` or subclasses.
-
-* Using :ref:`pytest.mark.xfail <pytest.mark.xfail ref>` with the ``raises`` parameter is probably better for something
-  like documenting unfixed bugs (where the test describes what "should" happen) or bugs in dependencies.
-
-* Using :func:`pytest.raises` is likely to be better for cases where you are
-  testing exceptions your own code is deliberately raising, which is the majority of cases.
+Using :func:`pytest.raises` is likely to be better for cases where you are
+testing exceptions your own code is deliberately raising, whereas using
+``@pytest.mark.xfail`` with a check function is probably better for something
+like documenting unfixed bugs (where the test describes what "should" happen)
+or bugs in dependencies.
 
 
 .. _`assertwarns`:
@@ -280,7 +183,7 @@ if you run this module:
 
     $ pytest test_assert2.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -294,7 +197,6 @@ if you run this module:
             set2 = set("8035")
     >       assert set1 == set2
     E       AssertionError: assert {'0', '1', '3', '8'} == {'0', '3', '5', '8'}
-    E
     E         Extra items in the left set:
     E         '1'
     E         Extra items in the right set:

doc/en/how-to/cache.rst

@@ -86,7 +86,7 @@ If you then run it with ``--lf``:
 
     $ pytest --lf
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
     run-last-failure: rerun previous 2 failures
@@ -132,7 +132,7 @@ of ``FF`` and dots):
 
     $ pytest --ff
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 50 items
     run-last-failure: rerun previous 2 failures first
@@ -176,21 +176,14 @@ with more recent files coming first.
 Behavior when no tests failed in the last run
 ---------------------------------------------
 
-The ``--lfnf/--last-failed-no-failures`` option governs the behavior of ``--last-failed``.
-Determines whether to execute tests when there are no previously (known)
-failures or when no cached ``lastfailed`` data was found.
-
-There are two options:
-
-* ``all``:  when there are no known test failures, runs all tests (the full test suite). This is the default.
-* ``none``: when there are no known test failures, just emits a message stating this and exit successfully.
-
-Example:
+When no tests failed in the last run, or when no cached ``lastfailed`` data was
+found, ``pytest`` can be configured either to run all of the tests or no tests,
+using the ``--last-failed-no-failures`` option, which takes one of the following values:
 
 .. code-block:: bash
 
-    pytest --last-failed --last-failed-no-failures all    # runs the full test suite (default behavior)
-    pytest --last-failed --last-failed-no-failures none   # runs no tests and exits successfully
+    pytest --last-failed --last-failed-no-failures all    # run all tests (default behavior)
+    pytest --last-failed --last-failed-no-failures none   # run no tests and exit
 
 The new config.cache object
 --------------------------------
@@ -213,12 +206,12 @@ across pytest invocations:
 
 
     @pytest.fixture
-    def mydata(pytestconfig):
-        val = pytestconfig.cache.get("example/value", None)
+    def mydata(request):
+        val = request.config.cache.get("example/value", None)
         if val is None:
             expensive_computation()
             val = 42
-            pytestconfig.cache.set("example/value", val)
+            request.config.cache.set("example/value", val)
         return val
 
 
@@ -281,7 +274,7 @@ You can always peek at the content of the cache using the
 
     $ pytest --cache-show
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     cachedir: /home/sweet/project/.pytest_cache
     --------------------------- cache values for '*' ---------------------------
@@ -303,7 +296,7 @@ filtering:
 
     $ pytest --cache-show example/*
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     cachedir: /home/sweet/project/.pytest_cache
     ----------------------- cache values for 'example/*' -----------------------

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

@@ -83,7 +83,7 @@ of the failing function and hide the other one:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 

doc/en/how-to/capture-warnings.rst

@@ -28,7 +28,7 @@ Running pytest now produces this output:
 
     $ pytest test_show_warnings.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -382,6 +382,8 @@ warnings: a WarningsRecorder instance. To view the recorded warnings, you can
 iterate over this instance, call ``len`` on it to get the number of recorded
 warnings, or index into it to get a particular recorded warning.
 
+.. currentmodule:: _pytest.warnings
+
 Full API: :class:`~_pytest.recwarn.WarningsRecorder`.
 
 .. _`warns use cases`:

doc/en/how-to/doctest.rst

@@ -30,7 +30,7 @@ then you can just invoke ``pytest`` directly:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -58,7 +58,7 @@ and functions, including from test modules:
 
     $ pytest --doctest-modules
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 

doc/en/how-to/failures.rst

@@ -135,6 +135,10 @@ Warning about unraisable exceptions and unhandled thread exceptions
 
 .. versionadded:: 6.2
 
+.. note::
+
+    These features only work on Python>=3.8.
+
 Unhandled exceptions are exceptions that are raised in a situation in which
 they cannot propagate to a caller. The most common case is an exception raised
 in a :meth:`__del__ <object.__del__>` implementation.

doc/en/how-to/fixtures.rst

@@ -433,7 +433,7 @@ marked ``smtp_connection`` fixture function.  Running the test looks like this:
 
     $ pytest test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
@@ -771,7 +771,7 @@ For yield fixtures, the first teardown code to run is from the right-most fixtur
 
     $ pytest -s test_finalizers.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -805,7 +805,7 @@ For finalizers, the first fixture to run is last call to `request.addfinalizer`.
 
     $ pytest -s test_finalizers.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -1271,7 +1271,7 @@ configured in multiple ways.
 Extending the previous example, we can flag the fixture to create two
 ``smtp_connection`` fixture instances which will cause all tests using the fixture
 to run twice.  The fixture function gets access to each parameter
-through the special :py:class:`request <pytest.FixtureRequest>` object:
+through the special :py:class:`request <FixtureRequest>` object:
 
 .. code-block:: python
 
@@ -1414,28 +1414,27 @@ Running the above tests results in the following test IDs being used:
 
    $ pytest --collect-only
    =========================== test session starts ============================
-   platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+   platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 12 items
 
-   <Dir fixtures.rst-208>
-     <Module test_anothersmtp.py>
-       <Function test_showhelo[smtp.gmail.com]>
-       <Function test_showhelo[mail.python.org]>
-     <Module test_emaillib.py>
-       <Function test_email_received>
-     <Module test_finalizers.py>
-       <Function test_bar>
-     <Module test_ids.py>
-       <Function test_a[spam]>
-       <Function test_a[ham]>
-       <Function test_b[eggs]>
-       <Function test_b[1]>
-     <Module test_module.py>
-       <Function test_ehlo[smtp.gmail.com]>
-       <Function test_noop[smtp.gmail.com]>
-       <Function test_ehlo[mail.python.org]>
-       <Function test_noop[mail.python.org]>
+   <Module test_anothersmtp.py>
+     <Function test_showhelo[smtp.gmail.com]>
+     <Function test_showhelo[mail.python.org]>
+   <Module test_emaillib.py>
+     <Function test_email_received>
+   <Module test_finalizers.py>
+     <Function test_bar>
+   <Module test_ids.py>
+     <Function test_a[spam]>
+     <Function test_a[ham]>
+     <Function test_b[eggs]>
+     <Function test_b[1]>
+   <Module test_module.py>
+     <Function test_ehlo[smtp.gmail.com]>
+     <Function test_noop[smtp.gmail.com]>
+     <Function test_ehlo[mail.python.org]>
+     <Function test_noop[mail.python.org]>
 
    ======================= 12 tests collected in 0.12s ========================
 
@@ -1469,7 +1468,7 @@ Running this test will *skip* the invocation of ``data_set`` with value ``2``:
 
     $ pytest test_fixture_marks.py -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 3 items
@@ -1519,7 +1518,7 @@ Here we declare an ``app`` fixture which receives the previously defined
 
     $ pytest -v test_appsetup.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 2 items
@@ -1599,7 +1598,7 @@ Let's run the tests in verbose mode and with looking at the print-output:
 
     $ pytest -v -s test_module.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collecting ... collected 8 items
@@ -1699,7 +1698,7 @@ and declare its use in a test module via a ``usefixtures`` marker:
     class TestDirectoryInit:
         def test_cwd_starts_empty(self):
             assert os.listdir(os.getcwd()) == []
-            with open("myfile", "w", encoding="utf-8") as f:
+            with open("myfile", "w") as f:
                 f.write("hello")
 
         def test_cwd_again_starts_empty(self):
@@ -1753,7 +1752,8 @@ into an ini-file:
         def my_fixture_that_sadly_wont_use_my_other_fixture():
             ...
 
-    This generates a deprecation warning, and will become an error in Pytest 8.
+    Currently this will not generate any error or warning, but this is intended
+    to be handled by :issue:`3664`.
 
 .. _`override fixtures`:
 

doc/en/how-to/logging.rst

@@ -172,13 +172,6 @@ the records for the ``setup`` and ``call`` stages during teardown like so:
 
 The full API is available at :class:`pytest.LogCaptureFixture`.
 
-.. warning::
-
-    The ``caplog`` fixture adds a handler to the root logger to capture logs. If the root logger is
-    modified during a test, for example with ``logging.config.dictConfig``, this handler may be
-    removed and cause no logs to be captured. To avoid this, ensure that any root logger configuration
-    only adds to the existing handlers.
-
 
 .. _live_logs:
 
@@ -241,7 +234,7 @@ through ``add_color_level()``. Example:
 
 .. code-block:: python
 
-    @pytest.hookimpl(trylast=True)
+    @pytest.hookimpl
     def pytest_configure(config):
         logging_plugin = config.pluginmanager.get_plugin("logging-plugin")
 

doc/en/how-to/nose.rst

@@ -47,7 +47,8 @@ Unsupported idioms / known issues
 - nose imports test modules with the same import path (e.g.
   ``tests.test_mode``) but different file system paths
   (e.g. ``tests/test_mode.py`` and ``other/tests/test_mode.py``)
-  by extending sys.path/import semantics.   pytest does not do that.  Note that
+  by extending sys.path/import semantics.   pytest does not do that
+  but there is discussion in :issue:`268` for adding some support.  Note that
   `nose2 choose to avoid this sys.path/import hackery <https://nose2.readthedocs.io/en/latest/differences.html#test-discovery-and-loading>`_.
 
   If you place a conftest.py file in the root directory of your project
@@ -65,34 +66,16 @@ Unsupported idioms / known issues
 
 - no nose-configuration is recognized.
 
-- ``yield``-based methods are
+- ``yield``-based methods are unsupported as of pytest 4.1.0.  They are
   fundamentally incompatible with pytest because they don't support fixtures
   properly since collection and test execution are separated.
 
-Here is a table comparing the default supported naming conventions for both
-nose and pytest.
-
-========= ========================== ======= =====
-what      default naming convention  pytest  nose
-========= ========================== ======= =====
-module    ``test*.py``                       ✅
-module    ``test_*.py``              ✅       ✅
-module    ``*_test.py``              ✅
-module    ``*_tests.py``
-class     ``*(unittest.TestCase)``   ✅       ✅
-method    ``test_*``                 ✅       ✅
-class     ``Test*``                  ✅
-method    ``test_*``                 ✅
-function  ``test_*``                 ✅
-========= ========================== ======= =====
-
-
 Migrating from nose to pytest
 ------------------------------
 
 `nose2pytest <https://github.com/pytest-dev/nose2pytest>`_ is a Python script
 and pytest plugin to help convert Nose-based tests into pytest-based tests.
-Specifically, the script transforms ``nose.tools.assert_*`` function calls into
+Specifically, the script transforms nose.tools.assert_* function calls into
 raw assert statements, while preserving format of original arguments
 as much as possible.
 

doc/en/how-to/output.rst

@@ -16,12 +16,6 @@ Examples for modifying traceback printing:
     pytest -l               # show local variables (shortcut)
     pytest --no-showlocals  # hide local variables (if addopts enables them)
 
-    pytest --capture=fd  # default, capture at the file descriptor level
-    pytest --capture=sys # capture at the sys level
-    pytest --capture=no  # don't capture
-    pytest -s            # don't capture (shortcut)
-    pytest --capture=tee-sys # capture to logs but also output to sys level streams
-
     pytest --tb=auto    # (default) 'long' tracebacks for the first and last
                          # entry, but 'short' style for the other entries
     pytest --tb=long    # exhaustive, informative traceback formatting
@@ -42,16 +36,6 @@ option you make sure a trace is shown.
 Verbosity
 --------------------------------------------------
 
-Examples for modifying printing verbosity:
-
-.. code-block:: bash
-
-    pytest --quiet          # quiet - less verbose - mode
-    pytest -q               # quiet - less verbose - mode (shortcut)
-    pytest -v               # increase verbosity, display individual test names
-    pytest -vv              # more verbose, display more details from the test output
-    pytest -vvv             # not a standard , but may be used for even more detail in certain setups
-
 The ``-v`` flag controls the verbosity of pytest output in various aspects: test session progress, assertion
 details when tests fail, fixtures details with ``--fixtures``, etc.
 
@@ -100,7 +84,6 @@ Executing pytest normally gives us this output (we are skipping the header to fo
             fruits2 = ["banana", "apple", "orange", "melon", "kiwi"]
     >       assert fruits1 == fruits2
     E       AssertionError: assert ['banana', 'a...elon', 'kiwi'] == ['banana', 'a...elon', 'kiwi']
-    E
     E         At index 2 diff: 'grapes' != 'orange'
     E         Use -v to get more diff
 
@@ -112,7 +95,6 @@ Executing pytest normally gives us this output (we are skipping the header to fo
             number_to_text2 = {str(x * 10): x * 10 for x in range(5)}
     >       assert number_to_text1 == number_to_text2
     E       AssertionError: assert {'0': 0, '1':..., '3': 3, ...} == {'0': 0, '10'...'30': 30, ...}
-    E
     E         Omitting 1 identical items, use -vv to show
     E         Left contains 4 more items:
     E         {'1': 1, '2': 2, '3': 3, '4': 4}
@@ -164,15 +146,12 @@ Now we can increase pytest's verbosity:
             fruits2 = ["banana", "apple", "orange", "melon", "kiwi"]
     >       assert fruits1 == fruits2
     E       AssertionError: assert ['banana', 'a...elon', 'kiwi'] == ['banana', 'a...elon', 'kiwi']
-    E
     E         At index 2 diff: 'grapes' != 'orange'
-    E
     E         Full diff:
-    E           [
-    E               'banana',
-    E               'apple',...
-    E
-    E         ...Full output truncated (7 lines hidden), use '-vv' to show
+    E         - ['banana', 'apple', 'orange', 'melon', 'kiwi']
+    E         ?                      ^  ^^
+    E         + ['banana', 'apple', 'grapes', 'melon', 'kiwi']
+    E         ?                      ^  ^ +
 
     test_verbosity_example.py:8: AssertionError
     ____________________________ test_numbers_fail _____________________________
@@ -182,15 +161,15 @@ Now we can increase pytest's verbosity:
             number_to_text2 = {str(x * 10): x * 10 for x in range(5)}
     >       assert number_to_text1 == number_to_text2
     E       AssertionError: assert {'0': 0, '1':..., '3': 3, ...} == {'0': 0, '10'...'30': 30, ...}
-    E
     E         Omitting 1 identical items, use -vv to show
     E         Left contains 4 more items:
     E         {'1': 1, '2': 2, '3': 3, '4': 4}
     E         Right contains 4 more items:
     E         {'10': 10, '20': 20, '30': 30, '40': 40}
-    E         ...
-    E
-    E         ...Full output truncated (16 lines hidden), use '-vv' to show
+    E         Full diff:
+    E         - {'0': 0, '10': 10, '20': 20, '30': 30, '40': 40}
+    E         ?            -    -    -    -    -    -    -    -
+    E         + {'0': 0, '1': 1, '2': 2, '3': 3, '4': 4}
 
     test_verbosity_example.py:14: AssertionError
     ___________________________ test_long_text_fail ____________________________
@@ -236,20 +215,12 @@ Now if we increase verbosity even more:
             fruits2 = ["banana", "apple", "orange", "melon", "kiwi"]
     >       assert fruits1 == fruits2
     E       AssertionError: assert ['banana', 'apple', 'grapes', 'melon', 'kiwi'] == ['banana', 'apple', 'orange', 'melon', 'kiwi']
-    E
     E         At index 2 diff: 'grapes' != 'orange'
-    E
     E         Full diff:
-    E           [
-    E               'banana',
-    E               'apple',
-    E         -     'orange',
-    E         ?      ^  ^^
-    E         +     'grapes',
-    E         ?      ^  ^ +
-    E               'melon',
-    E               'kiwi',
-    E           ]
+    E         - ['banana', 'apple', 'orange', 'melon', 'kiwi']
+    E         ?                      ^  ^^
+    E         + ['banana', 'apple', 'grapes', 'melon', 'kiwi']
+    E         ?                      ^  ^ +
 
     test_verbosity_example.py:8: AssertionError
     ____________________________ test_numbers_fail _____________________________
@@ -259,30 +230,16 @@ Now if we increase verbosity even more:
             number_to_text2 = {str(x * 10): x * 10 for x in range(5)}
     >       assert number_to_text1 == number_to_text2
     E       AssertionError: assert {'0': 0, '1': 1, '2': 2, '3': 3, '4': 4} == {'0': 0, '10': 10, '20': 20, '30': 30, '40': 40}
-    E
     E         Common items:
     E         {'0': 0}
     E         Left contains 4 more items:
     E         {'1': 1, '2': 2, '3': 3, '4': 4}
     E         Right contains 4 more items:
     E         {'10': 10, '20': 20, '30': 30, '40': 40}
-    E
     E         Full diff:
-    E           {
-    E               '0': 0,
-    E         -     '10': 10,
-    E         ?       -    -
-    E         +     '1': 1,
-    E         -     '20': 20,
-    E         ?       -    -
-    E         +     '2': 2,
-    E         -     '30': 30,
-    E         ?       -    -
-    E         +     '3': 3,
-    E         -     '40': 40,
-    E         ?       -    -
-    E         +     '4': 4,
-    E           }
+    E         - {'0': 0, '10': 10, '20': 20, '30': 30, '40': 40}
+    E         ?            -    -    -    -    -    -    -    -
+    E         + {'0': 0, '1': 1, '2': 2, '3': 3, '4': 4}
 
     test_verbosity_example.py:14: AssertionError
     ___________________________ test_long_text_fail ____________________________
@@ -313,20 +270,6 @@ situations, for example you are shown even fixtures that start with ``_`` if you
 Using higher verbosity levels (``-vvv``, ``-vvvv``, ...) is supported, but has no effect in pytest itself at the moment,
 however some plugins might make use of higher verbosity.
 
-.. _`pytest.fine_grained_verbosity`:
-
-Fine-grained verbosity
-~~~~~~~~~~~~~~~~~~~~~~
-
-In addition to specifying the application wide verbosity level, it is possible to control specific aspects independently.
-This is done by setting a verbosity level in the configuration file for the specific aspect of the output.
-
-:confval:`verbosity_assertions`: Controls how verbose the assertion output should be when pytest is executed. Running
-``pytest --no-header`` with a value of ``2`` would have the same output as the previous example, but each test inside
-the file is shown by a single character in the output.
-
-(Note: currently this is the only option available, but more might be added in the future).
-
 .. _`pytest.detailed_failed_tests_usage`:
 
 Producing a detailed summary report
@@ -381,7 +324,7 @@ Example:
 
     $ pytest -ra
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 6 items
 
@@ -437,7 +380,7 @@ More than one character can be used, so for example to only see failed and skipp
 
     $ pytest -rfs
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 6 items
 
@@ -472,7 +415,7 @@ captured output:
 
     $ pytest -rpP
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 6 items
 
@@ -535,7 +478,7 @@ integration servers, use this invocation:
 
 .. code-block:: bash
 
-    pytest --junit-xml=path
+    pytest --junitxml=path
 
 to create an XML file at ``path``.
 

doc/en/how-to/parametrize.rst

@@ -56,7 +56,7 @@ them in turn:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 3 items
 
@@ -167,7 +167,7 @@ Let's run this:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 3 items
 

doc/en/how-to/tmp_path.rst

@@ -24,8 +24,8 @@ created in the `base temporary directory`_.
         d = tmp_path / "sub"
         d.mkdir()
         p = d / "hello.txt"
-        p.write_text(CONTENT, encoding="utf-8")
-        assert p.read_text(encoding="utf-8") == CONTENT
+        p.write_text(CONTENT)
+        assert p.read_text() == CONTENT
         assert len(list(tmp_path.iterdir())) == 1
         assert 0
 
@@ -36,7 +36,7 @@ Running this would result in a passed test except for the last
 
     $ pytest test_tmp_path.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -51,8 +51,8 @@ Running this would result in a passed test except for the last
             d = tmp_path / "sub"
             d.mkdir()
             p = d / "hello.txt"
-            p.write_text(CONTENT, encoding="utf-8")
-            assert p.read_text(encoding="utf-8") == CONTENT
+            p.write_text(CONTENT)
+            assert p.read_text() == CONTENT
             assert len(list(tmp_path.iterdir())) == 1
     >       assert 0
     E       assert 0

doc/en/how-to/unittest.rst

@@ -140,7 +140,7 @@ the ``self.db`` values in the traceback:
 
     $ pytest test_unittest_db.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 2 items
 
@@ -207,10 +207,10 @@ creation of a per-test temporary directory:
         @pytest.fixture(autouse=True)
         def initdir(self, tmp_path, monkeypatch):
             monkeypatch.chdir(tmp_path)  # change to pytest-provided temporary directory
-            tmp_path.joinpath("samplefile.ini").write_text("# testdata", encoding="utf-8")
+            tmp_path.joinpath("samplefile.ini").write_text("# testdata")
 
         def test_method(self):
-            with open("samplefile.ini", encoding="utf-8") as f:
+            with open("samplefile.ini") as f:
                 s = f.read()
             assert "testdata" in s
 

doc/en/how-to/usage.rst

@@ -44,34 +44,23 @@ Use ``""`` instead of ``''`` in expression when running this on Windows
 
 .. _nodeids:
 
-**Run tests by collection arguments**
+**Run tests by node ids**
 
-Pass the module filename relative to the working directory, followed by specifiers like the class name and function name
-separated by ``::`` characters, and parameters from parameterization enclosed in ``[]``.
+Each collected test is assigned a unique ``nodeid`` which consist of the module filename followed
+by specifiers like class names, function names and parameters from parametrization, separated by ``::`` characters.
 
 To run a specific test within a module:
 
 .. code-block:: bash
 
-    pytest tests/test_mod.py::test_func
+    pytest test_mod.py::test_func
 
-To run all tests in a class:
+
+Another example specifying a test method in the command line:
 
 .. code-block:: bash
 
-    pytest tests/test_mod.py::TestClass
-
-Specifying a specific test method:
-
-.. code-block:: bash
-
-    pytest tests/test_mod.py::TestClass::test_method
-
-Specifying a specific parametrization of a test:
-
-.. code-block:: bash
-
-    pytest tests/test_mod.py::test_func[x1,y2]
+    pytest test_mod.py::TestClass::test_method
 
 **Run tests by marker expressions**
 
@@ -184,8 +173,7 @@ You can invoke ``pytest`` from Python code directly:
 
 this acts as if you would call "pytest" from the command line.
 It will not raise :class:`SystemExit` but return the :ref:`exit code <exit-codes>` instead.
-If you don't pass it any arguments, ``main`` reads the arguments from the command line arguments of the process (:data:`sys.argv`), which may be undesirable.
-You can pass in options and arguments explicitly:
+You can pass in options and arguments:
 
 .. code-block:: python
 

doc/en/how-to/writing_hook_functions.rst

@@ -56,17 +56,23 @@ The remaining hook functions will not be called in this case.
 
 .. _`hookwrapper`:
 
-hook wrappers: executing around other hooks
+hookwrapper: executing around other hooks
 -------------------------------------------------
 
+.. currentmodule:: _pytest.core
+
+
+
 pytest plugins can implement hook wrappers which wrap the execution
 of other hook implementations.  A hook wrapper is a generator function
 which yields exactly once. When pytest invokes hooks it first executes
 hook wrappers and passes the same arguments as to the regular hooks.
 
 At the yield point of the hook wrapper pytest will execute the next hook
-implementations and return their result to the yield point, or will
-propagate an exception if they raised.
+implementations and return their result to the yield point in the form of
+a :py:class:`Result <pluggy._Result>` instance which encapsulates a result or
+exception info.  The yield point itself will thus typically not raise
+exceptions (unless there are bugs).
 
 Here is an example definition of a hook wrapper:
 
@@ -75,35 +81,26 @@ Here is an example definition of a hook wrapper:
     import pytest
 
 
-    @pytest.hookimpl(wrapper=True)
+    @pytest.hookimpl(hookwrapper=True)
     def pytest_pyfunc_call(pyfuncitem):
         do_something_before_next_hook_executes()
 
-        # If the outcome is an exception, will raise the exception.
-        res = yield
+        outcome = yield
+        # outcome.excinfo may be None or a (cls, val, tb) tuple
 
-        new_res = post_process_result(res)
+        res = outcome.get_result()  # will raise if outcome was exception
 
-        # Override the return value to the plugin system.
-        return new_res
+        post_process_result(res)
 
-The hook wrapper needs to return a result for the hook, or raise an exception.
+        outcome.force_result(new_res)  # to override the return value to the plugin system
 
-In many cases, the wrapper only needs to perform tracing or other side effects
-around the actual hook implementations, in which case it can return the result
-value of the ``yield``. The simplest (though useless) hook wrapper is
-``return (yield)``.
-
-In other cases, the wrapper wants the adjust or adapt the result, in which case
-it can return a new value. If the result of the underlying hook is a mutable
-object, the wrapper may modify that result, but it's probably better to avoid it.
-
-If the hook implementation failed with an exception, the wrapper can handle that
-exception using a ``try-catch-finally`` around the ``yield``, by propagating it,
-supressing it, or raising a different exception entirely.
+Note that hook wrappers don't return results themselves, they merely
+perform tracing or other side effects around the actual hook implementations.
+If the result of the underlying hook is a mutable object, they may modify
+that result but it's probably better to avoid it.
 
 For more information, consult the
-:ref:`pluggy documentation about hook wrappers <pluggy:hookwrappers>`.
+:ref:`pluggy documentation about hookwrappers <pluggy:hookwrappers>`.
 
 .. _plugin-hookorder:
 
@@ -133,14 +130,11 @@ after others, i.e.  the position in the ``N``-sized list of functions:
 
 
     # Plugin 3
-    @pytest.hookimpl(wrapper=True)
+    @pytest.hookimpl(hookwrapper=True)
     def pytest_collection_modifyitems(items):
         # will execute even before the tryfirst one above!
-        try:
-            return (yield)
-        finally:
-            # will execute after all non-wrappers executed
-            ...
+        outcome = yield
+        # will execute after all non-hookwrappers executed
 
 Here is the order of execution:
 
@@ -155,13 +149,13 @@ Here is the order of execution:
    Plugin1).
 
 4. Plugin3's pytest_collection_modifyitems then executing the code after the yield
-   point.  The yield receives the result from calling the non-wrappers, or raises
-   an exception if the non-wrappers raised.
+   point.  The yield receives a :py:class:`Result <pluggy._Result>` instance which encapsulates
+   the result from calling the non-wrappers.  Wrappers shall not modify the result.
 
-It's possible to use ``tryfirst`` and ``trylast`` also on hook wrappers
-in which case it will influence the ordering of hook wrappers among each other.
+It's possible to use ``tryfirst`` and ``trylast`` also in conjunction with
+``hookwrapper=True`` in which case it will influence the ordering of hookwrappers
+among each other.
 
-.. _`declaringhooks`:
 
 Declaring new hooks
 ------------------------
@@ -171,11 +165,13 @@ Declaring new hooks
     This is a quick overview on how to add new hooks and how they work in general, but a more complete
     overview can be found in `the pluggy documentation <https://pluggy.readthedocs.io/en/latest/>`__.
 
+.. currentmodule:: _pytest.hookspec
+
 Plugins and ``conftest.py`` files may declare new hooks that can then be
 implemented by other plugins in order to alter behaviour or interact with
 the new plugin:
 
-.. autofunction:: _pytest.hookspec.pytest_addhooks
+.. autofunction:: pytest_addhooks
     :noindex:
 
 Hooks are usually declared as do-nothing functions that contain only

doc/en/how-to/writing_plugins.rst

@@ -448,7 +448,7 @@ in our ``pytest.ini`` to tell pytest where to look for example files.
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     configfile: pytest.ini
     collected 2 items

doc/en/index.rst

@@ -2,7 +2,7 @@
 
 .. sidebar:: Next Open Trainings
 
-   - `Professional Testing with Python <https://python-academy.com/courses/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_, **March 5th to 7th 2024** (3 day in-depth training), **Leipzig, Germany / Remote**
+   - `Professional Testing with Python <https://python-academy.com/courses/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_, March 5th to 7th 2024 (3 day in-depth training), Leipzig/Remote
 
    Also see :doc:`previous talks and blogposts <talks>`.
 
@@ -17,7 +17,7 @@ The ``pytest`` framework makes it easy to write small, readable tests, and can
 scale to support complex functional testing for applications and libraries.
 
 
-``pytest`` requires: Python 3.8+ or PyPy3.
+``pytest`` requires: Python 3.7+ or PyPy3.
 
 **PyPI package name**: :pypi:`pytest`
 
@@ -42,7 +42,7 @@ To execute it:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
     rootdir: /home/sweet/project
     collected 1 item
 
@@ -76,7 +76,7 @@ Features
 
 - Can run :ref:`unittest <unittest>` (including trial) and :ref:`nose <noseintegration>` test suites out of the box
 
-- Python 3.8+ or PyPy 3
+- Python 3.7+ or PyPy 3
 
 - Rich plugin architecture, with over 800+ :ref:`external plugins <plugin-list>` and thriving community
 

doc/en/reference/customize.rst

@@ -90,7 +90,7 @@ and can also be used to hold pytest configuration if they have a ``[pytest]`` se
 setup.cfg
 ~~~~~~~~~
 
-``setup.cfg`` files are general purpose configuration files, used originally by ``distutils`` (now deprecated) and `setuptools <https://setuptools.pypa.io/en/latest/userguide/declarative_config.html>`__, and can also be used to hold pytest configuration
+``setup.cfg`` files are general purpose configuration files, used originally by :doc:`distutils <python:distutils/configfile>`, and can also be used to hold pytest configuration
 if they have a ``[tool:pytest]`` section.
 
 .. code-block:: ini

doc/en/reference/fixtures.rst

@@ -11,6 +11,9 @@ Fixtures reference
 .. seealso:: :ref:`about-fixtures`
 .. seealso:: :ref:`how-to-fixtures`
 
+
+.. currentmodule:: _pytest.python
+
 .. _`Dependency injection`: https://en.wikipedia.org/wiki/Dependency_injection
 
 
@@ -73,13 +76,15 @@ Built-in fixtures
         :class:`pathlib.Path` objects.
 
    :fixture:`tmpdir`
-        Provide a `py.path.local <https://py.readthedocs.io/en/latest/path.html>`_ object to a temporary
+        Provide a :class:`py.path.local` object to a temporary
         directory which is unique to each test function;
         replaced by :fixture:`tmp_path`.
 
+        .. _`py.path.local`: https://py.readthedocs.io/en/latest/path.html
+
    :fixture:`tmpdir_factory`
         Make session-scoped temporary directories and return
-        ``py.path.local`` objects;
+        :class:`py.path.local` objects;
         replaced by :fixture:`tmp_path_factory`.
 
 
@@ -93,7 +98,7 @@ Fixture availability is determined from the perspective of the test. A fixture
 is only available for tests to request if they are in the scope that fixture is
 defined in. If a fixture is defined inside a class, it can only be requested by
 tests inside that class. But if a fixture is defined inside the global scope of
-the module, then every test in that module, even if it's defined inside a class,
+the module, than every test in that module, even if it's defined inside a class,
 can request it.
 
 Similarly, a test can also only be affected by an autouse fixture if that test

doc/en/reference/reference.rst

@@ -1,5 +1,3 @@
-:tocdepth: 3
-
 .. _`api-reference`:
 
 API Reference
@@ -79,13 +77,11 @@ pytest.xfail
 pytest.exit
 ~~~~~~~~~~~
 
-.. autofunction:: pytest.exit(reason, [returncode=None, msg=None])
+.. autofunction:: pytest.exit(reason, [returncode=False, msg=None])
 
 pytest.main
 ~~~~~~~~~~~
 
-**Tutorial**: :ref:`pytest.main-usage`
-
 .. autofunction:: pytest.main
 
 pytest.param
@@ -239,23 +235,22 @@ pytest.mark.xfail
 
 Marks a test function as *expected to fail*.
 
-.. py:function:: pytest.mark.xfail(condition=False, *, reason=None, raises=None, run=True, strict=xfail_strict)
+.. py:function:: pytest.mark.xfail(condition=None, *, reason=None, raises=None, run=True, strict=False)
 
-    :keyword Union[bool, str] condition:
+    :type condition: bool or str
+    :param condition:
         Condition for marking the test function as xfail (``True/False`` or a
-        :ref:`condition string <string conditions>`). If a ``bool``, you also have
+        :ref:`condition string <string conditions>`). If a bool, you also have
         to specify ``reason`` (see :ref:`condition string <string conditions>`).
     :keyword str reason:
         Reason why the test function is marked as xfail.
     :keyword Type[Exception] raises:
-        Exception class (or tuple of classes) expected to be raised by the test function; other exceptions will fail the test.
-        Note that subclasses of the classes passed will also result in a match (similar to how the ``except`` statement works).
-
+        Exception subclass (or tuple of subclasses) expected to be raised by the test function; other exceptions will fail the test.
     :keyword bool run:
-        Whether the test function should actually be executed. If ``False``, the function will always xfail and will
+        If the test function should actually be executed. If ``False``, the function will always xfail and will
         not be executed (useful if a function is segfaulting).
     :keyword bool strict:
-        * If ``False`` the function will be shown in the terminal output as ``xfailed`` if it fails
+        * If ``False`` (the default) the function will be shown in the terminal output as ``xfailed`` if it fails
           and as ``xpass`` if it passes. In both cases this will not cause the test suite to fail as a whole. This
           is particularly useful to mark *flaky* tests (tests that fail at random) to be tackled later.
         * If ``True``, the function will be shown in the terminal output as ``xfailed`` if it fails, but if it
@@ -263,8 +258,6 @@ Marks a test function as *expected to fail*.
           that are always failing and there should be a clear indication if they unexpectedly start to pass (for example
           a new release of a library fixes a known bug).
 
-        Defaults to :confval:`xfail_strict`, which is ``False`` by default.
-
 
 Custom marks
 ~~~~~~~~~~~~
@@ -612,30 +605,10 @@ Hooks
 
 **Tutorial**: :ref:`writing-plugins`
 
-Reference to all hooks which can be implemented by :ref:`conftest.py files <localplugin>` and :ref:`plugins <plugins>`.
-
-@pytest.hookimpl
-~~~~~~~~~~~~~~~~
-
-.. function:: pytest.hookimpl
-    :decorator:
-
-    pytest's decorator for marking functions as hook implementations.
-
-    See :ref:`writinghooks` and :func:`pluggy.HookimplMarker`.
-
-@pytest.hookspec
-~~~~~~~~~~~~~~~~
-
-.. function:: pytest.hookspec
-    :decorator:
-
-    pytest's decorator for marking functions as hook specifications.
-
-    See :ref:`declaringhooks` and :func:`pluggy.HookspecMarker`.
-
 .. currentmodule:: _pytest.hookspec
 
+Reference to all hooks which can be implemented by :ref:`conftest.py files <localplugin>` and :ref:`plugins <plugins>`.
+
 Bootstrapping hooks
 ~~~~~~~~~~~~~~~~~~~
 
@@ -682,8 +655,6 @@ Collection hooks
 .. autofunction:: pytest_collection
 .. hook:: pytest_ignore_collect
 .. autofunction:: pytest_ignore_collect
-.. hook:: pytest_collect_directory
-.. autofunction:: pytest_collect_directory
 .. hook:: pytest_collect_file
 .. autofunction:: pytest_collect_file
 .. hook:: pytest_pycollect_makemodule
@@ -812,16 +783,23 @@ reporting or interaction with exceptions:
 .. autofunction:: pytest_leave_pdb
 
 
-Collection tree objects
------------------------
+Objects
+-------
 
-These are the collector and item classes (collectively called "nodes") which
-make up the collection tree.
+Full reference to objects accessible from :ref:`fixtures <fixture>` or :ref:`hooks <hook-reference>`.
 
-Node
-~~~~
 
-.. autoclass:: _pytest.nodes.Node()
+CallInfo
+~~~~~~~~
+
+.. autoclass:: pytest.CallInfo()
+    :members:
+
+
+Class
+~~~~~
+
+.. autoclass:: pytest.Class()
     :members:
     :show-inheritance:
 
@@ -832,12 +810,32 @@ Collector
     :members:
     :show-inheritance:
 
-Item
-~~~~
+CollectReport
+~~~~~~~~~~~~~
 
-.. autoclass:: pytest.Item()
+.. autoclass:: pytest.CollectReport()
     :members:
     :show-inheritance:
+    :inherited-members:
+
+Config
+~~~~~~
+
+.. autoclass:: pytest.Config()
+    :members:
+
+ExceptionInfo
+~~~~~~~~~~~~~
+
+.. autoclass:: pytest.ExceptionInfo()
+    :members:
+
+
+ExitCode
+~~~~~~~~
+
+.. autoclass:: pytest.ExitCode
+    :members:
 
 File
 ~~~~
@@ -846,6 +844,14 @@ File
     :members:
     :show-inheritance:
 
+
+FixtureDef
+~~~~~~~~~~
+
+.. autoclass:: _pytest.fixtures.FixtureDef()
+    :members:
+    :show-inheritance:
+
 FSCollector
 ~~~~~~~~~~~
 
@@ -853,34 +859,6 @@ FSCollector
     :members:
     :show-inheritance:
 
-Session
-~~~~~~~
-
-.. autoclass:: pytest.Session()
-    :members:
-    :show-inheritance:
-
-Package
-~~~~~~~
-
-.. autoclass:: pytest.Package()
-    :members:
-    :show-inheritance:
-
-Module
-~~~~~~
-
-.. autoclass:: pytest.Module()
-    :members:
-    :show-inheritance:
-
-Class
-~~~~~
-
-.. autoclass:: pytest.Class()
-    :members:
-    :show-inheritance:
-
 Function
 ~~~~~~~~
 
@@ -895,64 +873,10 @@ FunctionDefinition
     :members:
     :show-inheritance:
 
+Item
+~~~~
 
-Objects
--------
-
-Objects accessible from :ref:`fixtures <fixture>` or :ref:`hooks <hook-reference>`
-or importable from ``pytest``.
-
-
-CallInfo
-~~~~~~~~
-
-.. autoclass:: pytest.CallInfo()
-    :members:
-
-CollectReport
-~~~~~~~~~~~~~
-
-.. autoclass:: pytest.CollectReport()
-    :members:
-    :show-inheritance:
-    :inherited-members:
-
-Config
-~~~~~~
-
-.. autoclass:: pytest.Config()
-    :members:
-
-Dir
-~~~
-
-.. autoclass:: pytest.Dir()
-    :members:
-
-Directory
-~~~~~~~~~
-
-.. autoclass:: pytest.Directory()
-    :members:
-
-ExceptionInfo
-~~~~~~~~~~~~~
-
-.. autoclass:: pytest.ExceptionInfo()
-    :members:
-
-
-ExitCode
-~~~~~~~~
-
-.. autoclass:: pytest.ExitCode
-    :members:
-
-
-FixtureDef
-~~~~~~~~~~
-
-.. autoclass:: pytest.FixtureDef()
+.. autoclass:: pytest.Item()
     :members:
     :show-inheritance:
 
@@ -983,6 +907,19 @@ Metafunc
 .. autoclass:: pytest.Metafunc()
     :members:
 
+Module
+~~~~~~
+
+.. autoclass:: pytest.Module()
+    :members:
+    :show-inheritance:
+
+Node
+~~~~
+
+.. autoclass:: _pytest.nodes.Node()
+    :members:
+
 Parser
 ~~~~~~
 
@@ -1004,6 +941,13 @@ PytestPluginManager
     :inherited-members:
     :show-inheritance:
 
+Session
+~~~~~~~
+
+.. autoclass:: pytest.Session()
+    :members:
+    :show-inheritance:
+
 TestReport
 ~~~~~~~~~~
 
@@ -1018,10 +962,10 @@ TestShortLogReport
 .. autoclass:: pytest.TestShortLogReport()
     :members:
 
-Result
+_Result
 ~~~~~~~
 
-Result object used within :ref:`hook wrappers <hookwrapper>`, see :py:class:`Result in the pluggy documentation <pluggy.Result>` for more information.
+Result object used within :ref:`hook wrappers <hookwrapper>`, see :py:class:`_Result in the pluggy documentation <pluggy._callers._Result>` for more information.
 
 Stash
 ~~~~~
@@ -1160,22 +1104,19 @@ When set to ``0``, pytest will not use color.
 
 .. envvar:: NO_COLOR
 
-When set to a non-empty string (regardless of value), pytest will not use color in terminal output.
+When set (regardless of value), pytest will not use color in terminal output.
 ``PY_COLORS`` takes precedence over ``NO_COLOR``, which takes precedence over ``FORCE_COLOR``.
 See `no-color.org <https://no-color.org/>`__ for other libraries supporting this community standard.
 
 .. envvar:: FORCE_COLOR
 
-When set to a non-empty string (regardless of value), pytest will use color in terminal output.
+When set (regardless of value), pytest will use color in terminal output.
 ``PY_COLORS`` and ``NO_COLOR`` take precedence over ``FORCE_COLOR``.
 
 Exceptions
 ----------
 
-.. autoexception:: pytest.UsageError()
-    :show-inheritance:
-
-.. autoexception:: pytest.FixtureLookupError()
+.. autoclass:: pytest.UsageError()
     :show-inheritance:
 
 .. _`warnings ref`:
@@ -1212,9 +1153,6 @@ Custom warnings generated in some situations such as improper usage or deprecate
 .. autoclass:: pytest.PytestRemovedIn8Warning
   :show-inheritance:
 
-.. autoclass:: pytest.PytestRemovedIn9Warning
-  :show-inheritance:
-
 .. autoclass:: pytest.PytestUnhandledCoroutineWarning
    :show-inheritance:
 
@@ -1681,11 +1619,11 @@ passed multiple times. The expected format is ``name=value``. For example::
    Additionally, ``pytest`` will attempt to intelligently identify and ignore a
    virtualenv by the presence of an activation script.  Any directory deemed to
    be the root of a virtual environment will not be considered during test
-   collection unless ``--collect-in-virtualenv`` is given.  Note also that
-   ``norecursedirs`` takes precedence over ``--collect-in-virtualenv``; e.g. if
+   collection unless ``‑‑collect‑in‑virtualenv`` is given.  Note also that
+   ``norecursedirs`` takes precedence over ``‑‑collect‑in‑virtualenv``; e.g. if
    you intend to run tests in a virtualenv with a base directory that matches
    ``'.*'`` you *must* override ``norecursedirs`` in addition to using the
-   ``--collect-in-virtualenv`` flag.
+   ``‑‑collect‑in‑virtualenv`` flag.
 
 
 .. confval:: python_classes
@@ -1765,11 +1703,6 @@ passed multiple times. The expected format is ``name=value``. For example::
         [pytest]
         pythonpath = src1 src2
 
-   .. note::
-
-        ``pythonpath`` does not affect some imports that happen very early,
-        most notably plugins loaded using the ``-p`` command line option.
-
 
 .. confval:: required_plugins
 
@@ -1860,19 +1793,6 @@ passed multiple times. The expected format is ``name=value``. For example::
             clean_db
 
 
-.. confval:: verbosity_assertions
-
-    Set a verbosity level specifically for assertion related output, overriding the application wide level.
-
-    .. code-block:: ini
-
-        [pytest]
-        verbosity_assertions = 2
-
-    Defaults to application wide verbosity level (via the ``-v`` command-line option). A special value of
-    "auto" can be used to explicitly use the global verbosity level.
-
-
 .. confval:: xfail_strict
 
     If set to ``True``, tests marked with ``@pytest.mark.xfail`` that actually succeed will by default fail the
@@ -1946,12 +1866,8 @@ All the command-line flags can be obtained by running ``pytest --help``::
                             tests. Optional argument: glob (default: '*').
       --cache-clear         Remove all cache contents at start of test run
       --lfnf={all,none}, --last-failed-no-failures={all,none}
-                            With ``--lf``, determines whether to execute tests
-                            when there are no previously (known) failures or
-                            when no cached ``lastfailed`` data was found.
-                            ``all`` (the default) runs the full test suite
-                            again. ``none`` just emits a message about no known
-                            failures and exits successfully.
+                            Which tests to run with no previously (known)
+                            failures
       --sw, --stepwise      Exit on test failure and continue from last failing
                             test next time
       --sw-skip, --stepwise-skip
@@ -2002,9 +1918,9 @@ All the command-line flags can be obtained by running ``pytest --help``::
       --strict-markers      Markers not registered in the `markers` section of
                             the configuration file raise errors
       --strict              (Deprecated) alias to --strict-markers
-      -c FILE, --config-file=FILE
+      -c, --config-file FILE
                             Load configuration from `FILE` instead of trying to
-                            locate one of the implicit configuration files.
+                            locate one of the implicit configuration files
       --continue-on-collection-errors
                             Force test execution even if collection errors occur
       --rootdir=ROOTDIR     Define root directory for tests. Can be relative
@@ -2141,10 +2057,6 @@ All the command-line flags can be obtained by running ``pytest --help``::
       enable_assertion_pass_hook (bool):
                             Enables the pytest_assertion_pass hook. Make sure to
                             delete any previously generated pyc cache files.
-      verbosity_assertions (string):
-                            Specify a verbosity level for assertions, overriding
-                            the main level. Higher levels will provide more
-                            detailed explanation when an assertion fails.
       junit_suite_name (string):
                             Test suite name for JUnit report
       junit_logging (string):

doc/en/requirements.txt

@@ -1,8 +1,8 @@
 pallets-sphinx-themes
-pluggy>=1.2.0
+pluggy>=1.0
 pygments-pytest>=2.3.0
 sphinx-removed-in>=0.2.0
-sphinx>=5,<8
+sphinx>=5,<6
 sphinxcontrib-trio
 sphinxcontrib-svg2pdfconverter
 # Pin packaging because it no longer handles 'latest' version, which

pyproject.toml

@@ -1,5 +1,6 @@
 [build-system]
 requires = [
+  # sync with setup.py until we discard non-pep-517/518
   "setuptools>=45.0",
   "setuptools-scm[toml]>=6.2.3",
 ]
@@ -16,12 +17,7 @@ python_classes = ["Test", "Acceptance"]
 python_functions = ["test"]
 # NOTE: "doc" is not included here, but gets tested explicitly via "doctesting".
 testpaths = ["testing"]
-norecursedirs = [
-  "testing/example_scripts",
-  ".*",
-  "build",
-  "dist",
-]
+norecursedirs = ["testing/example_scripts"]
 xfail_strict = true
 filterwarnings = [
     "error",
@@ -117,7 +113,7 @@ template = "changelog/_template.rst"
   showcontent = true
 
 [tool.black]
-target-version = ['py38']
+target-version = ['py37']
 
 # check-wheel-contents is executed by the build-and-inspect-python-package action.
 [tool.check-wheel-contents]

scripts/prepare-release-pr.py

@@ -31,22 +31,10 @@ class InvalidFeatureRelease(Exception):
 SLUG = "pytest-dev/pytest"
 
 PR_BODY = """\
-Created by the [prepare release pr]\
-(https://github.com/pytest-dev/pytest/actions/workflows/prepare-release-pr.yml) workflow.
+Created automatically from manual trigger.
 
-Once all builds pass and it has been **approved** by one or more maintainers, start the \
-[deploy](https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml) workflow, using these parameters:
-
-* `Use workflow from`: `release-{version}`.
-* `Release version`: `{version}`.
-
-Or execute on the command line:
-
-```console
-gh workflow run deploy.yml -r release-{version} -f version={version}
-```
-
-After the workflow has been approved by a core maintainer, the package will be uploaded to PyPI automatically.
+Once all builds pass and it has been **approved** by one or more maintainers, the build
+can be released by pushing a tag `{version}` to this repository.
 """
 
 

scripts/towncrier-draft-to-file.py

@@ -7,9 +7,7 @@ def main():
     Platform agnostic wrapper script for towncrier.
     Fixes the issue (#7251) where windows users are unable to natively run tox -e docs to build pytest docs.
     """
-    with open(
-        "doc/en/_changelog_towncrier_draft.rst", "w", encoding="utf-8"
-    ) as draft_file:
+    with open("doc/en/_changelog_towncrier_draft.rst", "w") as draft_file:
         return call(("towncrier", "--draft"), stdout=draft_file)
 
 

scripts/update-plugin-list.py

@@ -5,41 +5,22 @@ from textwrap import dedent
 from textwrap import indent
 
 import packaging.version
-import platformdirs
+import requests
 import tabulate
 import wcwidth
-from requests_cache import CachedResponse
-from requests_cache import CachedSession
-from requests_cache import OriginalResponse
-from requests_cache import SQLiteCache
 from tqdm import tqdm
 
-
 FILE_HEAD = r"""
-.. Note this file is autogenerated by scripts/update-plugin-list.py - usually weekly via github action
-
 .. _plugin-list:
 
-Pytest Plugin List
-==================
+Plugin List
+===========
 
-Below is an automated compilation of ``pytest``` plugins available on `PyPI <https://pypi.org>`_.
-It includes PyPI projects whose names begin with "pytest-" and a handful of manually selected projects.
+PyPI projects that match "pytest-\*" are considered plugins and are listed
+automatically together with a manually-maintained list in `the source
+code <https://github.com/pytest-dev/pytest/blob/main/scripts/update-plugin-list.py>`_.
 Packages classified as inactive are excluded.
 
-For detailed insights into how this list is generated,
-please refer to `the update script <https://github.com/pytest-dev/pytest/blob/main/scripts/update-plugin-list.py>`_.
-
-.. warning::
-
-   Please be aware that this list is not a curated collection of projects
-   and does not undergo a systematic review process.
-   It serves purely as an informational resource to aid in the discovery of ``pytest`` plugins.
-
-   Do not presume any endorsement from the ``pytest`` project or its developers,
-   and always conduct your own quality assessment before incorporating any of these plugins into your own projects.
-
-
 .. The following conditional uses a different format for this list when
    creating a PDF, because otherwise the table gets far too wide for the
    page.
@@ -56,8 +37,6 @@ DEVELOPMENT_STATUS_CLASSIFIERS = (
 )
 ADDITIONAL_PROJECTS = {  # set of additional projects to consider as plugins
     "logassert",
-    "nuts",
-    "flask_fixture",
 }
 
 
@@ -74,47 +53,19 @@ def escape_rst(text: str) -> str:
     return text
 
 
-def project_response_with_refresh(
-    session: CachedSession, name: str, last_serial: int
-) -> OriginalResponse | CachedResponse:
-    """Get a http cached pypi project
-
-    force refresh in case of last serial mismatch
-    """
-
-    response = session.get(f"https://pypi.org/pypi/{name}/json")
-    if int(response.headers.get("X-PyPI-Last-Serial", -1)) != last_serial:
-        response = session.get(f"https://pypi.org/pypi/{name}/json", refresh=True)
-    return response
-
-
-def get_session() -> CachedSession:
-    """Configures the requests-cache session"""
-    cache_path = platformdirs.user_cache_path("pytest-plugin-list")
-    cache_path.mkdir(exist_ok=True, parents=True)
-    cache_file = cache_path.joinpath("http_cache.sqlite3")
-    return CachedSession(backend=SQLiteCache(cache_file))
-
-
-def pytest_plugin_projects_from_pypi(session: CachedSession) -> dict[str, int]:
-    response = session.get(
-        "https://pypi.org/simple",
-        headers={"Accept": "application/vnd.pypi.simple.v1+json"},
-        refresh=True,
-    )
-    return {
-        name: p["_last-serial"]
-        for p in response.json()["projects"]
-        if (name := p["name"]).startswith("pytest-") or name in ADDITIONAL_PROJECTS
-    }
-
-
 def iter_plugins():
-    session = get_session()
-    name_2_serial = pytest_plugin_projects_from_pypi(session)
+    regex = r">([\d\w-]*)</a>"
+    response = requests.get("https://pypi.org/simple")
 
-    for name, last_serial in tqdm(name_2_serial.items(), smoothing=0):
-        response = project_response_with_refresh(session, name, last_serial)
+    match_names = (match.groups()[0] for match in re.finditer(regex, response.text))
+    plugin_names = [
+        name
+        for name in match_names
+        if name.startswith("pytest-") or name in ADDITIONAL_PROJECTS
+    ]
+
+    for name in tqdm(plugin_names, smoothing=0):
+        response = requests.get(f"https://pypi.org/pypi/{name}/json")
         if response.status_code == 404:
             # Some packages, like pytest-azurepipelines42, are included in https://pypi.org/simple
             # but return 404 on the JSON API. Skip.
@@ -185,7 +136,7 @@ def plugin_definitions(plugins):
 
 
 def main():
-    plugins = [*iter_plugins()]
+    plugins = list(iter_plugins())
 
     reference_dir = pathlib.Path("doc", "en", "reference")
 

setup.cfg

@@ -17,6 +17,7 @@ classifiers =
     Operating System :: POSIX
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
@@ -46,11 +47,12 @@ py_modules = py
 install_requires =
     iniconfig
     packaging
-    pluggy>=1.3.0,<2.0
+    pluggy>=0.12,<2.0
     colorama;sys_platform=="win32"
     exceptiongroup>=1.0.0rc8;python_version<"3.11"
+    importlib-metadata>=0.12;python_version<"3.8"
     tomli>=1.0.0;python_version<"3.11"
-python_requires = >=3.8
+python_requires = >=3.7
 package_dir =
     =src
 setup_requires =

setup.py

@@ -0,0 +1,4 @@
+from setuptools import setup
+
+if __name__ == "__main__":
+    setup()

src/_pytest/_code/code.py

@@ -17,21 +17,18 @@ from typing import Any
 from typing import Callable
 from typing import ClassVar
 from typing import Dict
-from typing import Final
-from typing import final
 from typing import Generic
 from typing import Iterable
 from typing import List
-from typing import Literal
 from typing import Mapping
 from typing import Optional
 from typing import overload
 from typing import Pattern
 from typing import Sequence
 from typing import Set
-from typing import SupportsIndex
 from typing import Tuple
 from typing import Type
+from typing import TYPE_CHECKING
 from typing import TypeVar
 from typing import Union
 
@@ -45,16 +42,22 @@ from _pytest._code.source import Source
 from _pytest._io import TerminalWriter
 from _pytest._io.saferepr import safeformat
 from _pytest._io.saferepr import saferepr
+from _pytest.compat import final
 from _pytest.compat import get_real_func
 from _pytest.deprecated import check_ispytest
 from _pytest.pathlib import absolutepath
 from _pytest.pathlib import bestrelpath
 
+if TYPE_CHECKING:
+    from typing_extensions import Final
+    from typing_extensions import Literal
+    from typing_extensions import SupportsIndex
+
+    _TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
+
 if sys.version_info[:2] < (3, 11):
     from exceptiongroup import BaseExceptionGroup
 
-_TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
-
 
 class Code:
     """Wrapper around Python code objects."""
@@ -393,11 +396,11 @@ class Traceback(List[TracebackEntry]):
 
     def filter(
         self,
-        excinfo_or_fn: Union[
+        # TODO(py38): change to positional only.
+        _excinfo_or_fn: Union[
             "ExceptionInfo[BaseException]",
             Callable[[TracebackEntry], bool],
         ],
-        /,
     ) -> "Traceback":
         """Return a Traceback instance with certain items removed.
 
@@ -408,10 +411,10 @@ class Traceback(List[TracebackEntry]):
         ``TracebackEntry`` instance, and should return True when the item should
         be added to the ``Traceback``, False when not.
         """
-        if isinstance(excinfo_or_fn, ExceptionInfo):
-            fn = lambda x: not x.ishidden(excinfo_or_fn)  # noqa: E731
+        if isinstance(_excinfo_or_fn, ExceptionInfo):
+            fn = lambda x: not x.ishidden(_excinfo_or_fn)  # noqa: E731
         else:
-            fn = excinfo_or_fn
+            fn = _excinfo_or_fn
         return Traceback(filter(fn, self))
 
     def recursionindex(self) -> Optional[int]:
@@ -630,7 +633,7 @@ class ExceptionInfo(Generic[E]):
     def getrepr(
         self,
         showlocals: bool = False,
-        style: _TracebackStyle = "long",
+        style: "_TracebackStyle" = "long",
         abspath: bool = False,
         tbfilter: Union[
             bool, Callable[["ExceptionInfo[BaseException]"], Traceback]
@@ -697,14 +700,6 @@ class ExceptionInfo(Generic[E]):
         )
         return fmt.repr_excinfo(self)
 
-    def _stringify_exception(self, exc: BaseException) -> str:
-        return "\n".join(
-            [
-                str(exc),
-                *getattr(exc, "__notes__", []),
-            ]
-        )
-
     def match(self, regexp: Union[str, Pattern[str]]) -> "Literal[True]":
         """Check whether the regular expression `regexp` matches the string
         representation of the exception using :func:`python:re.search`.
@@ -712,7 +707,7 @@ class ExceptionInfo(Generic[E]):
         If it matches `True` is returned, otherwise an `AssertionError` is raised.
         """
         __tracebackhide__ = True
-        value = self._stringify_exception(self.value)
+        value = str(self.value)
         msg = f"Regex pattern did not match.\n Regex: {regexp!r}\n Input: {value!r}"
         if regexp == value:
             msg += "\n Did you mean to `re.escape()` the regex?"
@@ -720,69 +715,6 @@ class ExceptionInfo(Generic[E]):
         # Return True to allow for "assert excinfo.match()".
         return True
 
-    def _group_contains(
-        self,
-        exc_group: BaseExceptionGroup[BaseException],
-        expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]],
-        match: Union[str, Pattern[str], None],
-        target_depth: Optional[int] = None,
-        current_depth: int = 1,
-    ) -> bool:
-        """Return `True` if a `BaseExceptionGroup` contains a matching exception."""
-        if (target_depth is not None) and (current_depth > target_depth):
-            # already descended past the target depth
-            return False
-        for exc in exc_group.exceptions:
-            if isinstance(exc, BaseExceptionGroup):
-                if self._group_contains(
-                    exc, expected_exception, match, target_depth, current_depth + 1
-                ):
-                    return True
-            if (target_depth is not None) and (current_depth != target_depth):
-                # not at the target depth, no match
-                continue
-            if not isinstance(exc, expected_exception):
-                continue
-            if match is not None:
-                value = self._stringify_exception(exc)
-                if not re.search(match, value):
-                    continue
-            return True
-        return False
-
-    def group_contains(
-        self,
-        expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]],
-        *,
-        match: Union[str, Pattern[str], None] = None,
-        depth: Optional[int] = None,
-    ) -> bool:
-        """Check whether a captured exception group contains a matching exception.
-
-        :param Type[BaseException] | Tuple[Type[BaseException]] expected_exception:
-            The expected exception type, or a tuple if one of multiple possible
-            exception types are expected.
-
-        :param str | Pattern[str] | None match:
-            If specified, a string containing a regular expression,
-            or a regular expression object, that is tested against the string
-            representation of the exception and its `PEP-678 <https://peps.python.org/pep-0678/>` `__notes__`
-            using :func:`re.search`.
-
-            To match a literal string that may contain :ref:`special characters
-            <re-syntax>`, the pattern can first be escaped with :func:`re.escape`.
-
-        :param Optional[int] depth:
-            If `None`, will search for a matching exception at any nesting depth.
-            If >= 1, will only match an exception if it's at the specified depth (depth = 1 being
-            the exceptions contained within the topmost exception group).
-        """
-        msg = "Captured exception is not an instance of `BaseExceptionGroup`"
-        assert isinstance(self.value, BaseExceptionGroup), msg
-        msg = "`depth` must be >= 1 if specified"
-        assert (depth is None) or (depth >= 1), msg
-        return self._group_contains(self.value, expected_exception, match, depth)
-
 
 @dataclasses.dataclass
 class FormattedExcinfo:
@@ -793,7 +725,7 @@ class FormattedExcinfo:
     fail_marker: ClassVar = "E"
 
     showlocals: bool = False
-    style: _TracebackStyle = "long"
+    style: "_TracebackStyle" = "long"
     abspath: bool = True
     tbfilter: Union[bool, Callable[[ExceptionInfo[BaseException]], Traceback]] = True
     funcargs: bool = False
@@ -1158,7 +1090,7 @@ class ReprExceptionInfo(ExceptionRepr):
 class ReprTraceback(TerminalRepr):
     reprentries: Sequence[Union["ReprEntry", "ReprEntryNative"]]
     extraline: Optional[str]
-    style: _TracebackStyle
+    style: "_TracebackStyle"
 
     entrysep: ClassVar = "_ "
 
@@ -1192,7 +1124,7 @@ class ReprTracebackNative(ReprTraceback):
 class ReprEntryNative(TerminalRepr):
     lines: Sequence[str]
 
-    style: ClassVar[_TracebackStyle] = "native"
+    style: ClassVar["_TracebackStyle"] = "native"
 
     def toterminal(self, tw: TerminalWriter) -> None:
         tw.write("".join(self.lines))
@@ -1204,7 +1136,7 @@ class ReprEntry(TerminalRepr):
     reprfuncargs: Optional["ReprFuncArgs"]
     reprlocals: Optional["ReprLocals"]
     reprfileloc: Optional["ReprFileLocation"]
-    style: _TracebackStyle
+    style: "_TracebackStyle"
 
     def _write_entry_lines(self, tw: TerminalWriter) -> None:
         """Write the source code portions of a list of traceback entries with syntax highlighting.

src/_pytest/_code/source.py

@@ -149,7 +149,8 @@ def get_statement_startend2(lineno: int, node: ast.AST) -> Tuple[int, Optional[i
     values: List[int] = []
     for x in ast.walk(node):
         if isinstance(x, (ast.stmt, ast.ExceptHandler)):
-            # The lineno points to the class/def, so need to include the decorators.
+            # Before Python 3.8, the lineno of a decorated class or function pointed at the decorator.
+            # Since Python 3.8, the lineno points to the class/def, so need to include the decorators.
             if isinstance(x, (ast.ClassDef, ast.FunctionDef, ast.AsyncFunctionDef)):
                 for d in x.decorator_list:
                     values.append(d.lineno - 1)

src/_pytest/_io/pprint.py

@@ -1,675 +0,0 @@
-# This module was imported from the cpython standard library
-# (https://github.com/python/cpython/) at commit
-# c5140945c723ae6c4b7ee81ff720ac8ea4b52cfd (python3.12).
-#
-#
-#  Original Author:      Fred L. Drake, Jr.
-#                        fdrake@acm.org
-#
-#  This is a simple little module I wrote to make life easier.  I didn't
-#  see anything quite like it in the library, though I may have overlooked
-#  something.  I wrote this when I was trying to read some heavily nested
-#  tuples with fairly non-descriptive content.  This is modeled very much
-#  after Lisp/Scheme - style pretty-printing of lists.  If you find it
-#  useful, thank small children who sleep at night.
-import collections as _collections
-import dataclasses as _dataclasses
-import re
-import types as _types
-from io import StringIO as _StringIO
-from typing import Any
-from typing import Callable
-from typing import Dict
-from typing import IO
-from typing import Iterator
-from typing import List
-from typing import Optional
-from typing import Set
-from typing import Tuple
-
-
-class _safe_key:
-    """Helper function for key functions when sorting unorderable objects.
-
-    The wrapped-object will fallback to a Py2.x style comparison for
-    unorderable types (sorting first comparing the type name and then by
-    the obj ids).  Does not work recursively, so dict.items() must have
-    _safe_key applied to both the key and the value.
-
-    """
-
-    __slots__ = ["obj"]
-
-    def __init__(self, obj):
-        self.obj = obj
-
-    def __lt__(self, other):
-        try:
-            return self.obj < other.obj
-        except TypeError:
-            return (str(type(self.obj)), id(self.obj)) < (
-                str(type(other.obj)),
-                id(other.obj),
-            )
-
-
-def _safe_tuple(t):
-    """Helper function for comparing 2-tuples"""
-    return _safe_key(t[0]), _safe_key(t[1])
-
-
-class PrettyPrinter:
-    def __init__(
-        self,
-        indent: int = 4,
-        width: int = 80,
-        depth: Optional[int] = None,
-    ) -> None:
-        """Handle pretty printing operations onto a stream using a set of
-        configured parameters.
-
-        indent
-            Number of spaces to indent for each level of nesting.
-
-        width
-            Attempted maximum number of columns in the output.
-
-        depth
-            The maximum depth to print out nested structures.
-
-        """
-        if indent < 0:
-            raise ValueError("indent must be >= 0")
-        if depth is not None and depth <= 0:
-            raise ValueError("depth must be > 0")
-        if not width:
-            raise ValueError("width must be != 0")
-        self._depth = depth
-        self._indent_per_level = indent
-        self._width = width
-
-    def pformat(self, object: Any) -> str:
-        sio = _StringIO()
-        self._format(object, sio, 0, 0, set(), 0)
-        return sio.getvalue()
-
-    def _format(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        objid = id(object)
-        if objid in context:
-            stream.write(_recursion(object))
-            return
-
-        p = self._dispatch.get(type(object).__repr__, None)
-        if p is not None:
-            context.add(objid)
-            p(self, object, stream, indent, allowance, context, level + 1)
-            context.remove(objid)
-        elif (
-            _dataclasses.is_dataclass(object)
-            and not isinstance(object, type)
-            and object.__dataclass_params__.repr
-            and
-            # Check dataclass has generated repr method.
-            hasattr(object.__repr__, "__wrapped__")
-            and "__create_fn__" in object.__repr__.__wrapped__.__qualname__
-        ):
-            context.add(objid)
-            self._pprint_dataclass(
-                object, stream, indent, allowance, context, level + 1
-            )
-            context.remove(objid)
-        else:
-            stream.write(self._repr(object, context, level))
-
-    def _pprint_dataclass(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        cls_name = object.__class__.__name__
-        items = [
-            (f.name, getattr(object, f.name))
-            for f in _dataclasses.fields(object)
-            if f.repr
-        ]
-        stream.write(cls_name + "(")
-        self._format_namespace_items(items, stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch: Dict[
-        Callable[..., str],
-        Callable[["PrettyPrinter", Any, IO[str], int, int, Set[int], int], None],
-    ] = {}
-
-    def _pprint_dict(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        write = stream.write
-        write("{")
-        items = sorted(object.items(), key=_safe_tuple)
-        self._format_dict_items(items, stream, indent, allowance, context, level)
-        write("}")
-
-    _dispatch[dict.__repr__] = _pprint_dict
-
-    def _pprint_ordered_dict(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if not len(object):
-            stream.write(repr(object))
-            return
-        cls = object.__class__
-        stream.write(cls.__name__ + "(")
-        self._pprint_dict(object, stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch[_collections.OrderedDict.__repr__] = _pprint_ordered_dict
-
-    def _pprint_list(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        stream.write("[")
-        self._format_items(object, stream, indent, allowance, context, level)
-        stream.write("]")
-
-    _dispatch[list.__repr__] = _pprint_list
-
-    def _pprint_tuple(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        stream.write("(")
-        self._format_items(object, stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch[tuple.__repr__] = _pprint_tuple
-
-    def _pprint_set(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if not len(object):
-            stream.write(repr(object))
-            return
-        typ = object.__class__
-        if typ is set:
-            stream.write("{")
-            endchar = "}"
-        else:
-            stream.write(typ.__name__ + "({")
-            endchar = "})"
-        object = sorted(object, key=_safe_key)
-        self._format_items(object, stream, indent, allowance, context, level)
-        stream.write(endchar)
-
-    _dispatch[set.__repr__] = _pprint_set
-    _dispatch[frozenset.__repr__] = _pprint_set
-
-    def _pprint_str(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        write = stream.write
-        if not len(object):
-            write(repr(object))
-            return
-        chunks = []
-        lines = object.splitlines(True)
-        if level == 1:
-            indent += 1
-            allowance += 1
-        max_width1 = max_width = self._width - indent
-        for i, line in enumerate(lines):
-            rep = repr(line)
-            if i == len(lines) - 1:
-                max_width1 -= allowance
-            if len(rep) <= max_width1:
-                chunks.append(rep)
-            else:
-                # A list of alternating (non-space, space) strings
-                parts = re.findall(r"\S*\s*", line)
-                assert parts
-                assert not parts[-1]
-                parts.pop()  # drop empty last part
-                max_width2 = max_width
-                current = ""
-                for j, part in enumerate(parts):
-                    candidate = current + part
-                    if j == len(parts) - 1 and i == len(lines) - 1:
-                        max_width2 -= allowance
-                    if len(repr(candidate)) > max_width2:
-                        if current:
-                            chunks.append(repr(current))
-                        current = part
-                    else:
-                        current = candidate
-                if current:
-                    chunks.append(repr(current))
-        if len(chunks) == 1:
-            write(rep)
-            return
-        if level == 1:
-            write("(")
-        for i, rep in enumerate(chunks):
-            if i > 0:
-                write("\n" + " " * indent)
-            write(rep)
-        if level == 1:
-            write(")")
-
-    _dispatch[str.__repr__] = _pprint_str
-
-    def _pprint_bytes(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        write = stream.write
-        if len(object) <= 4:
-            write(repr(object))
-            return
-        parens = level == 1
-        if parens:
-            indent += 1
-            allowance += 1
-            write("(")
-        delim = ""
-        for rep in _wrap_bytes_repr(object, self._width - indent, allowance):
-            write(delim)
-            write(rep)
-            if not delim:
-                delim = "\n" + " " * indent
-        if parens:
-            write(")")
-
-    _dispatch[bytes.__repr__] = _pprint_bytes
-
-    def _pprint_bytearray(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        write = stream.write
-        write("bytearray(")
-        self._pprint_bytes(
-            bytes(object), stream, indent + 10, allowance + 1, context, level + 1
-        )
-        write(")")
-
-    _dispatch[bytearray.__repr__] = _pprint_bytearray
-
-    def _pprint_mappingproxy(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        stream.write("mappingproxy(")
-        self._format(object.copy(), stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch[_types.MappingProxyType.__repr__] = _pprint_mappingproxy
-
-    def _pprint_simplenamespace(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if type(object) is _types.SimpleNamespace:
-            # The SimpleNamespace repr is "namespace" instead of the class
-            # name, so we do the same here. For subclasses; use the class name.
-            cls_name = "namespace"
-        else:
-            cls_name = object.__class__.__name__
-        items = object.__dict__.items()
-        stream.write(cls_name + "(")
-        self._format_namespace_items(items, stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch[_types.SimpleNamespace.__repr__] = _pprint_simplenamespace
-
-    def _format_dict_items(
-        self,
-        items: List[Tuple[Any, Any]],
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if not items:
-            return
-
-        write = stream.write
-        item_indent = indent + self._indent_per_level
-        delimnl = "\n" + " " * item_indent
-        for key, ent in items:
-            write(delimnl)
-            write(self._repr(key, context, level))
-            write(": ")
-            self._format(ent, stream, item_indent, 1, context, level)
-            write(",")
-
-        write("\n" + " " * indent)
-
-    def _format_namespace_items(
-        self,
-        items: List[Tuple[Any, Any]],
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if not items:
-            return
-
-        write = stream.write
-        item_indent = indent + self._indent_per_level
-        delimnl = "\n" + " " * item_indent
-        for key, ent in items:
-            write(delimnl)
-            write(key)
-            write("=")
-            if id(ent) in context:
-                # Special-case representation of recursion to match standard
-                # recursive dataclass repr.
-                write("...")
-            else:
-                self._format(
-                    ent,
-                    stream,
-                    item_indent + len(key) + 1,
-                    1,
-                    context,
-                    level,
-                )
-
-            write(",")
-
-        write("\n" + " " * indent)
-
-    def _format_items(
-        self,
-        items: List[Any],
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if not items:
-            return
-
-        write = stream.write
-        item_indent = indent + self._indent_per_level
-        delimnl = "\n" + " " * item_indent
-
-        for item in items:
-            write(delimnl)
-            self._format(item, stream, item_indent, 1, context, level)
-            write(",")
-
-        write("\n" + " " * indent)
-
-    def _repr(self, object: Any, context: Set[int], level: int) -> str:
-        return self._safe_repr(object, context.copy(), self._depth, level)
-
-    def _pprint_default_dict(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        rdf = self._repr(object.default_factory, context, level)
-        stream.write(f"{object.__class__.__name__}({rdf}, ")
-        self._pprint_dict(object, stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch[_collections.defaultdict.__repr__] = _pprint_default_dict
-
-    def _pprint_counter(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        stream.write(object.__class__.__name__ + "(")
-
-        if object:
-            stream.write("{")
-            items = object.most_common()
-            self._format_dict_items(items, stream, indent, allowance, context, level)
-            stream.write("}")
-
-        stream.write(")")
-
-    _dispatch[_collections.Counter.__repr__] = _pprint_counter
-
-    def _pprint_chain_map(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        if not len(object.maps) or (len(object.maps) == 1 and not len(object.maps[0])):
-            stream.write(repr(object))
-            return
-
-        stream.write(object.__class__.__name__ + "(")
-        self._format_items(object.maps, stream, indent, allowance, context, level)
-        stream.write(")")
-
-    _dispatch[_collections.ChainMap.__repr__] = _pprint_chain_map
-
-    def _pprint_deque(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        stream.write(object.__class__.__name__ + "(")
-        if object.maxlen is not None:
-            stream.write("maxlen=%d, " % object.maxlen)
-        stream.write("[")
-
-        self._format_items(object, stream, indent, allowance + 1, context, level)
-        stream.write("])")
-
-    _dispatch[_collections.deque.__repr__] = _pprint_deque
-
-    def _pprint_user_dict(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        self._format(object.data, stream, indent, allowance, context, level - 1)
-
-    _dispatch[_collections.UserDict.__repr__] = _pprint_user_dict
-
-    def _pprint_user_list(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        self._format(object.data, stream, indent, allowance, context, level - 1)
-
-    _dispatch[_collections.UserList.__repr__] = _pprint_user_list
-
-    def _pprint_user_string(
-        self,
-        object: Any,
-        stream: IO[str],
-        indent: int,
-        allowance: int,
-        context: Set[int],
-        level: int,
-    ) -> None:
-        self._format(object.data, stream, indent, allowance, context, level - 1)
-
-    _dispatch[_collections.UserString.__repr__] = _pprint_user_string
-
-    def _safe_repr(
-        self, object: Any, context: Set[int], maxlevels: Optional[int], level: int
-    ) -> str:
-        typ = type(object)
-        if typ in _builtin_scalars:
-            return repr(object)
-
-        r = getattr(typ, "__repr__", None)
-
-        if issubclass(typ, dict) and r is dict.__repr__:
-            if not object:
-                return "{}"
-            objid = id(object)
-            if maxlevels and level >= maxlevels:
-                return "{...}"
-            if objid in context:
-                return _recursion(object)
-            context.add(objid)
-            components: List[str] = []
-            append = components.append
-            level += 1
-            for k, v in sorted(object.items(), key=_safe_tuple):
-                krepr = self._safe_repr(k, context, maxlevels, level)
-                vrepr = self._safe_repr(v, context, maxlevels, level)
-                append(f"{krepr}: {vrepr}")
-            context.remove(objid)
-            return "{%s}" % ", ".join(components)
-
-        if (issubclass(typ, list) and r is list.__repr__) or (
-            issubclass(typ, tuple) and r is tuple.__repr__
-        ):
-            if issubclass(typ, list):
-                if not object:
-                    return "[]"
-                format = "[%s]"
-            elif len(object) == 1:
-                format = "(%s,)"
-            else:
-                if not object:
-                    return "()"
-                format = "(%s)"
-            objid = id(object)
-            if maxlevels and level >= maxlevels:
-                return format % "..."
-            if objid in context:
-                return _recursion(object)
-            context.add(objid)
-            components = []
-            append = components.append
-            level += 1
-            for o in object:
-                orepr = self._safe_repr(o, context, maxlevels, level)
-                append(orepr)
-            context.remove(objid)
-            return format % ", ".join(components)
-
-        return repr(object)
-
-
-_builtin_scalars = frozenset(
-    {str, bytes, bytearray, float, complex, bool, type(None), int}
-)
-
-
-def _recursion(object: Any) -> str:
-    return f"<Recursion on {type(object).__name__} with id={id(object)}>"
-
-
-def _wrap_bytes_repr(object: Any, width: int, allowance: int) -> Iterator[str]:
-    current = b""
-    last = len(object) // 4 * 4
-    for i in range(0, len(object), 4):
-        part = object[i : i + 4]
-        candidate = current + part
-        if i == last:
-            width -= allowance
-        if len(repr(candidate)) > width:
-            if current:
-                yield repr(current)
-            current = part
-        else:
-            current = candidate
-    if current:
-        yield repr(current)

src/_pytest/_io/saferepr.py

@@ -1,5 +1,8 @@
 import pprint
 import reprlib
+from typing import Any
+from typing import Dict
+from typing import IO
 from typing import Optional
 
 
@@ -129,3 +132,49 @@ def saferepr_unlimited(obj: object, use_ascii: bool = True) -> str:
         return repr(obj)
     except Exception as exc:
         return _format_repr_exception(exc, obj)
+
+
+class AlwaysDispatchingPrettyPrinter(pprint.PrettyPrinter):
+    """PrettyPrinter that always dispatches (regardless of width)."""
+
+    def _format(
+        self,
+        object: object,
+        stream: IO[str],
+        indent: int,
+        allowance: int,
+        context: Dict[int, Any],
+        level: int,
+    ) -> None:
+        # Type ignored because _dispatch is private.
+        p = self._dispatch.get(type(object).__repr__, None)  # type: ignore[attr-defined]
+
+        objid = id(object)
+        if objid in context or p is None:
+            # Type ignored because _format is private.
+            super()._format(  # type: ignore[misc]
+                object,
+                stream,
+                indent,
+                allowance,
+                context,
+                level,
+            )
+            return
+
+        context[objid] = 1
+        p(self, object, stream, indent, allowance, context, level + 1)
+        del context[objid]
+
+
+def _pformat_dispatch(
+    object: object,
+    indent: int = 1,
+    width: int = 80,
+    depth: Optional[int] = None,
+    *,
+    compact: bool = False,
+) -> str:
+    return AlwaysDispatchingPrettyPrinter(
+        indent=indent, width=width, depth=depth, compact=compact
+    ).pformat(object)

src/_pytest/_io/terminalwriter.py

@@ -2,13 +2,12 @@
 import os
 import shutil
 import sys
-from typing import final
-from typing import Literal
 from typing import Optional
 from typing import Sequence
 from typing import TextIO
 
 from .wcwidth import wcswidth
+from _pytest.compat import final
 
 
 # This code was initially copied from py 1.8.1, file _io/terminalwriter.py.
@@ -29,9 +28,9 @@ def should_do_markup(file: TextIO) -> bool:
         return True
     if os.environ.get("PY_COLORS") == "0":
         return False
-    if os.environ.get("NO_COLOR"):
+    if "NO_COLOR" in os.environ:
         return False
-    if os.environ.get("FORCE_COLOR"):
+    if "FORCE_COLOR" in os.environ:
         return True
     return (
         hasattr(file, "isatty") and file.isatty() and os.environ.get("TERM") != "dumb"
@@ -194,21 +193,15 @@ class TerminalWriter:
         for indent, new_line in zip(indents, new_lines):
             self.line(indent + new_line)
 
-    def _highlight(
-        self, source: str, lexer: Literal["diff", "python"] = "python"
-    ) -> str:
-        """Highlight the given source if we have markup support."""
+    def _highlight(self, source: str) -> str:
+        """Highlight the given source code if we have markup support."""
         from _pytest.config.exceptions import UsageError
 
         if not self.hasmarkup or not self.code_highlight:
             return source
         try:
             from pygments.formatters.terminal import TerminalFormatter
-
-            if lexer == "python":
-                from pygments.lexers.python import PythonLexer as Lexer
-            elif lexer == "diff":
-                from pygments.lexers.diff import DiffLexer as Lexer
+            from pygments.lexers.python import PythonLexer
             from pygments import highlight
             import pygments.util
         except ImportError:
@@ -217,21 +210,13 @@ class TerminalWriter:
             try:
                 highlighted: str = highlight(
                     source,
-                    Lexer(),
+                    PythonLexer(),
                     TerminalFormatter(
                         bg=os.getenv("PYTEST_THEME_MODE", "dark"),
                         style=os.getenv("PYTEST_THEME"),
                     ),
                 )
-                # pygments terminal formatter may add a newline when there wasn't one.
-                # We don't want this, remove.
-                if highlighted[-1] == "\n" and source[-1] != "\n":
-                    highlighted = highlighted[:-1]
-
-                # Some lexers will not set the initial color explicitly
-                # which may lead to the previous color being propagated to the
-                # start of the expression, so reset first.
-                return "\x1b[0m" + highlighted
+                return highlighted
             except pygments.util.ClassNotFound:
                 raise UsageError(
                     "PYTEST_THEME environment variable had an invalid value: '{}'. "

src/_pytest/_py/path.py

@@ -25,12 +25,14 @@ from stat import S_ISREG
 from typing import Any
 from typing import Callable
 from typing import cast
-from typing import Literal
 from typing import overload
 from typing import TYPE_CHECKING
 
 from . import error
 
+if TYPE_CHECKING:
+    from typing import Literal
+
 # Moved from local.py.
 iswin32 = sys.platform == "win32" or (getattr(os, "_name", False) == "nt")
 
@@ -755,13 +757,7 @@ class LocalPath:
         if ensure:
             self.dirpath().ensure(dir=1)
         if encoding:
-            # Using type ignore here because of this error:
-            # error: Argument 1 has incompatible type overloaded function;
-            #   expected "Callable[[str, Any, Any], TextIOWrapper]"  [arg-type]
-            # Which seems incorrect, given io.open supports the given argument types.
-            return error.checked_call(
-                io.open, self.strpath, mode, encoding=encoding  # type:ignore[arg-type]
-            )
+            return error.checked_call(io.open, self.strpath, mode, encoding=encoding)
         return error.checked_call(open, self.strpath, mode)
 
     def _fastjoin(self, name):
@@ -1267,19 +1263,13 @@ class LocalPath:
     @classmethod
     def mkdtemp(cls, rootdir=None):
         """Return a Path object pointing to a fresh new temporary directory
-        (which we created ourselves).
+        (which we created ourself).
         """
         import tempfile
 
         if rootdir is None:
             rootdir = cls.get_temproot()
-        # Using type ignore here because of this error:
-        # error: Argument 1 has incompatible type overloaded function; expected "Callable[[str], str]"  [arg-type]
-        # Which seems incorrect, given tempfile.mkdtemp supports the given argument types.
-        path = error.checked_call(
-            tempfile.mkdtemp, dir=str(rootdir)  # type:ignore[arg-type]
-        )
-        return cls(path)
+        return cls(error.checked_call(tempfile.mkdtemp, dir=str(rootdir)))
 
     @classmethod
     def make_numbered_dir(

src/_pytest/assertion/__init__.py

@@ -42,14 +42,6 @@ def pytest_addoption(parser: Parser) -> None:
         help="Enables the pytest_assertion_pass hook. "
         "Make sure to delete any previously generated pyc cache files.",
     )
-    Config._add_verbosity_ini(
-        parser,
-        Config.VERBOSITY_ASSERTIONS,
-        help=(
-            "Specify a verbosity level for assertions, overriding the main level. "
-            "Higher levels will provide more detailed explanation when an assertion fails."
-        ),
-    )
 
 
 def register_assert_rewrite(*names: str) -> None:
@@ -120,8 +112,8 @@ def pytest_collection(session: "Session") -> None:
             assertstate.hook.set_session(session)
 
 
-@hookimpl(wrapper=True, tryfirst=True)
-def pytest_runtest_protocol(item: Item) -> Generator[None, object, object]:
+@hookimpl(tryfirst=True, hookwrapper=True)
+def pytest_runtest_protocol(item: Item) -> Generator[None, None, None]:
     """Setup the pytest_assertrepr_compare and pytest_assertion_pass hooks.
 
     The rewrite module will use util._reprcompare if it exists to use custom
@@ -170,11 +162,10 @@ def pytest_runtest_protocol(item: Item) -> Generator[None, object, object]:
 
         util._assertion_pass = call_assertion_pass_hook
 
-    try:
-        return (yield)
-    finally:
-        util._reprcompare, util._assertion_pass = saved_assert_hooks
-        util._config = None
+    yield
+
+    util._reprcompare, util._assertion_pass = saved_assert_hooks
+    util._config = None
 
 
 def pytest_sessionfinish(session: "Session") -> None:

src/_pytest/assertion/rewrite.py

@@ -13,7 +13,6 @@ import struct
 import sys
 import tokenize
 import types
-from collections import defaultdict
 from pathlib import Path
 from pathlib import PurePath
 from typing import Callable
@@ -45,9 +44,16 @@ from _pytest.stash import StashKey
 if TYPE_CHECKING:
     from _pytest.assertion import AssertionState
 
-
-class Sentinel:
-    pass
+if sys.version_info >= (3, 8):
+    namedExpr = ast.NamedExpr
+    astNameConstant = ast.Constant
+    astStr = ast.Constant
+    astNum = ast.Constant
+else:
+    namedExpr = ast.Expr
+    astNameConstant = ast.NameConstant
+    astStr = ast.Str
+    astNum = ast.Num
 
 
 assertstate_key = StashKey["AssertionState"]()
@@ -57,9 +63,6 @@ PYTEST_TAG = f"{sys.implementation.cache_tag}-pytest-{version}"
 PYC_EXT = ".py" + (__debug__ and "c" or "o")
 PYC_TAIL = "." + PYTEST_TAG + PYC_EXT
 
-# Special marker that denotes we have just left a scope definition
-_SCOPE_END_MARKER = Sentinel()
-
 
 class AssertionRewritingHook(importlib.abc.MetaPathFinder, importlib.abc.Loader):
     """PEP302/PEP451 import hook which rewrites asserts."""
@@ -426,10 +429,7 @@ def _saferepr(obj: object) -> str:
 
 def _get_maxsize_for_saferepr(config: Optional[Config]) -> Optional[int]:
     """Get `maxsize` configuration for saferepr based on the given config object."""
-    if config is None:
-        verbosity = 0
-    else:
-        verbosity = config.get_verbosity(Config.VERBOSITY_ASSERTIONS)
+    verbosity = config.getoption("verbose") if config is not None else 0
     if verbosity >= 2:
         return None
     if verbosity >= 1:
@@ -645,8 +645,6 @@ class AssertionRewriter(ast.NodeVisitor):
        .push_format_context() and .pop_format_context() which allows
        to build another %-formatted string while already building one.
 
-    :scope: A tuple containing the current scope used for variables_overwrite.
-
     :variables_overwrite: A dict filled with references to variables
        that change value within an assert. This happens when a variable is
        reassigned with the walrus operator
@@ -668,10 +666,7 @@ class AssertionRewriter(ast.NodeVisitor):
         else:
             self.enable_assertion_pass_hook = False
         self.source = source
-        self.scope: tuple[ast.AST, ...] = ()
-        self.variables_overwrite: defaultdict[
-            tuple[ast.AST, ...], Dict[str, str]
-        ] = defaultdict(dict)
+        self.variables_overwrite: Dict[str, str] = {}
 
     def run(self, mod: ast.Module) -> None:
         """Find all assert statements in *mod* and rewrite them."""
@@ -691,10 +686,12 @@ class AssertionRewriter(ast.NodeVisitor):
             if (
                 expect_docstring
                 and isinstance(item, ast.Expr)
-                and isinstance(item.value, ast.Constant)
-                and isinstance(item.value.value, str)
+                and isinstance(item.value, astStr)
             ):
-                doc = item.value.value
+                if sys.version_info >= (3, 8):
+                    doc = item.value.value
+                else:
+                    doc = item.value.s
                 if self.is_rewrite_disabled(doc):
                     return
                 expect_docstring = False
@@ -735,17 +732,9 @@ class AssertionRewriter(ast.NodeVisitor):
         mod.body[pos:pos] = imports
 
         # Collect asserts.
-        self.scope = (mod,)
-        nodes: List[Union[ast.AST, Sentinel]] = [mod]
+        nodes: List[ast.AST] = [mod]
         while nodes:
             node = nodes.pop()
-            if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef)):
-                self.scope = tuple((*self.scope, node))
-                nodes.append(_SCOPE_END_MARKER)
-            if node == _SCOPE_END_MARKER:
-                self.scope = self.scope[:-1]
-                continue
-            assert isinstance(node, ast.AST)
             for name, field in ast.iter_fields(node):
                 if isinstance(field, list):
                     new: List[ast.AST] = []
@@ -834,7 +823,7 @@ class AssertionRewriter(ast.NodeVisitor):
         current = self.stack.pop()
         if self.stack:
             self.explanation_specifiers = self.stack[-1]
-        keys = [ast.Constant(key) for key in current.keys()]
+        keys = [astStr(key) for key in current.keys()]
         format_dict = ast.Dict(keys, list(current.values()))
         form = ast.BinOp(expl_expr, ast.Mod(), format_dict)
         name = "@py_format" + str(next(self.variable_counter))
@@ -888,16 +877,16 @@ class AssertionRewriter(ast.NodeVisitor):
         negation = ast.UnaryOp(ast.Not(), top_condition)
 
         if self.enable_assertion_pass_hook:  # Experimental pytest_assertion_pass hook
-            msg = self.pop_format_context(ast.Constant(explanation))
+            msg = self.pop_format_context(astStr(explanation))
 
             # Failed
             if assert_.msg:
                 assertmsg = self.helper("_format_assertmsg", assert_.msg)
                 gluestr = "\n>assert "
             else:
-                assertmsg = ast.Constant("")
+                assertmsg = astStr("")
                 gluestr = "assert "
-            err_explanation = ast.BinOp(ast.Constant(gluestr), ast.Add(), msg)
+            err_explanation = ast.BinOp(astStr(gluestr), ast.Add(), msg)
             err_msg = ast.BinOp(assertmsg, ast.Add(), err_explanation)
             err_name = ast.Name("AssertionError", ast.Load())
             fmt = self.helper("_format_explanation", err_msg)
@@ -913,8 +902,8 @@ class AssertionRewriter(ast.NodeVisitor):
             hook_call_pass = ast.Expr(
                 self.helper(
                     "_call_assertion_pass",
-                    ast.Constant(assert_.lineno),
-                    ast.Constant(orig),
+                    astNum(assert_.lineno),
+                    astStr(orig),
                     fmt_pass,
                 )
             )
@@ -933,7 +922,7 @@ class AssertionRewriter(ast.NodeVisitor):
                 variables = [
                     ast.Name(name, ast.Store()) for name in self.format_variables
                 ]
-                clear_format = ast.Assign(variables, ast.Constant(None))
+                clear_format = ast.Assign(variables, astNameConstant(None))
                 self.statements.append(clear_format)
 
         else:  # Original assertion rewriting
@@ -944,9 +933,9 @@ class AssertionRewriter(ast.NodeVisitor):
                 assertmsg = self.helper("_format_assertmsg", assert_.msg)
                 explanation = "\n>assert " + explanation
             else:
-                assertmsg = ast.Constant("")
+                assertmsg = astStr("")
                 explanation = "assert " + explanation
-            template = ast.BinOp(assertmsg, ast.Add(), ast.Constant(explanation))
+            template = ast.BinOp(assertmsg, ast.Add(), astStr(explanation))
             msg = self.pop_format_context(template)
             fmt = self.helper("_format_explanation", msg)
             err_name = ast.Name("AssertionError", ast.Load())
@@ -958,7 +947,7 @@ class AssertionRewriter(ast.NodeVisitor):
         # Clear temporary variables by setting them to None.
         if self.variables:
             variables = [ast.Name(name, ast.Store()) for name in self.variables]
-            clear = ast.Assign(variables, ast.Constant(None))
+            clear = ast.Assign(variables, astNameConstant(None))
             self.statements.append(clear)
         # Fix locations (line numbers/column offsets).
         for stmt in self.statements:
@@ -966,26 +955,26 @@ class AssertionRewriter(ast.NodeVisitor):
                 ast.copy_location(node, assert_)
         return self.statements
 
-    def visit_NamedExpr(self, name: ast.NamedExpr) -> Tuple[ast.NamedExpr, str]:
+    def visit_NamedExpr(self, name: namedExpr) -> Tuple[namedExpr, str]:
         # This method handles the 'walrus operator' repr of the target
         # name if it's a local variable or _should_repr_global_name()
         # thinks it's acceptable.
         locs = ast.Call(self.builtin("locals"), [], [])
         target_id = name.target.id  # type: ignore[attr-defined]
-        inlocs = ast.Compare(ast.Constant(target_id), [ast.In()], [locs])
+        inlocs = ast.Compare(astStr(target_id), [ast.In()], [locs])
         dorepr = self.helper("_should_repr_global_name", name)
         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
-        expr = ast.IfExp(test, self.display(name), ast.Constant(target_id))
+        expr = ast.IfExp(test, self.display(name), astStr(target_id))
         return name, self.explanation_param(expr)
 
     def visit_Name(self, name: ast.Name) -> Tuple[ast.Name, str]:
         # Display the repr of the name if it's a local variable or
         # _should_repr_global_name() thinks it's acceptable.
         locs = ast.Call(self.builtin("locals"), [], [])
-        inlocs = ast.Compare(ast.Constant(name.id), [ast.In()], [locs])
+        inlocs = ast.Compare(astStr(name.id), [ast.In()], [locs])
         dorepr = self.helper("_should_repr_global_name", name)
         test = ast.BoolOp(ast.Or(), [inlocs, dorepr])
-        expr = ast.IfExp(test, self.display(name), ast.Constant(name.id))
+        expr = ast.IfExp(test, self.display(name), astStr(name.id))
         return name, self.explanation_param(expr)
 
     def visit_BoolOp(self, boolop: ast.BoolOp) -> Tuple[ast.Name, str]:
@@ -1004,10 +993,10 @@ class AssertionRewriter(ast.NodeVisitor):
                 # cond is set in a prior loop iteration below
                 self.expl_stmts.append(ast.If(cond, fail_inner, []))  # noqa
                 self.expl_stmts = fail_inner
-                # Check if the left operand is a ast.NamedExpr and the value has already been visited
+                # Check if the left operand is a namedExpr and the value has already been visited
                 if (
                     isinstance(v, ast.Compare)
-                    and isinstance(v.left, ast.NamedExpr)
+                    and isinstance(v.left, namedExpr)
                     and v.left.target.id
                     in [
                         ast_expr.id
@@ -1016,14 +1005,14 @@ class AssertionRewriter(ast.NodeVisitor):
                     ]
                 ):
                     pytest_temp = self.variable()
-                    self.variables_overwrite[self.scope][
+                    self.variables_overwrite[
                         v.left.target.id
                     ] = v.left  # type:ignore[assignment]
                     v.left.target.id = pytest_temp
             self.push_format_context()
             res, expl = self.visit(v)
             body.append(ast.Assign([ast.Name(res_var, ast.Store())], res))
-            expl_format = self.pop_format_context(ast.Constant(expl))
+            expl_format = self.pop_format_context(astStr(expl))
             call = ast.Call(app, [expl_format], [])
             self.expl_stmts.append(ast.Expr(call))
             if i < levels:
@@ -1035,7 +1024,7 @@ class AssertionRewriter(ast.NodeVisitor):
                 self.statements = body = inner
         self.statements = save
         self.expl_stmts = fail_save
-        expl_template = self.helper("_format_boolop", expl_list, ast.Constant(is_or))
+        expl_template = self.helper("_format_boolop", expl_list, astNum(is_or))
         expl = self.pop_format_context(expl_template)
         return ast.Name(res_var, ast.Load()), self.explanation_param(expl)
 
@@ -1059,20 +1048,17 @@ class AssertionRewriter(ast.NodeVisitor):
         new_args = []
         new_kwargs = []
         for arg in call.args:
-            if isinstance(arg, ast.Name) and arg.id in self.variables_overwrite.get(
-                self.scope, {}
-            ):
-                arg = self.variables_overwrite[self.scope][
-                    arg.id
-                ]  # type:ignore[assignment]
+            if isinstance(arg, ast.Name) and arg.id in self.variables_overwrite:
+                arg = self.variables_overwrite[arg.id]  # type:ignore[assignment]
             res, expl = self.visit(arg)
             arg_expls.append(expl)
             new_args.append(res)
         for keyword in call.keywords:
-            if isinstance(
-                keyword.value, ast.Name
-            ) and keyword.value.id in self.variables_overwrite.get(self.scope, {}):
-                keyword.value = self.variables_overwrite[self.scope][
+            if (
+                isinstance(keyword.value, ast.Name)
+                and keyword.value.id in self.variables_overwrite
+            ):
+                keyword.value = self.variables_overwrite[
                     keyword.value.id
                 ]  # type:ignore[assignment]
             res, expl = self.visit(keyword.value)
@@ -1108,14 +1094,12 @@ class AssertionRewriter(ast.NodeVisitor):
     def visit_Compare(self, comp: ast.Compare) -> Tuple[ast.expr, str]:
         self.push_format_context()
         # We first check if we have overwritten a variable in the previous assert
-        if isinstance(
-            comp.left, ast.Name
-        ) and comp.left.id in self.variables_overwrite.get(self.scope, {}):
-            comp.left = self.variables_overwrite[self.scope][
+        if isinstance(comp.left, ast.Name) and comp.left.id in self.variables_overwrite:
+            comp.left = self.variables_overwrite[
                 comp.left.id
             ]  # type:ignore[assignment]
-        if isinstance(comp.left, ast.NamedExpr):
-            self.variables_overwrite[self.scope][
+        if isinstance(comp.left, namedExpr):
+            self.variables_overwrite[
                 comp.left.target.id
             ] = comp.left  # type:ignore[assignment]
         left_res, left_expl = self.visit(comp.left)
@@ -1130,12 +1114,12 @@ class AssertionRewriter(ast.NodeVisitor):
         results = [left_res]
         for i, op, next_operand in it:
             if (
-                isinstance(next_operand, ast.NamedExpr)
+                isinstance(next_operand, namedExpr)
                 and isinstance(left_res, ast.Name)
                 and next_operand.target.id == left_res.id
             ):
                 next_operand.target.id = self.variable()
-                self.variables_overwrite[self.scope][
+                self.variables_overwrite[
                     left_res.id
                 ] = next_operand  # type:ignore[assignment]
             next_res, next_expl = self.visit(next_operand)
@@ -1143,9 +1127,9 @@ class AssertionRewriter(ast.NodeVisitor):
                 next_expl = f"({next_expl})"
             results.append(next_res)
             sym = BINOP_MAP[op.__class__]
-            syms.append(ast.Constant(sym))
+            syms.append(astStr(sym))
             expl = f"{left_expl} {sym} {next_expl}"
-            expls.append(ast.Constant(expl))
+            expls.append(astStr(expl))
             res_expr = ast.Compare(left_res, [op], [next_res])
             self.statements.append(ast.Assign([store_names[i]], res_expr))
             left_res, left_expl = next_res, next_expl
@@ -1189,7 +1173,7 @@ def try_makedirs(cache_dir: Path) -> bool:
 
 def get_cache_dir(file_path: Path) -> Path:
     """Return the cache directory to write .pyc files for the given .py file path."""
-    if sys.pycache_prefix:
+    if sys.version_info >= (3, 8) and sys.pycache_prefix:
         # given:
         #   prefix = '/tmp/pycs'
         #   path = '/home/user/proj/test_app.py'

src/_pytest/assertion/truncate.py

@@ -1,13 +1,12 @@
 """Utilities for truncating assertion output.
 
 Current default behaviour is to truncate assertion explanations at
-terminal lines, unless running with an assertions verbosity level of at least 2 or running on CI.
+~8 terminal lines, unless running in "-vv" mode or running on CI.
 """
 from typing import List
 from typing import Optional
 
 from _pytest.assertion import util
-from _pytest.config import Config
 from _pytest.nodes import Item
 
 
@@ -27,7 +26,7 @@ def truncate_if_required(
 
 def _should_truncate_item(item: Item) -> bool:
     """Whether or not this test item is eligible for truncation."""
-    verbose = item.config.get_verbosity(Config.VERBOSITY_ASSERTIONS)
+    verbose = item.config.option.verbose
     return verbose < 2 and not util.running_on_ci()
 
 

src/_pytest/assertion/util.py

@@ -7,16 +7,14 @@ from typing import Any
 from typing import Callable
 from typing import Iterable
 from typing import List
-from typing import Literal
 from typing import Mapping
 from typing import Optional
-from typing import Protocol
 from typing import Sequence
 from unicodedata import normalize
 
 import _pytest._code
 from _pytest import outcomes
-from _pytest._io.pprint import PrettyPrinter
+from _pytest._io.saferepr import _pformat_dispatch
 from _pytest._io.saferepr import saferepr
 from _pytest._io.saferepr import saferepr_unlimited
 from _pytest.config import Config
@@ -35,11 +33,6 @@ _assertion_pass: Optional[Callable[[int, str, str], None]] = None
 _config: Optional[Config] = None
 
 
-class _HighlightFunc(Protocol):
-    def __call__(self, source: str, lexer: Literal["diff", "python"] = "python") -> str:
-        """Apply highlighting to the given source."""
-
-
 def format_explanation(explanation: str) -> str:
     r"""Format an explanation.
 
@@ -139,7 +132,7 @@ def isiterable(obj: Any) -> bool:
     try:
         iter(obj)
         return not istext(obj)
-    except Exception:
+    except TypeError:
         return False
 
 
@@ -168,7 +161,7 @@ def assertrepr_compare(
     config, op: str, left: Any, right: Any, use_ascii: bool = False
 ) -> Optional[List[str]]:
     """Return specialised explanations for some operators/operands."""
-    verbose = config.get_verbosity(Config.VERBOSITY_ASSERTIONS)
+    verbose = config.getoption("verbose")
 
     # Strings which normalize equal are often hard to distinguish when printed; use ascii() to make this easier.
     # See issue #3246.
@@ -192,31 +185,14 @@ def assertrepr_compare(
         right_repr = saferepr(right, maxsize=maxsize, use_ascii=use_ascii)
 
     summary = f"{left_repr} {op} {right_repr}"
-    highlighter = config.get_terminal_writer()._highlight
 
     explanation = None
     try:
         if op == "==":
-            explanation = _compare_eq_any(left, right, highlighter, verbose)
+            explanation = _compare_eq_any(left, right, verbose)
         elif op == "not in":
             if istext(left) and istext(right):
                 explanation = _notin_text(left, right, verbose)
-        elif op == "!=":
-            if isset(left) and isset(right):
-                explanation = ["Both sets are equal"]
-        elif op == ">=":
-            if isset(left) and isset(right):
-                explanation = _compare_gte_set(left, right, highlighter, verbose)
-        elif op == "<=":
-            if isset(left) and isset(right):
-                explanation = _compare_lte_set(left, right, highlighter, verbose)
-        elif op == ">":
-            if isset(left) and isset(right):
-                explanation = _compare_gt_set(left, right, highlighter, verbose)
-        elif op == "<":
-            if isset(left) and isset(right):
-                explanation = _compare_lt_set(left, right, highlighter, verbose)
-
     except outcomes.Exit:
         raise
     except Exception:
@@ -230,14 +206,10 @@ def assertrepr_compare(
     if not explanation:
         return None
 
-    if explanation[0] != "":
-        explanation = [""] + explanation
     return [summary] + explanation
 
 
-def _compare_eq_any(
-    left: Any, right: Any, highlighter: _HighlightFunc, verbose: int = 0
-) -> List[str]:
+def _compare_eq_any(left: Any, right: Any, verbose: int = 0) -> List[str]:
     explanation = []
     if istext(left) and istext(right):
         explanation = _diff_text(left, right, verbose)
@@ -250,23 +222,23 @@ def _compare_eq_any(
             other_side = right if isinstance(left, ApproxBase) else left
 
             explanation = approx_side._repr_compare(other_side)
-        elif type(left) is type(right) and (
+        elif type(left) == type(right) and (
             isdatacls(left) or isattrs(left) or isnamedtuple(left)
         ):
             # Note: unlike dataclasses/attrs, namedtuples compare only the
             # field values, not the type or field names. But this branch
             # intentionally only handles the same-type case, which was often
             # used in older code bases before dataclasses/attrs were available.
-            explanation = _compare_eq_cls(left, right, highlighter, verbose)
+            explanation = _compare_eq_cls(left, right, verbose)
         elif issequence(left) and issequence(right):
-            explanation = _compare_eq_sequence(left, right, highlighter, verbose)
+            explanation = _compare_eq_sequence(left, right, verbose)
         elif isset(left) and isset(right):
-            explanation = _compare_eq_set(left, right, highlighter, verbose)
+            explanation = _compare_eq_set(left, right, verbose)
         elif isdict(left) and isdict(right):
-            explanation = _compare_eq_dict(left, right, highlighter, verbose)
+            explanation = _compare_eq_dict(left, right, verbose)
 
         if isiterable(left) and isiterable(right):
-            expl = _compare_eq_iterable(left, right, highlighter, verbose)
+            expl = _compare_eq_iterable(left, right, verbose)
             explanation.extend(expl)
 
     return explanation
@@ -320,40 +292,51 @@ def _diff_text(left: str, right: str, verbose: int = 0) -> List[str]:
     return explanation
 
 
+def _surrounding_parens_on_own_lines(lines: List[str]) -> None:
+    """Move opening/closing parenthesis/bracket to own lines."""
+    opening = lines[0][:1]
+    if opening in ["(", "[", "{"]:
+        lines[0] = " " + lines[0][1:]
+        lines[:] = [opening] + lines
+    closing = lines[-1][-1:]
+    if closing in [")", "]", "}"]:
+        lines[-1] = lines[-1][:-1] + ","
+        lines[:] = lines + [closing]
+
+
 def _compare_eq_iterable(
-    left: Iterable[Any],
-    right: Iterable[Any],
-    highligher: _HighlightFunc,
-    verbose: int = 0,
+    left: Iterable[Any], right: Iterable[Any], verbose: int = 0
 ) -> List[str]:
     if verbose <= 0 and not running_on_ci():
         return ["Use -v to get more diff"]
     # dynamic import to speedup pytest
     import difflib
 
-    left_formatting = PrettyPrinter().pformat(left).splitlines()
-    right_formatting = PrettyPrinter().pformat(right).splitlines()
+    left_formatting = pprint.pformat(left).splitlines()
+    right_formatting = pprint.pformat(right).splitlines()
 
-    explanation = ["", "Full diff:"]
+    # Re-format for different output lengths.
+    lines_left = len(left_formatting)
+    lines_right = len(right_formatting)
+    if lines_left != lines_right:
+        left_formatting = _pformat_dispatch(left).splitlines()
+        right_formatting = _pformat_dispatch(right).splitlines()
+
+    if lines_left > 1 or lines_right > 1:
+        _surrounding_parens_on_own_lines(left_formatting)
+        _surrounding_parens_on_own_lines(right_formatting)
+
+    explanation = ["Full diff:"]
     # "right" is the expected base against which we compare "left",
     # see https://github.com/pytest-dev/pytest/issues/3333
     explanation.extend(
-        highligher(
-            "\n".join(
-                line.rstrip()
-                for line in difflib.ndiff(right_formatting, left_formatting)
-            ),
-            lexer="diff",
-        ).splitlines()
+        line.rstrip() for line in difflib.ndiff(right_formatting, left_formatting)
     )
     return explanation
 
 
 def _compare_eq_sequence(
-    left: Sequence[Any],
-    right: Sequence[Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
+    left: Sequence[Any], right: Sequence[Any], verbose: int = 0
 ) -> List[str]:
     comparing_bytes = isinstance(left, bytes) and isinstance(right, bytes)
     explanation: List[str] = []
@@ -376,10 +359,7 @@ def _compare_eq_sequence(
                 left_value = left[i]
                 right_value = right[i]
 
-            explanation.append(
-                f"At index {i} diff:"
-                f" {highlighter(repr(left_value))} != {highlighter(repr(right_value))}"
-            )
+            explanation += [f"At index {i} diff: {left_value!r} != {right_value!r}"]
             break
 
     if comparing_bytes:
@@ -399,91 +379,34 @@ def _compare_eq_sequence(
             extra = saferepr(right[len_left])
 
         if len_diff == 1:
-            explanation += [
-                f"{dir_with_more} contains one more item: {highlighter(extra)}"
-            ]
+            explanation += [f"{dir_with_more} contains one more item: {extra}"]
         else:
             explanation += [
                 "%s contains %d more items, first extra item: %s"
-                % (dir_with_more, len_diff, highlighter(extra))
+                % (dir_with_more, len_diff, extra)
             ]
     return explanation
 
 
 def _compare_eq_set(
-    left: AbstractSet[Any],
-    right: AbstractSet[Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
+    left: AbstractSet[Any], right: AbstractSet[Any], verbose: int = 0
 ) -> List[str]:
     explanation = []
-    explanation.extend(_set_one_sided_diff("left", left, right, highlighter))
-    explanation.extend(_set_one_sided_diff("right", right, left, highlighter))
-    return explanation
-
-
-def _compare_gt_set(
-    left: AbstractSet[Any],
-    right: AbstractSet[Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
-) -> List[str]:
-    explanation = _compare_gte_set(left, right, highlighter)
-    if not explanation:
-        return ["Both sets are equal"]
-    return explanation
-
-
-def _compare_lt_set(
-    left: AbstractSet[Any],
-    right: AbstractSet[Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
-) -> List[str]:
-    explanation = _compare_lte_set(left, right, highlighter)
-    if not explanation:
-        return ["Both sets are equal"]
-    return explanation
-
-
-def _compare_gte_set(
-    left: AbstractSet[Any],
-    right: AbstractSet[Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
-) -> List[str]:
-    return _set_one_sided_diff("right", right, left, highlighter)
-
-
-def _compare_lte_set(
-    left: AbstractSet[Any],
-    right: AbstractSet[Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
-) -> List[str]:
-    return _set_one_sided_diff("left", left, right, highlighter)
-
-
-def _set_one_sided_diff(
-    posn: str,
-    set1: AbstractSet[Any],
-    set2: AbstractSet[Any],
-    highlighter: _HighlightFunc,
-) -> List[str]:
-    explanation = []
-    diff = set1 - set2
-    if diff:
-        explanation.append(f"Extra items in the {posn} set:")
-        for item in diff:
-            explanation.append(highlighter(saferepr(item)))
+    diff_left = left - right
+    diff_right = right - left
+    if diff_left:
+        explanation.append("Extra items in the left set:")
+        for item in diff_left:
+            explanation.append(saferepr(item))
+    if diff_right:
+        explanation.append("Extra items in the right set:")
+        for item in diff_right:
+            explanation.append(saferepr(item))
     return explanation
 
 
 def _compare_eq_dict(
-    left: Mapping[Any, Any],
-    right: Mapping[Any, Any],
-    highlighter: _HighlightFunc,
-    verbose: int = 0,
+    left: Mapping[Any, Any], right: Mapping[Any, Any], verbose: int = 0
 ) -> List[str]:
     explanation: List[str] = []
     set_left = set(left)
@@ -494,16 +417,12 @@ def _compare_eq_dict(
         explanation += ["Omitting %s identical items, use -vv to show" % len(same)]
     elif same:
         explanation += ["Common items:"]
-        explanation += highlighter(pprint.pformat(same)).splitlines()
+        explanation += pprint.pformat(same).splitlines()
     diff = {k for k in common if left[k] != right[k]}
     if diff:
         explanation += ["Differing items:"]
         for k in diff:
-            explanation += [
-                highlighter(saferepr({k: left[k]}))
-                + " != "
-                + highlighter(saferepr({k: right[k]}))
-            ]
+            explanation += [saferepr({k: left[k]}) + " != " + saferepr({k: right[k]})]
     extra_left = set_left - set_right
     len_extra_left = len(extra_left)
     if len_extra_left:
@@ -512,7 +431,7 @@ def _compare_eq_dict(
             % (len_extra_left, "" if len_extra_left == 1 else "s")
         )
         explanation.extend(
-            highlighter(pprint.pformat({k: left[k] for k in extra_left})).splitlines()
+            pprint.pformat({k: left[k] for k in extra_left}).splitlines()
         )
     extra_right = set_right - set_left
     len_extra_right = len(extra_right)
@@ -522,14 +441,12 @@ def _compare_eq_dict(
             % (len_extra_right, "" if len_extra_right == 1 else "s")
         )
         explanation.extend(
-            highlighter(pprint.pformat({k: right[k] for k in extra_right})).splitlines()
+            pprint.pformat({k: right[k] for k in extra_right}).splitlines()
         )
     return explanation
 
 
-def _compare_eq_cls(
-    left: Any, right: Any, highlighter: _HighlightFunc, verbose: int
-) -> List[str]:
+def _compare_eq_cls(left: Any, right: Any, verbose: int) -> List[str]:
     if not has_default_eq(left):
         return []
     if isdatacls(left):
@@ -561,23 +478,21 @@ def _compare_eq_cls(
         explanation.append("Omitting %s identical items, use -vv to show" % len(same))
     elif same:
         explanation += ["Matching attributes:"]
-        explanation += highlighter(pprint.pformat(same)).splitlines()
+        explanation += pprint.pformat(same).splitlines()
     if diff:
         explanation += ["Differing attributes:"]
-        explanation += highlighter(pprint.pformat(diff)).splitlines()
+        explanation += pprint.pformat(diff).splitlines()
         for field in diff:
             field_left = getattr(left, field)
             field_right = getattr(right, field)
             explanation += [
                 "",
-                f"Drill down into differing attribute {field}:",
-                f"{indent}{field}: {highlighter(repr(field_left))} != {highlighter(repr(field_right))}",
+                "Drill down into differing attribute %s:" % field,
+                ("%s%s: %r != %r") % (indent, field, field_left, field_right),
             ]
             explanation += [
                 indent + line
-                for line in _compare_eq_any(
-                    field_left, field_right, highlighter, verbose
-                )
+                for line in _compare_eq_any(field_left, field_right, verbose)
             ]
     return explanation
 

src/_pytest/cacheprovider.py

@@ -6,7 +6,6 @@ import json
 import os
 from pathlib import Path
 from typing import Dict
-from typing import final
 from typing import Generator
 from typing import Iterable
 from typing import List
@@ -19,6 +18,7 @@ from .pathlib import rm_rf
 from .reports import CollectReport
 from _pytest import nodes
 from _pytest._io import TerminalWriter
+from _pytest.compat import final
 from _pytest.config import Config
 from _pytest.config import ExitCode
 from _pytest.config import hookimpl
@@ -27,8 +27,8 @@ from _pytest.deprecated import check_ispytest
 from _pytest.fixtures import fixture
 from _pytest.fixtures import FixtureRequest
 from _pytest.main import Session
-from _pytest.nodes import Directory
 from _pytest.nodes import File
+from _pytest.python import Package
 from _pytest.reports import TestReport
 
 README_CONTENT = """\
@@ -217,34 +217,42 @@ class LFPluginCollWrapper:
         self.lfplugin = lfplugin
         self._collected_at_least_one_failure = False
 
-    @hookimpl(wrapper=True)
-    def pytest_make_collect_report(
-        self, collector: nodes.Collector
-    ) -> Generator[None, CollectReport, CollectReport]:
-        res = yield
-        if isinstance(collector, (Session, Directory)):
+    @hookimpl(hookwrapper=True)
+    def pytest_make_collect_report(self, collector: nodes.Collector):
+        if isinstance(collector, (Session, Package)):
+            out = yield
+            res: CollectReport = out.get_result()
+
             # Sort any lf-paths to the beginning.
             lf_paths = self.lfplugin._last_failed_paths
 
             # Use stable sort to priorize last failed.
             def sort_key(node: Union[nodes.Item, nodes.Collector]) -> bool:
-                return node.path in lf_paths
+                # Package.path is the __init__.py file, we need the directory.
+                if isinstance(node, Package):
+                    path = node.path.parent
+                else:
+                    path = node.path
+                return path in lf_paths
 
             res.result = sorted(
                 res.result,
                 key=sort_key,
                 reverse=True,
             )
+            return
 
         elif isinstance(collector, File):
             if collector.path in self.lfplugin._last_failed_paths:
+                out = yield
+                res = out.get_result()
                 result = res.result
                 lastfailed = self.lfplugin.lastfailed
 
                 # Only filter with known failures.
                 if not self._collected_at_least_one_failure:
                     if not any(x.nodeid in lastfailed for x in result):
-                        return res
+                        return
                     self.lfplugin.config.pluginmanager.register(
                         LFPluginCollSkipfiles(self.lfplugin), "lfplugin-collskip"
                     )
@@ -260,8 +268,8 @@ class LFPluginCollWrapper:
                     # Keep all sub-collectors.
                     or isinstance(x, nodes.Collector)
                 ]
-
-        return res
+                return
+        yield
 
 
 class LFPluginCollSkipfiles:
@@ -272,7 +280,9 @@ class LFPluginCollSkipfiles:
     def pytest_make_collect_report(
         self, collector: nodes.Collector
     ) -> Optional[CollectReport]:
-        if isinstance(collector, File):
+        # Packages are Files, but we only want to skip test-bearing Files,
+        # so don't filter Packages.
+        if isinstance(collector, File) and not isinstance(collector, Package):
             if collector.path not in self.lfplugin._last_failed_paths:
                 self.lfplugin._skipped_files += 1
 
@@ -332,14 +342,14 @@ class LFPlugin:
         else:
             self.lastfailed[report.nodeid] = True
 
-    @hookimpl(wrapper=True, tryfirst=True)
+    @hookimpl(hookwrapper=True, tryfirst=True)
     def pytest_collection_modifyitems(
         self, config: Config, items: List[nodes.Item]
     ) -> Generator[None, None, None]:
-        res = yield
+        yield
 
         if not self.active:
-            return res
+            return
 
         if self.lastfailed:
             previously_failed = []
@@ -384,8 +394,6 @@ class LFPlugin:
             else:
                 self._report_status += "not deselecting items."
 
-        return res
-
     def pytest_sessionfinish(self, session: Session) -> None:
         config = self.config
         if config.getoption("cacheshow") or hasattr(config, "workerinput"):
@@ -406,11 +414,11 @@ class NFPlugin:
         assert config.cache is not None
         self.cached_nodeids = set(config.cache.get("cache/nodeids", []))
 
-    @hookimpl(wrapper=True, tryfirst=True)
+    @hookimpl(hookwrapper=True, tryfirst=True)
     def pytest_collection_modifyitems(
         self, items: List[nodes.Item]
     ) -> Generator[None, None, None]:
-        res = yield
+        yield
 
         if self.active:
             new_items: Dict[str, nodes.Item] = {}
@@ -428,8 +436,6 @@ class NFPlugin:
         else:
             self.cached_nodeids.update(item.nodeid for item in items)
 
-        return res
-
     def _get_increasing_order(self, items: Iterable[nodes.Item]) -> List[nodes.Item]:
         return sorted(items, key=lambda item: item.path.stat().st_mtime, reverse=True)  # type: ignore[no-any-return]
 
@@ -499,11 +505,7 @@ def pytest_addoption(parser: Parser) -> None:
         dest="last_failed_no_failures",
         choices=("all", "none"),
         default="all",
-        help="With ``--lf``, determines whether to execute tests when there "
-        "are no previously (known) failures or when no "
-        "cached ``lastfailed`` data was found. "
-        "``all`` (the default) runs the full test suite again. "
-        "``none`` just emits a message about no known failures and exits successfully.",
+        help="Which tests to run with no previously (known) failures",
     )