Prepare release version 7.4.0

[ran: made some fixups]

.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,26 +1,29 @@
 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
@@ -28,18 +31,6 @@ jobs:
     - name: Build and Check Package
       uses: hynek/build-and-inspect-python-package@v1.5
 
-  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
-
     - name: Download Package
       uses: actions/download-artifact@v3
       with:
@@ -47,35 +38,14 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.8.10
-
-    - 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 }} v${{ github.event.inputs.version }} ${{ github.sha }}
-        git push origin v${{ 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@v4
       with:
-        python-version: "3.11"
+        python-version: "3.7"
 
     - name: Install tox
       run: |

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

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

.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
-
   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
@@ -160,24 +159,22 @@ jobs:
             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@v4
       with:
@@ -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,27 +20,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup Python
         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

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.3.0
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: 1.16.0
+    rev: 1.14.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.10.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.7.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.5.1
+    rev: v1.3.0
     hooks:
     -   id: mypy
         files: ^(src/|testing/)

AUTHORS

@@ -11,7 +11,6 @@ Adam Johnson
 Adam Stewart
 Adam Uhlir
 Ahn Ki-Wook
-Akhilesh Ramakrishnan
 Akiomi Kamakura
 Alan Velasco
 Alessio Izzo
@@ -57,7 +56,6 @@ Ben Gartner
 Ben Webb
 Benjamin Peterson
 Bernard Pratz
-Bo Wu
 Bob Ippolito
 Brian Dorsey
 Brian Larsen
@@ -131,7 +129,6 @@ Eric Hunsberger
 Eric Liu
 Eric Siegerman
 Erik Aronesty
-Erik Hasse
 Erik M. Bray
 Evan Kepner
 Evgeny Seliverstov
@@ -143,7 +140,6 @@ Feng Ma
 Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
-Fraser Stark
 Gabriel Landau
 Gabriel Reis
 Garvit Shubham
@@ -170,8 +166,6 @@ Ian Bicking
 Ian Lesperance
 Ilya Konstantinov
 Ionuț Turturică
-Isaac Virshup
-Israel Fruchter
 Itxaso Aizpurua
 Iwan Briquemont
 Jaap Broekhuizen
@@ -235,7 +229,6 @@ Maho
 Maik Figura
 Mandeep Bhutani
 Manuel Krebber
-Marc Mueller
 Marc Schlaich
 Marcelo Duarte Trevisani
 Marcin Bachry
@@ -266,10 +259,8 @@ Michal Wajszczuk
 Michał Zięba
 Mickey Pashov
 Mihai Capotă
-Mihail Milushev
 Mike Hoyle (hoylemd)
 Mike Lundy
-Milan Lesnek
 Miro Hrončok
 Nathaniel Compton
 Nathaniel Waisbrot
@@ -319,7 +310,6 @@ Raphael Pierzina
 Rafal Semik
 Raquel Alegre
 Ravi Chandra
-Reagan Lee
 Robert Holt
 Roberto Aldera
 Roberto Polli
@@ -330,9 +320,7 @@ Ronny Pfannschmidt
 Ross Lawley
 Ruaridh Williamson
 Russel Winder
-Ryan Puddephatt
 Ryan Wooden
-Sadra Barikbin
 Saiprasad Kale
 Samuel Colvin
 Samuel Dion-Girardeau
@@ -341,20 +329,16 @@ 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
@@ -368,7 +352,6 @@ Tadek Teleżyński
 Takafumi Arakaki
 Taneli Hukkinen
 Tanvi Mehta
-Tanya Agarwal
 Tarcisio Fischer
 Tareq Alayan
 Tatiana Ovary
@@ -387,9 +370,7 @@ Tomer Keren
 Tony Narlock
 Tor Colvin
 Trevor Bekolay
-Tushar Sadhwani
 Tyler Goodlet
-Tyler Smart
 Tzu-ping Chung
 Vasily Kuznetsov
 Victor Maryama

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** 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 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

@@ -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/10441.feature.rst

@@ -1,2 +0,0 @@
-Added :func:`ExceptionInfo.group_contains() <pytest.ExceptionInfo.group_contains>`, an assertion
-helper that tests if an `ExceptionGroup` contains a matching exception.

changelog/10447.bugfix.rst

@@ -1,2 +0,0 @@
-markers are now considered in the reverse mro order to ensure base  class markers are considered first
-this resolves a regression.

changelog/10465.deprecation.rst

@@ -1 +0,0 @@
-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.

changelog/10617.feature.rst

@@ -1,2 +0,0 @@
-Added more comprehensive set assertion rewrites for comparisons other than equality ``==``, with
-the following operations now providing better failure messages: ``!=``, ``<=``, ``>=``, ``<``, and ``>``.

changelog/10701.bugfix.rst

@@ -1,2 +0,0 @@
-: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.

changelog/11011.doc.rst

@@ -1 +0,0 @@
-Added a warning about modifying the root logger during tests when using ``caplog``.

changelog/11091.doc.rst

@@ -1 +0,0 @@
-Updated documentation and tests to refer to hyphonated options: replaced ``--junitxml`` with ``--junit-xml`` and ``--collectonly`` with ``--collect-only``.

changelog/11122.improvement.rst

@@ -1,6 +0,0 @@
-``pluggy>=1.2.0`` is now required.
-
-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 this version of pytest or later.

changelog/11137.breaking.rst

@@ -1,11 +0,0 @@
-: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).

changelog/11146.bugfix.rst

@@ -1 +0,0 @@
-- Prevent constants at the top of file from being detected as docstrings.

changelog/11151.breaking.rst

@@ -1 +0,0 @@
-Dropped support for Python 3.7, which `reached end-of-life on 2023-06-27 <https://devguide.python.org/versions/>`__.

changelog/11208.trivial.rst

@@ -1,2 +0,0 @@
-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.

changelog/11216.improvement.rst

@@ -1 +0,0 @@
-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.

changelog/11218.trivial.rst

@@ -1,5 +0,0 @@
-(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.

changelog/11227.improvement.rst

@@ -1 +0,0 @@
-Allow :func:`pytest.raises` ``match`` argument to match against `PEP-678 <https://peps.python.org/pep-0678/>` ``__notes__``.

changelog/11239.bugfix.rst

@@ -1 +0,0 @@
-Fixed ``:=`` in asserts impacting unrelated test cases.

changelog/11255.bugfix.rst

@@ -1 +0,0 @@
-Fixed crash on `parametrize(..., scope="package")` without a package present.

changelog/11277.bugfix.rst

@@ -1,2 +0,0 @@
-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.

changelog/11314.improvement.rst

@@ -1,2 +0,0 @@
-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.

changelog/11315.trivial.rst

@@ -1,3 +0,0 @@
-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.

changelog/11333.trivial.rst

@@ -1,2 +0,0 @@
-Corrected the spelling of ``Config.ArgsSource.INVOCATION_DIR``.
-The previous spelling ``INCOVATION_DIR`` remains as an alias.

changelog/11353.trivial.rst

@@ -1 +0,0 @@
-pluggy>=1.3.0 is now required. This adds typing to :class:`~pytest.PytestPluginManager`.

changelog/11439.bugfix.rst

@@ -1 +0,0 @@
-Handle an edge case where :data:`sys.stderr` might already be closed when :ref:`faulthandler` is tearing down.

changelog/11447.improvement.rst

@@ -1 +0,0 @@
-:func:`pytest.deprecated_call` now also considers warnings of type :class:`FutureWarning`.

changelog/11456.bugfix.rst

@@ -1,4 +0,0 @@
-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.

changelog/3664.deprecation.rst

@@ -1,3 +0,0 @@
-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 the future.

changelog/7363.breaking.rst

@@ -1,22 +0,0 @@
-**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`.

changelog/7469.feature.rst

@@ -1 +0,0 @@
-:class:`~pytest.FixtureDef` is now exported as ``pytest.FixtureDef`` for typing purposes.

changelog/7966.bugfix.rst

@@ -1 +0,0 @@
-Removes unhelpful error message from assertion rewrite mechanism when exceptions raised in __iter__ methods, and instead treats them as un-iterable.

changelog/8976.breaking.rst

@@ -1,5 +0,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`.

changelog/9036.bugfix.rst

@@ -1 +0,0 @@
-``pytest.warns`` and similar functions now capture warnings when an exception is raised inside a ``with`` block.

changelog/9288.breaking.rst

@@ -1,7 +0,0 @@
-:func:`pytest.warns <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 decided to announce this 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.

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,8 +6,6 @@ Release announcements
    :maxdepth: 2
 
 
-   release-7.4.2
-   release-7.4.1
    release-7.4.0
    release-7.3.2
    release-7.3.1

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/backwards-compatibility.rst

@@ -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

@@ -22,7 +22,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
     cachedir: .pytest_cache
     rootdir: /home/sweet/project
     collected 0 items
-    cache -- .../_pytest/cacheprovider.py:532
+    cache -- .../_pytest/cacheprovider.py:528
         Return a cache object that can persist state between testing sessions.
 
         cache.get(key, default)
@@ -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:757
+    doctest_namespace [session scope] -- .../_pytest/doctest.py:737
         Fixture that returns a :py:class:`dict` that will be injected into the
         namespace of doctests.
 

doc/en/changelog.rst

@@ -28,48 +28,6 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
-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)
 =========================
 

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
@@ -449,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

@@ -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,42 +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.
-
-
-: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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -645,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/markers.rst

@@ -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
 -------------------------------------------------------

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/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

@@ -483,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
@@ -509,8 +509,8 @@ Running it results in some skips if we don't have all the python interpreters in
    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
@@ -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/simple.rst

@@ -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:
 
@@ -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):
@@ -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/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 7.4.2
+    pytest 7.4.0
 
 .. _`simpletest`:
 
@@ -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 ``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/how-to/assert.rst

@@ -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.
 
@@ -115,56 +116,10 @@ that a regular expression matches on the string representation of an exception
         with pytest.raises(ValueError, match=r".* 123 .*"):
             myfunc()
 
-The regexp parameter of the ``match`` parameter is matched with the ``re.search``
+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.
 
-You can also use the :func:`excinfo.group_contains() <pytest.ExceptionInfo.group_contains>`
-method to test for exceptions returned as part of an ``ExceptionGroup``:
-
-.. 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)
-
 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:

doc/en/how-to/cache.rst

@@ -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
 --------------------------------

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

@@ -1698,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):
@@ -1752,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:
 

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

@@ -478,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/skipping.rst

@@ -197,14 +197,6 @@ the test. You can also skip based on the version number of a library:
 The version will be read from the specified
 module's ``__version__`` attribute.
 
-Sometimes importing a module can fail due to an exception, if you want to
-only skip if the module does not exist pass ModuleNotFoundError as the
-``exc`` kwarg:
-
-.. code-block:: python
-
-    docutils = pytest.importorskip("docutils", exc=ModuleNotFoundError)
-
 Summary
 ~~~~~~~
 

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
 
@@ -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

@@ -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,7 +56,7 @@ 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
@@ -69,8 +69,10 @@ 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:
 
@@ -79,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:
 
@@ -137,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:
 
@@ -159,11 +149,12 @@ 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.
 
 
 Declaring new hooks

doc/en/index.rst

@@ -2,7 +2,8 @@
 
 .. 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**
+   - `pytest tips and tricks for a better testsuite <https://ep2023.europython.eu/session/pytest-tips-and-tricks-for-a-better-testsuite>`_, at `Europython 2023 <https://ep2023.europython.eu/>`_, July 18th (3h), Prague/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 +18,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`
 
@@ -76,7 +77,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/reference.rst

@@ -82,8 +82,6 @@ pytest.exit
 pytest.main
 ~~~~~~~~~~~
 
-**Tutorial**: :ref:`pytest.main-usage`
-
 .. autofunction:: pytest.main
 
 pytest.param
@@ -237,7 +235,7 @@ pytest.mark.xfail
 
 Marks a test function as *expected to fail*.
 
-.. py:function:: pytest.mark.xfail(condition=None, *, reason=None, raises=None, run=True, strict=xfail_strict)
+.. py:function:: pytest.mark.xfail(condition=None, *, reason=None, raises=None, run=True, strict=False)
 
     :type condition: bool or str
     :param condition:
@@ -249,10 +247,10 @@ Marks a test function as *expected to fail*.
     :keyword Type[Exception] raises:
         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
@@ -260,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
 ~~~~~~~~~~~~
@@ -787,66 +783,18 @@ 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:
 
-Collector
-~~~~~~~~~
-
-.. autoclass:: pytest.Collector()
-    :members:
-    :show-inheritance:
-
-Item
-~~~~
-
-.. autoclass:: pytest.Item()
-    :members:
-    :show-inheritance:
-
-File
-~~~~
-
-.. autoclass:: pytest.File()
-    :members:
-    :show-inheritance:
-
-FSCollector
-~~~~~~~~~~~
-
-.. autoclass:: _pytest.nodes.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
 ~~~~~
@@ -855,34 +803,13 @@ Class
     :members:
     :show-inheritance:
 
-Function
-~~~~~~~~
+Collector
+~~~~~~~~~
 
-.. autoclass:: pytest.Function()
+.. autoclass:: pytest.Collector()
     :members:
     :show-inheritance:
 
-FunctionDefinition
-~~~~~~~~~~~~~~~~~~
-
-.. autoclass:: _pytest.python.FunctionDefinition()
-    :members:
-    :show-inheritance:
-
-
-Objects
--------
-
-Objects accessible from :ref:`fixtures <fixture>` or :ref:`hooks <hook-reference>`
-or importable from ``pytest``.
-
-
-CallInfo
-~~~~~~~~
-
-.. autoclass:: pytest.CallInfo()
-    :members:
-
 CollectReport
 ~~~~~~~~~~~~~
 
@@ -910,11 +837,46 @@ ExitCode
 .. autoclass:: pytest.ExitCode
     :members:
 
+File
+~~~~
+
+.. autoclass:: pytest.File()
+    :members:
+    :show-inheritance:
+
 
 FixtureDef
 ~~~~~~~~~~
 
-.. autoclass:: pytest.FixtureDef()
+.. autoclass:: _pytest.fixtures.FixtureDef()
+    :members:
+    :show-inheritance:
+
+FSCollector
+~~~~~~~~~~~
+
+.. autoclass:: _pytest.nodes.FSCollector()
+    :members:
+    :show-inheritance:
+
+Function
+~~~~~~~~
+
+.. autoclass:: pytest.Function()
+    :members:
+    :show-inheritance:
+
+FunctionDefinition
+~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: _pytest.python.FunctionDefinition()
+    :members:
+    :show-inheritance:
+
+Item
+~~~~
+
+.. autoclass:: pytest.Item()
     :members:
     :show-inheritance:
 
@@ -945,6 +907,19 @@ Metafunc
 .. autoclass:: pytest.Metafunc()
     :members:
 
+Module
+~~~~~~
+
+.. autoclass:: pytest.Module()
+    :members:
+    :show-inheritance:
+
+Node
+~~~~
+
+.. autoclass:: _pytest.nodes.Node()
+    :members:
+
 Parser
 ~~~~~~
 
@@ -966,6 +941,13 @@ PytestPluginManager
     :inherited-members:
     :show-inheritance:
 
+Session
+~~~~~~~
+
+.. autoclass:: pytest.Session()
+    :members:
+    :show-inheritance:
+
 TestReport
 ~~~~~~~~~~
 
@@ -980,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
 ~~~~~
@@ -1171,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:
 
@@ -1640,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
@@ -1892,12 +1871,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

doc/en/requirements.txt

@@ -1,5 +1,5 @@
 pallets-sphinx-themes
-pluggy>=1.2.0
+pluggy>=1.0
 pygments-pytest>=2.3.0
 sphinx-removed-in>=0.2.0
 sphinx>=5,<6

pyproject.toml

@@ -17,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",
@@ -118,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,16 +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}`.
-
-After the `deploy` 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/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 =

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/terminalwriter.py

@@ -2,12 +2,12 @@
 import os
 import shutil
 import sys
-from typing import final
 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.

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")
 

src/_pytest/assertion/__init__.py

@@ -112,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
@@ -162,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."""
@@ -642,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
@@ -665,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."""
@@ -688,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
@@ -732,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] = []
@@ -831,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))
@@ -885,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)
@@ -910,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,
                 )
             )
@@ -930,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
@@ -941,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())
@@ -955,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:
@@ -963,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]:
@@ -1001,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
@@ -1013,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:
@@ -1032,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)
 
@@ -1056,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)
@@ -1105,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)
@@ -1127,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)
@@ -1140,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
@@ -1186,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/util.py

@@ -132,7 +132,7 @@ def isiterable(obj: Any) -> bool:
     try:
         iter(obj)
         return not istext(obj)
-    except Exception:
+    except TypeError:
         return False
 
 
@@ -193,22 +193,6 @@ def assertrepr_compare(
         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, verbose)
-        elif op == "<=":
-            if isset(left) and isset(right):
-                explanation = _compare_lte_set(left, right, verbose)
-        elif op == ">":
-            if isset(left) and isset(right):
-                explanation = _compare_gt_set(left, right, verbose)
-        elif op == "<":
-            if isset(left) and isset(right):
-                explanation = _compare_lt_set(left, right, verbose)
-
     except outcomes.Exit:
         raise
     except Exception:
@@ -238,7 +222,7 @@ def _compare_eq_any(left: Any, right: Any, verbose: int = 0) -> List[str]:
             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
@@ -408,49 +392,15 @@ def _compare_eq_set(
     left: AbstractSet[Any], right: AbstractSet[Any], verbose: int = 0
 ) -> List[str]:
     explanation = []
-    explanation.extend(_set_one_sided_diff("left", left, right))
-    explanation.extend(_set_one_sided_diff("right", right, left))
-    return explanation
-
-
-def _compare_gt_set(
-    left: AbstractSet[Any], right: AbstractSet[Any], verbose: int = 0
-) -> List[str]:
-    explanation = _compare_gte_set(left, right, verbose)
-    if not explanation:
-        return ["Both sets are equal"]
-    return explanation
-
-
-def _compare_lt_set(
-    left: AbstractSet[Any], right: AbstractSet[Any], verbose: int = 0
-) -> List[str]:
-    explanation = _compare_lte_set(left, right, verbose)
-    if not explanation:
-        return ["Both sets are equal"]
-    return explanation
-
-
-def _compare_gte_set(
-    left: AbstractSet[Any], right: AbstractSet[Any], verbose: int = 0
-) -> List[str]:
-    return _set_one_sided_diff("right", right, left)
-
-
-def _compare_lte_set(
-    left: AbstractSet[Any], right: AbstractSet[Any], verbose: int = 0
-) -> List[str]:
-    return _set_one_sided_diff("left", left, right)
-
-
-def _set_one_sided_diff(
-    posn: str, set1: AbstractSet[Any], set2: AbstractSet[Any]
-) -> List[str]:
-    explanation = []
-    diff = set1 - set2
-    if diff:
-        explanation.append(f"Extra items in the {posn} set:")
-        for item in diff:
+    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
 

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
@@ -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
+    @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",
     )
 
 

src/_pytest/capture.py

@@ -11,14 +11,11 @@ from types import TracebackType
 from typing import Any
 from typing import AnyStr
 from typing import BinaryIO
-from typing import Final
-from typing import final
 from typing import Generator
 from typing import Generic
 from typing import Iterable
 from typing import Iterator
 from typing import List
-from typing import Literal
 from typing import NamedTuple
 from typing import Optional
 from typing import TextIO
@@ -27,6 +24,7 @@ from typing import Type
 from typing import TYPE_CHECKING
 from typing import Union
 
+from _pytest.compat import final
 from _pytest.config import Config
 from _pytest.config import hookimpl
 from _pytest.config.argparsing import Parser
@@ -36,9 +34,12 @@ from _pytest.fixtures import SubRequest
 from _pytest.nodes import Collector
 from _pytest.nodes import File
 from _pytest.nodes import Item
-from _pytest.reports import CollectReport
 
-_CaptureMethod = Literal["fd", "sys", "no", "tee-sys"]
+if TYPE_CHECKING:
+    from typing_extensions import Final
+    from typing_extensions import Literal
+
+    _CaptureMethod = Literal["fd", "sys", "no", "tee-sys"]
 
 
 def pytest_addoption(parser: Parser) -> None:
@@ -131,8 +132,8 @@ def _windowsconsoleio_workaround(stream: TextIO) -> None:
     sys.stderr = _reopen_stdio(sys.stderr, "wb")
 
 
-@hookimpl(wrapper=True)
-def pytest_load_initial_conftests(early_config: Config) -> Generator[None, None, None]:
+@hookimpl(hookwrapper=True)
+def pytest_load_initial_conftests(early_config: Config):
     ns = early_config.known_args_namespace
     if ns.capture == "fd":
         _windowsconsoleio_workaround(sys.stdout)
@@ -146,16 +147,12 @@ def pytest_load_initial_conftests(early_config: Config) -> Generator[None, None,
 
     # Finally trigger conftest loading but while capturing (issue #93).
     capman.start_global_capturing()
-    try:
-        try:
-            yield
-        finally:
-            capman.suspend_global_capture()
-    except BaseException:
+    outcome = yield
+    capman.suspend_global_capture()
+    if outcome.excinfo is not None:
         out, err = capman.read_global_capture()
         sys.stdout.write(out)
         sys.stderr.write(err)
-        raise
 
 
 # IO Helpers.
@@ -690,7 +687,7 @@ class MultiCapture(Generic[AnyStr]):
         return CaptureResult(out, err)  # type: ignore[arg-type]
 
 
-def _get_multicapture(method: _CaptureMethod) -> MultiCapture[str]:
+def _get_multicapture(method: "_CaptureMethod") -> MultiCapture[str]:
     if method == "fd":
         return MultiCapture(in_=FDCapture(0), out=FDCapture(1), err=FDCapture(2))
     elif method == "sys":
@@ -726,7 +723,7 @@ class CaptureManager:
       needed to ensure the fixtures take precedence over the global capture.
     """
 
-    def __init__(self, method: _CaptureMethod) -> None:
+    def __init__(self, method: "_CaptureMethod") -> None:
         self._method: Final = method
         self._global_capturing: Optional[MultiCapture[str]] = None
         self._capture_fixture: Optional[CaptureFixture[Any]] = None
@@ -846,45 +843,41 @@ class CaptureManager:
             self.deactivate_fixture()
             self.suspend_global_capture(in_=False)
 
-            out, err = self.read_global_capture()
-            item.add_report_section(when, "stdout", out)
-            item.add_report_section(when, "stderr", err)
+        out, err = self.read_global_capture()
+        item.add_report_section(when, "stdout", out)
+        item.add_report_section(when, "stderr", err)
 
     # Hooks
 
-    @hookimpl(wrapper=True)
-    def pytest_make_collect_report(
-        self, collector: Collector
-    ) -> Generator[None, CollectReport, CollectReport]:
+    @hookimpl(hookwrapper=True)
+    def pytest_make_collect_report(self, collector: Collector):
         if isinstance(collector, File):
             self.resume_global_capture()
-            try:
-                rep = yield
-            finally:
-                self.suspend_global_capture()
+            outcome = yield
+            self.suspend_global_capture()
             out, err = self.read_global_capture()
+            rep = outcome.get_result()
             if out:
                 rep.sections.append(("Captured stdout", out))
             if err:
                 rep.sections.append(("Captured stderr", err))
         else:
-            rep = yield
-        return rep
+            yield
 
-    @hookimpl(wrapper=True)
+    @hookimpl(hookwrapper=True)
     def pytest_runtest_setup(self, item: Item) -> Generator[None, None, None]:
         with self.item_capture("setup", item):
-            return (yield)
+            yield
 
-    @hookimpl(wrapper=True)
+    @hookimpl(hookwrapper=True)
     def pytest_runtest_call(self, item: Item) -> Generator[None, None, None]:
         with self.item_capture("call", item):
-            return (yield)
+            yield
 
-    @hookimpl(wrapper=True)
+    @hookimpl(hookwrapper=True)
     def pytest_runtest_teardown(self, item: Item) -> Generator[None, None, None]:
         with self.item_capture("teardown", item):
-            return (yield)
+            yield
 
     @hookimpl(tryfirst=True)
     def pytest_keyboard_interrupt(self) -> None:

src/_pytest/compat.py

@@ -12,12 +12,26 @@ from inspect import signature
 from pathlib import Path
 from typing import Any
 from typing import Callable
-from typing import Final
+from typing import Generic
 from typing import NoReturn
+from typing import TYPE_CHECKING
 from typing import TypeVar
 
 import py
 
+# fmt: off
+# Workaround for https://github.com/sphinx-doc/sphinx/issues/10351.
+# If `overload` is imported from `compat` instead of from `typing`,
+# Sphinx doesn't recognize it as `overload` and the API docs for
+# overloaded functions look good again. But type checkers handle
+# it fine.
+# fmt: on
+if True:
+    from typing import overload as overload
+
+if TYPE_CHECKING:
+    from typing_extensions import Final
+
 
 _T = TypeVar("_T")
 _S = TypeVar("_S")
@@ -44,6 +58,17 @@ class NotSetType(enum.Enum):
 NOTSET: Final = NotSetType.token  # noqa: E305
 # fmt: on
 
+if sys.version_info >= (3, 8):
+    import importlib.metadata
+
+    importlib_metadata = importlib.metadata
+else:
+    import importlib_metadata as importlib_metadata  # noqa: F401
+
+
+def _format_args(func: Callable[..., Any]) -> str:
+    return str(signature(func))
+
 
 def is_generator(func: object) -> bool:
     genfunc = inspect.isgeneratorfunction(func)
@@ -68,7 +93,7 @@ def is_async_function(func: object) -> bool:
     return iscoroutinefunction(func) or inspect.isasyncgenfunction(func)
 
 
-def getlocation(function, curdir: str | os.PathLike[str] | None = None) -> str:
+def getlocation(function, curdir: str | None = None) -> str:
     function = get_real_func(function)
     fn = Path(inspect.getfile(function))
     lineno = function.__code__.co_firstlineno
@@ -102,7 +127,7 @@ def num_mock_patch_args(function) -> int:
 
 
 def getfuncargnames(
-    function: Callable[..., object],
+    function: Callable[..., Any],
     *,
     name: str = "",
     is_method: bool = False,
@@ -313,25 +338,57 @@ def safe_isclass(obj: object) -> bool:
         return False
 
 
-def get_user_id() -> int | None:
-    """Return the current process's real user id or None if it could not be
-    determined.
-
-    :return: The user id or None if it could not be determined.
-    """
-    # mypy follows the version and platform checking expectation of PEP 484:
-    # https://mypy.readthedocs.io/en/stable/common_issues.html?highlight=platform#python-version-and-system-platform-checks
-    # Containment checks are too complex for mypy v1.5.0 and cause failure.
-    if sys.platform == "win32" or sys.platform == "emscripten":
-        # win32 does not have a getuid() function.
-        # Emscripten has a return 0 stub.
-        return None
+if TYPE_CHECKING:
+    if sys.version_info >= (3, 8):
+        from typing import final as final
     else:
-        # On other platforms, a return value of -1 is assumed to indicate that
-        # the current process's real user id could not be determined.
-        ERROR = -1
-        uid = os.getuid()
-        return uid if uid != ERROR else None
+        from typing_extensions import final as final
+elif sys.version_info >= (3, 8):
+    from typing import final as final
+else:
+
+    def final(f):
+        return f
+
+
+if sys.version_info >= (3, 8):
+    from functools import cached_property as cached_property
+else:
+
+    class cached_property(Generic[_S, _T]):
+        __slots__ = ("func", "__doc__")
+
+        def __init__(self, func: Callable[[_S], _T]) -> None:
+            self.func = func
+            self.__doc__ = func.__doc__
+
+        @overload
+        def __get__(
+            self, instance: None, owner: type[_S] | None = ...
+        ) -> cached_property[_S, _T]:
+            ...
+
+        @overload
+        def __get__(self, instance: _S, owner: type[_S] | None = ...) -> _T:
+            ...
+
+        def __get__(self, instance, owner=None):
+            if instance is None:
+                return self
+            value = instance.__dict__[self.func.__name__] = self.func(instance)
+            return value
+
+
+def get_user_id() -> int | None:
+    """Return the current user id, or None if we cannot get it reliably on the current platform."""
+    # win32 does not have a getuid() function.
+    # On Emscripten, getuid() is a stub that always returns 0.
+    if sys.platform in ("win32", "emscripten"):
+        return None
+    # getuid shouldn't fail, but cpython defines such a case.
+    # Let's hope for the best.
+    uid = os.getuid()
+    return uid if uid != -1 else None
 
 
 # Perform exhaustiveness checking.

src/_pytest/config/__init__.py

@@ -5,7 +5,6 @@ import copy
 import dataclasses
 import enum
 import glob
-import importlib.metadata
 import inspect
 import os
 import re
@@ -22,7 +21,6 @@ from typing import Any
 from typing import Callable
 from typing import cast
 from typing import Dict
-from typing import final
 from typing import Generator
 from typing import IO
 from typing import Iterable
@@ -37,23 +35,21 @@ from typing import Type
 from typing import TYPE_CHECKING
 from typing import Union
 
-import pluggy
 from pluggy import HookimplMarker
-from pluggy import HookimplOpts
 from pluggy import HookspecMarker
-from pluggy import HookspecOpts
 from pluggy import PluginManager
 
 import _pytest._code
 import _pytest.deprecated
 import _pytest.hookspec
-from .compat import PathAwareHookProxy
 from .exceptions import PrintHelp as PrintHelp
 from .exceptions import UsageError as UsageError
 from .findpaths import determine_setup
 from _pytest._code import ExceptionInfo
 from _pytest._code import filter_traceback
 from _pytest._io import TerminalWriter
+from _pytest.compat import final
+from _pytest.compat import importlib_metadata  # type: ignore[attr-defined]
 from _pytest.outcomes import fail
 from _pytest.outcomes import Skipped
 from _pytest.pathlib import absolutepath
@@ -61,7 +57,6 @@ from _pytest.pathlib import bestrelpath
 from _pytest.pathlib import import_path
 from _pytest.pathlib import ImportMode
 from _pytest.pathlib import resolve_package_path
-from _pytest.pathlib import safe_exists
 from _pytest.stash import Stash
 from _pytest.warning_types import PytestConfigWarning
 from _pytest.warning_types import warn_explicit_for
@@ -142,9 +137,7 @@ def main(
 ) -> Union[int, ExitCode]:
     """Perform an in-process test run.
 
-    :param args:
-        List of command line arguments. If `None` or not given, defaults to reading
-        arguments directly from the process command line (:data:`sys.argv`).
+    :param args: List of command line arguments.
     :param plugins: List of plugin objects to be auto-registered during initialization.
 
     :returns: An exit code.
@@ -264,8 +257,7 @@ default_plugins = essential_plugins + (
     "logging",
     "reports",
     "python_path",
-    "unraisableexception",
-    "threadexception",
+    *(["unraisableexception", "threadexception"] if sys.version_info >= (3, 8) else []),
     "faulthandler",
 )
 
@@ -358,9 +350,9 @@ def _get_legacy_hook_marks(
     if TYPE_CHECKING:
         # abuse typeguard from importlib to avoid massive method type union thats lacking a alias
         assert inspect.isroutine(method)
-    known_marks: Set[str] = {m.name for m in getattr(method, "pytestmark", [])}
-    must_warn: List[str] = []
-    opts: Dict[str, bool] = {}
+    known_marks: set[str] = {m.name for m in getattr(method, "pytestmark", [])}
+    must_warn: list[str] = []
+    opts: dict[str, bool] = {}
     for opt_name in opt_names:
         opt_attr = getattr(method, opt_name, AttributeError)
         if opt_attr is not AttributeError:
@@ -445,17 +437,15 @@ class PytestPluginManager(PluginManager):
         # Used to know when we are importing conftests after the pytest_configure stage.
         self._configured = False
 
-    def parse_hookimpl_opts(
-        self, plugin: _PluggyPlugin, name: str
-    ) -> Optional[HookimplOpts]:
+    def parse_hookimpl_opts(self, plugin: _PluggyPlugin, name: str):
         # pytest hooks are always prefixed with "pytest_",
         # so we avoid accessing possibly non-readable attributes
         # (see issue #1073).
         if not name.startswith("pytest_"):
-            return None
+            return
         # Ignore names which can not be hooks.
         if name == "pytest_plugins":
-            return None
+            return
 
         opts = super().parse_hookimpl_opts(plugin, name)
         if opts is not None:
@@ -464,18 +454,18 @@ class PytestPluginManager(PluginManager):
         method = getattr(plugin, name)
         # Consider only actual functions for hooks (#3775).
         if not inspect.isroutine(method):
-            return None
+            return
         # Collect unmarked hooks as long as they have the `pytest_' prefix.
-        return _get_legacy_hook_marks(  # type: ignore[return-value]
+        return _get_legacy_hook_marks(
             method, "impl", ("tryfirst", "trylast", "optionalhook", "hookwrapper")
         )
 
-    def parse_hookspec_opts(self, module_or_class, name: str) -> Optional[HookspecOpts]:
+    def parse_hookspec_opts(self, module_or_class, name: str):
         opts = super().parse_hookspec_opts(module_or_class, name)
         if opts is None:
             method = getattr(module_or_class, name)
             if name.startswith("pytest_"):
-                opts = _get_legacy_hook_marks(  # type: ignore[assignment]
+                opts = _get_legacy_hook_marks(
                     method,
                     "spec",
                     ("firstresult", "historic"),
@@ -565,8 +555,12 @@ class PytestPluginManager(PluginManager):
             anchor = absolutepath(current / path)
 
             # Ensure we do not break if what appears to be an anchor
-            # is in fact a very long option (#10169, #11394).
-            if safe_exists(anchor):
+            # is in fact a very long option (#10169).
+            try:
+                anchor_exists = anchor.exists()
+            except OSError:  # pragma: no cover
+                anchor_exists = False
+            if anchor_exists:
                 self._try_load_conftest(anchor, importmode, rootpath)
                 foundanchor = True
         if not foundanchor:
@@ -584,25 +578,26 @@ class PytestPluginManager(PluginManager):
     def _try_load_conftest(
         self, anchor: Path, importmode: Union[str, ImportMode], rootpath: Path
     ) -> None:
-        self._loadconftestmodules(anchor, importmode, rootpath)
+        self._getconftestmodules(anchor, importmode, rootpath)
         # let's also consider test* subdirs
         if anchor.is_dir():
             for x in anchor.glob("test*"):
                 if x.is_dir():
-                    self._loadconftestmodules(x, importmode, rootpath)
+                    self._getconftestmodules(x, importmode, rootpath)
 
-    def _loadconftestmodules(
+    def _getconftestmodules(
         self, path: Path, importmode: Union[str, ImportMode], rootpath: Path
-    ) -> None:
+    ) -> Sequence[types.ModuleType]:
         if self._noconftest:
-            return
+            return []
 
         directory = self._get_directory(path)
 
         # Optimization: avoid repeated searches in the same directory.
         # Assumes always called with same importmode and rootpath.
-        if directory in self._dirpath2confmods:
-            return
+        existing_clist = self._dirpath2confmods.get(directory)
+        if existing_clist is not None:
+            return existing_clist
 
         # XXX these days we may rather want to use config.rootpath
         # and allow users to opt into looking into the rootdir parent
@@ -615,17 +610,16 @@ class PytestPluginManager(PluginManager):
                     mod = self._importconftest(conftestpath, importmode, rootpath)
                     clist.append(mod)
         self._dirpath2confmods[directory] = clist
-
-    def _getconftestmodules(self, path: Path) -> Sequence[types.ModuleType]:
-        directory = self._get_directory(path)
-        return self._dirpath2confmods.get(directory, ())
+        return clist
 
     def _rget_with_confmod(
         self,
         name: str,
         path: Path,
+        importmode: Union[str, ImportMode],
+        rootpath: Path,
     ) -> Tuple[types.ModuleType, Any]:
-        modules = self._getconftestmodules(path)
+        modules = self._getconftestmodules(path, importmode, rootpath=rootpath)
         for mod in reversed(modules):
             try:
                 return mod, getattr(mod, name)
@@ -956,8 +950,7 @@ class Config:
         #: Command line arguments.
         ARGS = enum.auto()
         #: Invocation directory.
-        INVOCATION_DIR = enum.auto()
-        INCOVATION_DIR = INVOCATION_DIR  # backwards compatibility alias
+        INCOVATION_DIR = enum.auto()
         #: 'testpaths' configuration value.
         TESTPATHS = enum.auto()
 
@@ -1007,8 +1000,10 @@ class Config:
         # Deprecated alias. Was never public. Can be removed in a few releases.
         self._store = self.stash
 
+        from .compat import PathAwareHookProxy
+
         self.trace = self.pluginmanager.trace.root.get("config")
-        self.hook: pluggy.HookRelay = PathAwareHookProxy(self.pluginmanager.hook)  # type: ignore[assignment]
+        self.hook = PathAwareHookProxy(self.pluginmanager.hook)
         self._inicache: Dict[str, Any] = {}
         self._override_ini: Sequence[str] = ()
         self._opt2dest: Dict[str, str] = {}
@@ -1068,10 +1063,9 @@ class Config:
             fin()
 
     def get_terminal_writer(self) -> TerminalWriter:
-        terminalreporter: Optional[TerminalReporter] = self.pluginmanager.get_plugin(
+        terminalreporter: TerminalReporter = self.pluginmanager.get_plugin(
             "terminalreporter"
         )
-        assert terminalreporter is not None
         return terminalreporter._tw
 
     def pytest_cmdline_parse(
@@ -1173,7 +1167,7 @@ class Config:
             ns.inifilename,
             ns.file_or_dir + unknown_args,
             rootdir_cmd_arg=ns.rootdir or None,
-            invocation_dir=self.invocation_params.dir,
+            config=self,
         )
         self._rootpath = rootpath
         self._inipath = inipath
@@ -1222,7 +1216,7 @@ class Config:
 
         package_files = (
             str(file)
-            for dist in importlib.metadata.distributions()
+            for dist in importlib_metadata.distributions()
             if any(ep.group == "pytest11" for ep in dist.entry_points)
             for file in dist.files or []
         )
@@ -1246,7 +1240,7 @@ class Config:
         self,
         *,
         args: List[str],
-        pyargs: bool,
+        pyargs: List[str],
         testpaths: List[str],
         invocation_dir: Path,
         rootpath: Path,
@@ -1281,7 +1275,7 @@ class Config:
             else:
                 result = []
             if not result:
-                source = Config.ArgsSource.INVOCATION_DIR
+                source = Config.ArgsSource.INCOVATION_DIR
                 result = [str(invocation_dir)]
         return result, source
 
@@ -1344,14 +1338,12 @@ class Config:
             else:
                 raise
 
-    @hookimpl(wrapper=True)
-    def pytest_collection(self) -> Generator[None, object, object]:
+    @hookimpl(hookwrapper=True)
+    def pytest_collection(self) -> Generator[None, None, None]:
         # Validate invalid ini keys after collection is done so we take in account
         # options added by late-loading conftest files.
-        try:
-            return (yield)
-        finally:
-            self._validate_config_options()
+        yield
+        self._validate_config_options()
 
     def _checkversion(self) -> None:
         import pytest
@@ -1453,7 +1445,7 @@ class Config:
         """Issue and handle a warning during the "configure" stage.
 
         During ``pytest_configure`` we can't capture warnings using the ``catch_warnings_for_item``
-        function because it is not possible to have hook wrappers around ``pytest_configure``.
+        function because it is not possible to have hookwrappers around ``pytest_configure``.
 
         This function is mainly intended for plugins that need to issue warnings during
         ``pytest_configure`` (or similar stages).
@@ -1565,9 +1557,13 @@ class Config:
         else:
             return self._getini_unknown_type(name, type, value)
 
-    def _getconftest_pathlist(self, name: str, path: Path) -> Optional[List[Path]]:
+    def _getconftest_pathlist(
+        self, name: str, path: Path, rootpath: Path
+    ) -> Optional[List[Path]]:
         try:
-            mod, relroots = self.pluginmanager._rget_with_confmod(name, path)
+            mod, relroots = self.pluginmanager._rget_with_confmod(
+                name, path, self.getoption("importmode"), rootpath
+            )
         except KeyError:
             return None
         assert mod.__file__ is not None

src/_pytest/config/argparsing.py

@@ -7,23 +7,26 @@ from typing import Any
 from typing import Callable
 from typing import cast
 from typing import Dict
-from typing import final
 from typing import List
-from typing import Literal
 from typing import Mapping
 from typing import NoReturn
 from typing import Optional
 from typing import Sequence
 from typing import Tuple
+from typing import TYPE_CHECKING
 from typing import Union
 
 import _pytest._io
+from _pytest.compat import final
 from _pytest.config.exceptions import UsageError
 from _pytest.deprecated import ARGUMENT_PERCENT_DEFAULT
 from _pytest.deprecated import ARGUMENT_TYPE_STR
 from _pytest.deprecated import ARGUMENT_TYPE_STR_CHOICE
 from _pytest.deprecated import check_ispytest
 
+if TYPE_CHECKING:
+    from typing_extensions import Literal
+
 FILE_OR_DIR = "file_or_dir"
 
 
@@ -174,7 +177,7 @@ class Parser:
         name: str,
         help: str,
         type: Optional[
-            Literal["string", "paths", "pathlist", "args", "linelist", "bool"]
+            "Literal['string', 'paths', 'pathlist', 'args', 'linelist', 'bool']"
         ] = None,
         default: Any = None,
     ) -> None:

src/_pytest/config/compat.py

@@ -1,18 +1,15 @@
-from __future__ import annotations
-
 import functools
 import warnings
 from pathlib import Path
-from typing import Mapping
-
-import pluggy
+from typing import Optional
 
 from ..compat import LEGACY_PATH
 from ..compat import legacy_path
 from ..deprecated import HOOK_LEGACY_PATH_ARG
+from _pytest.nodes import _check_path
 
 # hookname: (Path, LEGACY_PATH)
-imply_paths_hooks: Mapping[str, tuple[str, str]] = {
+imply_paths_hooks = {
     "pytest_ignore_collect": ("collection_path", "path"),
     "pytest_collect_file": ("file_path", "path"),
     "pytest_pycollect_makemodule": ("module_path", "path"),
@@ -21,14 +18,6 @@ imply_paths_hooks: Mapping[str, tuple[str, str]] = {
 }
 
 
-def _check_path(path: Path, fspath: LEGACY_PATH) -> None:
-    if Path(fspath) != path:
-        raise ValueError(
-            f"Path({fspath!r}) != {path!r}\n"
-            "if both path and fspath are given they need to be equal"
-        )
-
-
 class PathAwareHookProxy:
     """
     this helper wraps around hook callers
@@ -38,24 +27,24 @@ class PathAwareHookProxy:
     this may have to be changed later depending on bugs
     """
 
-    def __init__(self, hook_relay: pluggy.HookRelay) -> None:
-        self._hook_relay = hook_relay
+    def __init__(self, hook_caller):
+        self.__hook_caller = hook_caller
 
-    def __dir__(self) -> list[str]:
-        return dir(self._hook_relay)
+    def __dir__(self):
+        return dir(self.__hook_caller)
 
-    def __getattr__(self, key: str) -> pluggy.HookCaller:
-        hook: pluggy.HookCaller = getattr(self._hook_relay, key)
+    def __getattr__(self, key, _wraps=functools.wraps):
+        hook = getattr(self.__hook_caller, key)
         if key not in imply_paths_hooks:
             self.__dict__[key] = hook
             return hook
         else:
             path_var, fspath_var = imply_paths_hooks[key]
 
-            @functools.wraps(hook)
+            @_wraps(hook)
             def fixed_hook(**kw):
-                path_value: Path | None = kw.pop(path_var, None)
-                fspath_value: LEGACY_PATH | None = kw.pop(fspath_var, None)
+                path_value: Optional[Path] = kw.pop(path_var, None)
+                fspath_value: Optional[LEGACY_PATH] = kw.pop(fspath_var, None)
                 if fspath_value is not None:
                     warnings.warn(
                         HOOK_LEGACY_PATH_ARG.format(
@@ -76,8 +65,6 @@ class PathAwareHookProxy:
                 kw[fspath_var] = fspath_value
                 return hook(**kw)
 
-            fixed_hook.name = hook.name  # type: ignore[attr-defined]
-            fixed_hook.spec = hook.spec  # type: ignore[attr-defined]
             fixed_hook.__name__ = key
             self.__dict__[key] = fixed_hook
-            return fixed_hook  # type: ignore[return-value]
+            return fixed_hook

src/_pytest/config/exceptions.py

@@ -1,4 +1,4 @@
-from typing import final
+from _pytest.compat import final
 
 
 @final

src/_pytest/config/findpaths.py

@@ -7,6 +7,7 @@ from typing import List
 from typing import Optional
 from typing import Sequence
 from typing import Tuple
+from typing import TYPE_CHECKING
 from typing import Union
 
 import iniconfig
@@ -15,7 +16,9 @@ from .exceptions import UsageError
 from _pytest.outcomes import fail
 from _pytest.pathlib import absolutepath
 from _pytest.pathlib import commonpath
-from _pytest.pathlib import safe_exists
+
+if TYPE_CHECKING:
+    from . import Config
 
 
 def _parse_ini_config(path: Path) -> iniconfig.IniConfig:
@@ -148,6 +151,14 @@ def get_dirs_from_args(args: Iterable[str]) -> List[Path]:
             return path
         return path.parent
 
+    def safe_exists(path: Path) -> bool:
+        # This can throw on paths that contain characters unrepresentable at the OS level,
+        # or with invalid syntax on Windows (https://bugs.python.org/issue35306)
+        try:
+            return path.exists()
+        except OSError:
+            return False
+
     # These look like paths but may not exist
     possible_paths = (
         absolutepath(get_file_part_from_node_id(arg))
@@ -165,21 +176,8 @@ def determine_setup(
     inifile: Optional[str],
     args: Sequence[str],
     rootdir_cmd_arg: Optional[str] = None,
-    invocation_dir: Optional[Path] = None,
+    config: Optional["Config"] = None,
 ) -> Tuple[Path, Optional[Path], Dict[str, Union[str, List[str]]]]:
-    """Determine the rootdir, inifile and ini configuration values from the
-    command line arguments.
-
-    :param inifile:
-        The `--inifile` command line argument, if given.
-    :param args:
-        The free command line arguments.
-    :param rootdir_cmd_arg:
-        The `--rootdir` command line argument, if given.
-    :param invocation_dir:
-        The working directory when pytest was invoked, if known.
-        If not known, the current working directory is used.
-    """
     rootdir = None
     dirs = get_dirs_from_args(args)
     if inifile:
@@ -200,8 +198,8 @@ def determine_setup(
                 if dirs != [ancestor]:
                     rootdir, inipath, inicfg = locate_config(dirs)
                 if rootdir is None:
-                    if invocation_dir is not None:
-                        cwd = invocation_dir
+                    if config is not None:
+                        cwd = config.invocation_params.dir
                     else:
                         cwd = Path.cwd()
                     rootdir = get_common_ancestor([cwd, ancestor])

src/_pytest/debugging.py

@@ -304,10 +304,10 @@ class PdbInvoke:
 
 
 class PdbTrace:
-    @hookimpl(wrapper=True)
-    def pytest_pyfunc_call(self, pyfuncitem) -> Generator[None, object, object]:
+    @hookimpl(hookwrapper=True)
+    def pytest_pyfunc_call(self, pyfuncitem) -> Generator[None, None, None]:
         wrap_pytest_function_for_tracing(pyfuncitem)
-        return (yield)
+        yield
 
 
 def wrap_pytest_function_for_tracing(pyfuncitem):

src/_pytest/deprecated.py

@@ -122,11 +122,6 @@ HOOK_LEGACY_MARKING = UnformattedWarning(
     "#configuring-hook-specs-impls-using-markers",
 )
 
-MARKED_FIXTURE = PytestRemovedIn8Warning(
-    "Marks applied to fixtures have no effect\n"
-    "See docs: https://docs.pytest.org/en/stable/deprecations.html#applying-a-mark-to-a-fixture-function"
-)
-
 # You want to make some `__init__` or function "private".
 #
 #   def my_private_function(some, args):

src/_pytest/doctest.py

@@ -1,6 +1,5 @@
 """Discover and run doctests in modules and test files."""
 import bdb
-import functools
 import inspect
 import os
 import platform
@@ -33,7 +32,7 @@ from _pytest.compat import safe_getattr
 from _pytest.config import Config
 from _pytest.config.argparsing import Parser
 from _pytest.fixtures import fixture
-from _pytest.fixtures import TopRequest
+from _pytest.fixtures import FixtureRequest
 from _pytest.nodes import Collector
 from _pytest.nodes import Item
 from _pytest.outcomes import OutcomeException
@@ -255,20 +254,14 @@ class DoctestItem(Item):
         self,
         name: str,
         parent: "Union[DoctestTextfile, DoctestModule]",
-        runner: "doctest.DocTestRunner",
-        dtest: "doctest.DocTest",
+        runner: Optional["doctest.DocTestRunner"] = None,
+        dtest: Optional["doctest.DocTest"] = None,
     ) -> None:
         super().__init__(name, parent)
         self.runner = runner
         self.dtest = dtest
-
-        # Stuff needed for fixture support.
         self.obj = None
-        fm = self.session._fixturemanager
-        fixtureinfo = fm.getfixtureinfo(node=self, func=None, cls=None)
-        self._fixtureinfo = fixtureinfo
-        self.fixturenames = fixtureinfo.names_closure
-        self._initrequest()
+        self.fixture_request: Optional[FixtureRequest] = None
 
     @classmethod
     def from_parent(  # type: ignore
@@ -283,18 +276,19 @@ class DoctestItem(Item):
         """The public named constructor."""
         return super().from_parent(name=name, parent=parent, runner=runner, dtest=dtest)
 
-    def _initrequest(self) -> None:
-        self.funcargs: Dict[str, object] = {}
-        self._request = TopRequest(self, _ispytest=True)  # type: ignore[arg-type]
-
     def setup(self) -> None:
-        self._request._fillfixtures()
-        globs = dict(getfixture=self._request.getfixturevalue)
-        for name, value in self._request.getfixturevalue("doctest_namespace").items():
-            globs[name] = value
-        self.dtest.globs.update(globs)
+        if self.dtest is not None:
+            self.fixture_request = _setup_fixtures(self)
+            globs = dict(getfixture=self.fixture_request.getfixturevalue)
+            for name, value in self.fixture_request.getfixturevalue(
+                "doctest_namespace"
+            ).items():
+                globs[name] = value
+            self.dtest.globs.update(globs)
 
     def runtest(self) -> None:
+        assert self.dtest is not None
+        assert self.runner is not None
         _check_all_skipped(self.dtest)
         self._disable_output_capturing_for_darwin()
         failures: List["doctest.DocTestFailure"] = []
@@ -381,6 +375,7 @@ class DoctestItem(Item):
         return ReprFailDoctest(reprlocation_lines)
 
     def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
+        assert self.dtest is not None
         return self.path, self.dtest.lineno, "[doctest] %s" % self.name
 
 
@@ -400,8 +395,8 @@ def _get_flag_lookup() -> Dict[str, int]:
     )
 
 
-def get_optionflags(config: Config) -> int:
-    optionflags_str = config.getini("doctest_optionflags")
+def get_optionflags(parent):
+    optionflags_str = parent.config.getini("doctest_optionflags")
     flag_lookup_table = _get_flag_lookup()
     flag_acc = 0
     for flag in optionflags_str:
@@ -409,8 +404,8 @@ def get_optionflags(config: Config) -> int:
     return flag_acc
 
 
-def _get_continue_on_failure(config: Config) -> bool:
-    continue_on_failure: bool = config.getvalue("doctest_continue_on_failure")
+def _get_continue_on_failure(config):
+    continue_on_failure = config.getvalue("doctest_continue_on_failure")
     if continue_on_failure:
         # We need to turn off this if we use pdb since we should stop at
         # the first failure.
@@ -433,7 +428,7 @@ class DoctestTextfile(Module):
         name = self.path.name
         globs = {"__name__": "__main__"}
 
-        optionflags = get_optionflags(self.config)
+        optionflags = get_optionflags(self)
 
         runner = _get_runner(
             verbose=False,
@@ -541,23 +536,6 @@ class DoctestModule(Module):
                         tests, obj, name, module, source_lines, globs, seen
                     )
 
-            if sys.version_info < (3, 13):
-
-                def _from_module(self, module, object):
-                    """`cached_property` objects are never considered a part
-                    of the 'current module'. As such they are skipped by doctest.
-                    Here we override `_from_module` to check the underlying
-                    function instead. https://github.com/python/cpython/issues/107995
-                    """
-                    if isinstance(object, functools.cached_property):
-                        object = object.func
-
-                    # Type ignored because this is a private function.
-                    return super()._from_module(module, object)  # type: ignore[misc]
-
-            else:  # pragma: no cover
-                pass
-
         if self.path.name == "conftest.py":
             module = self.config.pluginmanager._importconftest(
                 self.path,
@@ -578,7 +556,7 @@ class DoctestModule(Module):
                     raise
         # Uses internal doctest module parsing mechanism.
         finder = MockAwareDocTestFinder()
-        optionflags = get_optionflags(self.config)
+        optionflags = get_optionflags(self)
         runner = _get_runner(
             verbose=False,
             optionflags=optionflags,
@@ -593,6 +571,22 @@ class DoctestModule(Module):
                 )
 
 
+def _setup_fixtures(doctest_item: DoctestItem) -> FixtureRequest:
+    """Used by DoctestTextfile and DoctestItem to setup fixture information."""
+
+    def func() -> None:
+        pass
+
+    doctest_item.funcargs = {}  # type: ignore[attr-defined]
+    fm = doctest_item.session._fixturemanager
+    doctest_item._fixtureinfo = fm.getfixtureinfo(  # type: ignore[attr-defined]
+        node=doctest_item, func=func, cls=None, funcargs=False
+    )
+    fixture_request = FixtureRequest(doctest_item, _ispytest=True)
+    fixture_request._fillfixtures()
+    return fixture_request
+
+
 def _init_checker_class() -> Type["doctest.OutputChecker"]:
     import doctest
     import re

src/_pytest/faulthandler.py

@@ -1,3 +1,4 @@
+import io
 import os
 import sys
 from typing import Generator
@@ -50,7 +51,7 @@ def get_stderr_fileno() -> int:
         if fileno == -1:
             raise AttributeError()
         return fileno
-    except (AttributeError, ValueError):
+    except (AttributeError, io.UnsupportedOperation):
         # pytest-xdist monkeypatches sys.stderr with an object that is not an actual file.
         # https://docs.python.org/3/library/faulthandler.html#issue-with-file-descriptors
         # This is potentially dangerous, but the best we can do.
@@ -61,8 +62,8 @@ def get_timeout_config_value(config: Config) -> float:
     return float(config.getini("faulthandler_timeout") or 0.0)
 
 
-@pytest.hookimpl(wrapper=True, trylast=True)
-def pytest_runtest_protocol(item: Item) -> Generator[None, object, object]:
+@pytest.hookimpl(hookwrapper=True, trylast=True)
+def pytest_runtest_protocol(item: Item) -> Generator[None, None, None]:
     timeout = get_timeout_config_value(item.config)
     if timeout > 0:
         import faulthandler
@@ -70,11 +71,11 @@ def pytest_runtest_protocol(item: Item) -> Generator[None, object, object]:
         stderr = item.config.stash[fault_handler_stderr_fd_key]
         faulthandler.dump_traceback_later(timeout, file=stderr)
         try:
-            return (yield)
+            yield
         finally:
             faulthandler.cancel_dump_traceback_later()
     else:
-        return (yield)
+        yield
 
 
 @pytest.hookimpl(tryfirst=True)

src/_pytest/helpconfig.py

@@ -2,7 +2,6 @@
 import os
 import sys
 from argparse import Action
-from typing import Generator
 from typing import List
 from typing import Optional
 from typing import Union
@@ -12,7 +11,6 @@ from _pytest.config import Config
 from _pytest.config import ExitCode
 from _pytest.config import PrintHelp
 from _pytest.config.argparsing import Parser
-from _pytest.terminal import TerminalReporter
 
 
 class HelpAction(Action):
@@ -99,9 +97,10 @@ def pytest_addoption(parser: Parser) -> None:
     )
 
 
-@pytest.hookimpl(wrapper=True)
-def pytest_cmdline_parse() -> Generator[None, Config, Config]:
-    config = yield
+@pytest.hookimpl(hookwrapper=True)
+def pytest_cmdline_parse():
+    outcome = yield
+    config: Config = outcome.get_result()
 
     if config.option.debug:
         # --debug | --debug <file.log> was provided.
@@ -129,8 +128,6 @@ def pytest_cmdline_parse() -> Generator[None, Config, Config]:
 
         config.add_cleanup(unset_tracing)
 
-    return config
-
 
 def showversion(config: Config) -> None:
     if config.option.version > 1:
@@ -162,10 +159,7 @@ def pytest_cmdline_main(config: Config) -> Optional[Union[int, ExitCode]]:
 def showhelp(config: Config) -> None:
     import textwrap
 
-    reporter: Optional[TerminalReporter] = config.pluginmanager.get_plugin(
-        "terminalreporter"
-    )
-    assert reporter is not None
+    reporter = config.pluginmanager.get_plugin("terminalreporter")
     tw = reporter._tw
     tw.write(config._parser.optparser.format_help())
     tw.line()

src/_pytest/hookspec.py

@@ -18,7 +18,7 @@ from _pytest.deprecated import WARNING_CMDLINE_PREPARSE_HOOK
 if TYPE_CHECKING:
     import pdb
     import warnings
-    from typing import Literal
+    from typing_extensions import Literal
 
     from _pytest._code.code import ExceptionRepr
     from _pytest._code.code import ExceptionInfo
@@ -60,7 +60,7 @@ def pytest_addhooks(pluginmanager: "PytestPluginManager") -> None:
     :param pytest.PytestPluginManager pluginmanager: The pytest plugin manager.
 
     .. note::
-        This hook is incompatible with hook wrappers.
+        This hook is incompatible with ``hookwrapper=True``.
     """
 
 
@@ -74,7 +74,7 @@ def pytest_plugin_registered(
     :param pytest.PytestPluginManager manager: pytest plugin manager.
 
     .. note::
-        This hook is incompatible with hook wrappers.
+        This hook is incompatible with ``hookwrapper=True``.
     """
 
 
@@ -113,7 +113,7 @@ def pytest_addoption(parser: "Parser", pluginmanager: "PytestPluginManager") ->
     attribute or can be retrieved as the ``pytestconfig`` fixture.
 
     .. note::
-        This hook is incompatible with hook wrappers.
+        This hook is incompatible with ``hookwrapper=True``.
     """
 
 
@@ -128,7 +128,7 @@ def pytest_configure(config: "Config") -> None:
     imported.
 
     .. note::
-        This hook is incompatible with hook wrappers.
+        This hook is incompatible with ``hookwrapper=True``.
 
     :param pytest.Config config: The pytest config object.
     """