docs

fix some_dir NameError
add type annotations
2023-10-19 18:31:45 +01:00 · 2023-10-19 18:29:24 +01:00 · 2023-10-19 18:29:11 +01:00 · 2023-10-19 18:25:56 +01:00 · 2023-10-19 18:25:43 +01:00 · 2023-10-19 18:23:36 +01:00
344 changed files with 7538 additions and 14823 deletions
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -23,11 +23,6 @@ afc607cfd81458d4e4f3b1f3cf8cc931b933907e
 5f95dce95602921a70bfbc7d8de2f7712c5e4505
 # ran pyupgrade-docs again
 75d0b899bbb56d6849e9d69d83a9426ed3f43f8b
+
 # move argument parser to own file
 c9df77cbd6a365dcb73c39618e4842711817e871
-# Replace reorder-python-imports by isort due to black incompatibility (#11896)
-8b54596639f41dfac070030ef20394b9001fe63c
-# Run blacken-docs with black's 2024's style
-4546d5445aaefe6a03957db028c263521dfb5c4b
-# Migration to ruff / ruff format
-4588653b2497ed25976b7aaff225b889fb476756
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,11 +19,6 @@ jobs:
      SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }}
    timeout-minutes: 10

-    # Required by attest-build-provenance-github.
-    permissions:
-      id-token: write
-      attestations: write
-
    steps:
    - uses: actions/checkout@v4
      with:
@@ -31,9 +26,7 @@ jobs:
        persist-credentials: false

    - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.5.0
-      with:
-        attest-build-provenance-github: 'true'
+      uses: hynek/build-and-inspect-python-package@v1.5

  deploy:
    if: github.repository == 'pytest-dev/pytest'
@@ -48,20 +41,20 @@ jobs:
    - uses: actions/checkout@v4

    - name: Download Package
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
      with:
        name: Packages
        path: dist

    - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.8.14
+      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 }} ${{ github.event.inputs.version }} ${{ github.sha }}
-        git push origin ${{ github.event.inputs.version }}
+        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:

@@ -79,14 +72,8 @@ jobs:
        fetch-depth: 0
        persist-credentials: false

-    - name: Download Package
-      uses: actions/download-artifact@v4
-      with:
-        name: Packages
-        path: dist
-
    - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
      with:
        python-version: "3.11"

@@ -95,14 +82,9 @@ jobs:
        python -m pip install --upgrade pip
        pip install --upgrade tox

-    - name: Generate release notes
+    - name: Publish GitHub release notes
+      env:
+        GH_RELEASE_NOTES_TOKEN: ${{ github.token }}
      run: |
        sudo apt-get install pandoc
-        tox -e generate-gh-release-notes -- ${{ github.event.inputs.version }} scripts/latest-release-notes.md
-
-    - name: Publish GitHub Release
-      uses: softprops/action-gh-release@v2
-      with:
-        body_path: scripts/latest-release-notes.md
-        files: dist/*
-        tag_name: ${{ github.event.inputs.version }}
+        tox -e publish-gh-release-notes
--- a/.github/workflows/prepare-release-pr.yml
+++ b/.github/workflows/prepare-release-pr.yml
@@ -32,7 +32,7 @@ jobs:
        fetch-depth: 0

    - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
      with:
        python-version: "3.8"

--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,14 +10,14 @@ jobs:
    permissions:
      issues: write
    steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
        with:
          debug-only: false
          days-before-issue-stale: 14
          days-before-issue-close: 7
          only-labels: "status: needs information"
          stale-issue-label: "stale"
-          stale-issue-message: "This issue is stale because it has the `status: needs information` label and requested follow-up information was not provided for 14 days."
-          close-issue-message: "This issue was closed because it has the `status: needs information` label and follow-up information has not been provided for 7 days since being marked as stale."
+          stale-issue-message: "This issue is stale because it has been open for 14 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale."
          days-before-pr-stale: -1
          days-before-pr-close: -1
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
        fetch-depth: 0
        persist-credentials: false
    - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.5.0
+      uses: hynek/build-and-inspect-python-package@v1.5

  build:
    needs: [package]
@@ -55,7 +55,6 @@ jobs:
          "windows-py310",
          "windows-py311",
          "windows-py312",
-          "windows-py313",

          "ubuntu-py38",
          "ubuntu-py38-pluggy",
@@ -64,14 +63,12 @@ jobs:
          "ubuntu-py310",
          "ubuntu-py311",
          "ubuntu-py312",
-          "ubuntu-py313",
          "ubuntu-pypy3",

          "macos-py38",
          "macos-py39",
          "macos-py310",
          "macos-py312",
-          "macos-py313",

          "doctesting",
          "plugins",
@@ -100,13 +97,9 @@ jobs:
            os: windows-latest
            tox_env: "py311"
          - name: "windows-py312"
-            python: "3.12"
+            python: "3.12-dev"
            os: windows-latest
            tox_env: "py312"
-          - name: "windows-py313"
-            python: "3.13-dev"
-            os: windows-latest
-            tox_env: "py313"

          - name: "ubuntu-py38"
            python: "3.8"
@@ -135,15 +128,10 @@ jobs:
            tox_env: "py311"
            use_coverage: true
          - name: "ubuntu-py312"
-            python: "3.12"
+            python: "3.12-dev"
            os: ubuntu-latest
            tox_env: "py312"
            use_coverage: true
-          - name: "ubuntu-py313"
-            python: "3.13-dev"
-            os: ubuntu-latest
-            tox_env: "py313"
-            use_coverage: true
          - name: "ubuntu-pypy3"
            python: "pypy-3.8"
            os: ubuntu-latest
@@ -163,16 +151,12 @@ jobs:
            os: macos-latest
            tox_env: "py310-xdist"
          - name: "macos-py312"
-            python: "3.12"
+            python: "3.12-dev"
            os: macos-latest
            tox_env: "py312-xdist"
-          - name: "macos-py313"
-            python: "3.13-dev"
-            os: macos-latest
-            tox_env: "py313-xdist"

          - name: "plugins"
-            python: "3.12"
+            python: "3.9"
            os: ubuntu-latest
            tox_env: "plugins"

@@ -189,13 +173,13 @@ jobs:
        persist-credentials: false

    - name: Download Package
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
      with:
        name: Packages
        path: dist

    - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
      with:
        python-version: ${{ matrix.python }}
        check-latest: ${{ endsWith(matrix.python, '-dev') }}
@@ -221,7 +205,7 @@ jobs:

    - name: Upload coverage to Codecov
      if: "matrix.use_coverage"
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v3
      continue-on-error: true
      with:
        fail_ci_if_error: true
--- a/.github/workflows/update-plugin-list.yml
+++ b/.github/workflows/update-plugin-list.yml
@@ -25,12 +25,12 @@ jobs:
          fetch-depth: 0

      - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
        with:
          python-version: "3.11"
          cache: pip
      - name: requests-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: ~/.cache/pytest-plugin-list/
          key: plugins-http-cache-${{ github.run_id }} # Can use time based key as well
@@ -46,7 +46,7 @@ jobs:
        run: python scripts/update-plugin-list.py

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@9153d834b60caba6d51c9b9510b087acf9f33f83
+        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
        with:
          commit-message: '[automated] Update plugin list'
          author: 'pytest bot <pytestbot@users.noreply.github.com>'
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ coverage.xml
 .settings
 .vscode
 __pycache__/
-.python-version

 # generated by pip
 pip-wheel-metadata/
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,16 @@
 repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.4.1"
-  hooks:
-    - id: ruff
-      args: ["--fix"]
-    - id: ruff-format
+-   repo: https://github.com/psf/black
+    rev: 23.9.1
+    hooks:
+    -   id: black
+        args: [--safe, --quiet]
+-   repo: https://github.com/asottile/blacken-docs
+    rev: 1.16.0
+    hooks:
+    -   id: blacken-docs
+        additional_dependencies: [black==23.7.0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v4.5.0
    hooks:
    -   id: trailing-whitespace
    -   id: end-of-file-fixer
@@ -16,47 +20,58 @@ repos:
    -   id: debug-statements
        exclude: _pytest/(debugging|hookspec).py
        language_version: python3
-   repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.16.0
+-   repo: https://github.com/PyCQA/autoflake
+    rev: v2.2.1
    hooks:
-    -   id: blacken-docs
-        additional_dependencies: [black==24.1.1]
+    -   id: autoflake
+        name: autoflake
+        args: ["--in-place", "--remove-unused-variables", "--remove-all-unused-imports"]
+        language: python
+        files: \.py$
+-   repo: https://github.com/PyCQA/flake8
+    rev: 6.1.0
+    hooks:
+    -   id: flake8
+        language_version: python3
+        additional_dependencies:
+          - flake8-typing-imports==1.12.0
+          - flake8-docstrings==1.5.0
+-   repo: https://github.com/asottile/reorder-python-imports
+    rev: v3.12.0
+    hooks:
+    -   id: reorder-python-imports
+        args: ['--application-directories=.:src', --py38-plus]
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+    -   id: pyupgrade
+        args: [--py38-plus]
+-   repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v2.5.0
+    hooks:
+    -   id: setup-cfg-fmt
+        args: ["--max-py-version=3.12", "--include-version-classifiers"]
 -   repo: https://github.com/pre-commit/pygrep-hooks
    rev: v1.10.0
    hooks:
    -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.5.1
    hooks:
    -   id: mypy
-        files: ^(src/|testing/|scripts/)
+        files: ^(src/|testing/)
        args: []
        additional_dependencies:
          - iniconfig>=1.1.0
          - attrs>=19.2.0
-          - pluggy>=1.5.0
          - packaging
          - tomli
          - types-pkg_resources
-          - types-tabulate
            # for mypy running on python>=3.11 since exceptiongroup is only a dependency
            # on <3.11
          - exceptiongroup>=1.0.0rc8
- repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "1.8.0"
-  hooks:
-    - id: pyproject-fmt
-      # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
-      additional_dependencies: ["tox>=4.9"]
 -   repo: local
    hooks:
-    - id: pylint
-      name: pylint
-      entry: pylint
-      language: system
-      types: [python]
-      args: ["-rn", "-sn", "--fail-on=I"]
-      stages: [manual]
    -   id: rst
        name: rst
        entry: rst-lint --encoding utf-8
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -9,10 +9,6 @@ python:
       path: .
     - requirements: doc/en/requirements.txt

-sphinx:
-  configuration: doc/en/conf.py
-  fail_on_warning: true
-
 build:
  os: ubuntu-20.04
  tools:
--- a/26
+++ b/26
@@ -36,7 +36,6 @@ Andrey Paramonov
 Andrzej Klajnert
 Andrzej Ostrowski
 Andy Freeland
-Anita Hammer
 Anthon van der Neut
 Anthony Shaw
 Anthony Sottile
@@ -49,18 +48,14 @@ Ariel Pillemer
 Armin Rigo
 Aron Coyle
 Aron Curzon
-Arthur Richard
 Ashish Kurmi
 Aviral Verma
 Aviv Palivoda
 Babak Keyvani
 Barney Gale
-Ben Brown
 Ben Gartner
-Ben Leith
 Ben Webb
 Benjamin Peterson
-Benjamin Schubert
 Bernard Pratz
 Bo Wu
 Bob Ippolito
@@ -95,14 +90,12 @@ Christopher Dignam
 Christopher Gilling
 Claire Cecil
 Claudio Madotto
-Clément M.T. Robert
 CrazyMerlyn
 Cristian Vera
 Cyrus Maden
 Damian Skrzypczak
 Daniel Grana
 Daniel Hahler
-Daniel Miller
 Daniel Nuri
 Daniel Sánchez Castelló
 Daniel Valenzuela Zenteno
@@ -120,7 +113,6 @@ Daw-Ran Liou
 Debi Mishra
 Denis Kirisov
 Denivy Braiam Rück
-Dheeraj C K
 Dhiren Serai
 Diego Russo
 Dmitry Dygalo
@@ -131,8 +123,6 @@ Edison Gustavo Muenz
 Edoardo Batini
 Edson Tadeu M. Manoel
 Eduardo Schettino
-Edward Haigh
-Eero Vaher
 Eli Boyarski
 Elizaveta Shashkova
 Éloi Rivard
@@ -140,16 +130,13 @@ Endre Galaczi
 Eric Hunsberger
 Eric Liu
 Eric Siegerman
-Eric Yuan
 Erik Aronesty
 Erik Hasse
 Erik M. Bray
 Evan Kepner
 Evgeny Seliverstov
-Fabian Sturm
 Fabien Zarifian
 Fabio Zadrozny
-faph
 Felix Hofstätter
 Felix Nieuwenhuizen
 Feng Ma
@@ -200,7 +187,6 @@ Javier Romero
 Jeff Rackauckas
 Jeff Widman
 Jenni Rinker
-Jens Tröger
 John Eddie Ayson
 John Litborn
 John Towler
@@ -239,7 +225,6 @@ Kyle Altendorf
 Lawrence Mitchell
 Lee Kamentsky
 Lev Maximov
-Levon Saldamli
 Lewis Cowles
 Llandy Riveron Del Risco
 Loic Esteve
@@ -254,7 +239,6 @@ Marc Mueller
 Marc Schlaich
 Marcelo Duarte Trevisani
 Marcin Bachry
-Marc Bresson
 Marco Gorelli
 Mark Abramowitz
 Mark Dickinson
@@ -279,7 +263,6 @@ Michael Goerz
 Michael Krebs
 Michael Seifert
 Michal Wajszczuk
-Michał Górny
 Michał Zięba
 Mickey Pashov
 Mihai Capotă
@@ -288,11 +271,9 @@ Mike Hoyle (hoylemd)
 Mike Lundy
 Milan Lesnek
 Miro Hrončok
-mrbean-bremen
 Nathaniel Compton
 Nathaniel Waisbrot
 Ned Batchelder
-Neil Martin
 Neven Mundar
 Nicholas Devenish
 Nicholas Murphy
@@ -310,7 +291,6 @@ Ondřej Súkup
 Oscar Benjamin
 Parth Patel
 Patrick Hayes
-Patrick Lannigan
 Paul Müller
 Paul Reece
 Pauli Virtanen
@@ -323,7 +303,6 @@ Pierre Sassoulas
 Pieter Mulder
 Piotr Banaszkiewicz
 Piotr Helm
-Poulami Sau
 Prakhar Gurunani
 Prashant Anand
 Prashant Sharma
@@ -351,7 +330,6 @@ Ronny Pfannschmidt
 Ross Lawley
 Ruaridh Williamson
 Russel Winder
-Russell Martin
 Ryan Puddephatt
 Ryan Wooden
 Sadra Barikbin
@@ -359,7 +337,6 @@ Saiprasad Kale
 Samuel Colvin
 Samuel Dion-Girardeau
 Samuel Searles-Bryant
-Samuel Therrien (Avasam)
 Samuele Pedroni
 Sanket Duthade
 Sankt Petersbug
@@ -426,7 +403,6 @@ Vivaan Verma
 Vlad Dragos
 Vlad Radziuk
 Vladyslav Rachek
-Volodymyr Kochetkov
 Volodymyr Piskun
 Wei Lin
 Wil Cooley
@@ -437,11 +413,9 @@ Xixi Zhao
 Xuan Luong
 Xuecong Liao
 Yannick Péroux
-Yao Xiao
 Yoav Caspi
 Yuliang Shao
 Yusuke Kadowaki
-Yutian Li
 Yuval Shimon
 Zac Hatfield-Dodds
 Zachary Kneupper
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -199,7 +199,7 @@ Short version
 #. Fork the repository.
 #. Fetch tags from upstream if necessary (if you cloned only main `git fetch --tags https://github.com/pytest-dev/pytest`).
 #. Enable and install `pre-commit <https://pre-commit.com>`_ to ensure style-guides and code checks are followed.
-#. Follow `PEP-8 <https://www.python.org/dev/peps/pep-0008/>`_ for naming.
+#. Follow **PEP-8** for naming and `black <https://github.com/psf/black>`_ for formatting.
 #. Tests are run using ``tox``::

    tox -e linting,py39
@@ -282,7 +282,7 @@ Here is a simple overview, with pytest-specific bits:
   This command will run tests via the "tox" tool against Python 3.9
   and also perform "lint" coding-style checks.

-#. You can now edit your local working copy and run the tests again as necessary. Please follow `PEP-8 <https://www.python.org/dev/peps/pep-0008/>`_ for naming.
+#. You can now edit your local working copy and run the tests again as necessary. Please follow PEP-8 for naming.

   You can pass different options to ``tox``. For example, to run tests on Python 3.9 and pass options to pytest
   (e.g. enter pdb on failure) to pytest you can do::
@@ -297,12 +297,12 @@ Here is a simple overview, with pytest-specific bits:
   When committing, ``pre-commit`` will re-format the files if necessary.

 #. If instead of using ``tox`` you prefer to run the tests directly, then we suggest to create a virtual environment and use
-   an editable install with the ``dev`` extra::
+   an editable install with the ``testing`` extra::

       $ python3 -m venv .venv
       $ source .venv/bin/activate  # Linux
       $ .venv/Scripts/activate.bat  # Windows
-       $ pip install -e ".[dev]"
+       $ pip install -e ".[testing]"

   Afterwards, you can edit the files and run pytest normally::

--- a/README.rst
+++ b/README.rst
@@ -20,13 +20,16 @@
    :target: https://codecov.io/gh/pytest-dev/pytest
    :alt: Code coverage Status

-.. image:: https://github.com/pytest-dev/pytest/actions/workflows/test.yml/badge.svg
+.. image:: https://github.com/pytest-dev/pytest/workflows/test/badge.svg
    :target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Atest

 .. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
   :target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/main
   :alt: pre-commit.ci status

+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/psf/black
+
 .. image:: https://www.codetriage.com/pytest-dev/pytest/badges/users.svg
    :target: https://www.codetriage.com/pytest-dev/pytest

@@ -94,12 +97,12 @@ Features
 - `Modular fixtures <https://docs.pytest.org/en/stable/explanation/fixtures.html>`_ for
  managing small or parametrized long-lived test resources

- Can run `unittest <https://docs.pytest.org/en/stable/how-to/unittest.html>`_ (or trial)
-  test suites out of the box
+- 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

- Rich plugin architecture, with over 1300+ `external plugins <https://docs.pytest.org/en/latest/reference/plugin_list.html>`_ and thriving community
+- Rich plugin architecture, with over 850+ `external plugins <https://docs.pytest.org/en/latest/reference/plugin_list.html>`_ and thriving community


 Documentation
--- a/TIDELIFT.rst
+++ b/TIDELIFT.rst
@@ -23,9 +23,9 @@ members of the `contributors team`_ interested in receiving funding.

 The current list of contributors receiving funding are:

+* `@asottile`_
 * `@nicoddemus`_
 * `@The-Compiler`_
-* `@RonnyPfannschmidt`_

 Contributors interested in receiving a part of the funds just need to submit a PR adding their
 name to the list. Contributors that want to stop receiving the funds should also submit a PR
@@ -55,6 +55,6 @@ funds. Just drop a line to one of the `@pytest-dev/tidelift-admins`_ or use the
 .. _`@pytest-dev/tidelift-admins`: https://github.com/orgs/pytest-dev/teams/tidelift-admins/members
 .. _`agreement`: https://tidelift.com/docs/lifting/agreement

+.. _`@asottile`: https://github.com/asottile
 .. _`@nicoddemus`: https://github.com/nicoddemus
 .. _`@The-Compiler`: https://github.com/The-Compiler
-.. _`@RonnyPfannschmidt`: https://github.com/RonnyPfannschmidt
--- a/bench/bench.py
+++ b/bench/bench.py
@@ -1,12 +1,10 @@
 import sys

-
 if __name__ == "__main__":
    import cProfile
+    import pytest  # NOQA
    import pstats

-    import pytest  # noqa: F401
-
    script = sys.argv[1:] if len(sys.argv) > 1 else ["empty.py"]
    cProfile.run("pytest.cmdline.main(%r)" % script, "prof")
    p = pstats.Stats("prof")
--- a/bench/bench_argcomplete.py
+++ b/bench/bench_argcomplete.py
@@ -4,7 +4,6 @@
 # FastFilesCompleter    0.7383    1.0760
 import timeit

-
 imports = [
    "from argcomplete.completers import FilesCompleter as completer",
    "from _pytest._argcomplete import FastFilesCompleter as completer",
--- a/bench/skip.py
+++ b/bench/skip.py
@@ -1,6 +1,5 @@
 import pytest

-
 SKIP = True


--- a/bench/unit_test.py
+++ b/bench/unit_test.py
@@ -1,6 +1,5 @@
 from unittest import TestCase  # noqa: F401

-
 for i in range(15000):
    exec(
        f"""
--- a/changelog/10441.feature.rst
+++ b/changelog/10441.feature.rst
@@ -0,0 +1,2 @@
+Added :func:`ExceptionInfo.group_contains() <pytest.ExceptionInfo.group_contains>`, an assertion
+helper that tests if an `ExceptionGroup` contains a matching exception.
--- a/changelog/10447.bugfix.rst
+++ b/changelog/10447.bugfix.rst
@@ -0,0 +1,2 @@
+markers are now considered in the reverse mro order to ensure base  class markers are considered first
+this resolves a regression.
--- a/changelog/10465.deprecation.rst
+++ b/changelog/10465.deprecation.rst
@@ -0,0 +1 @@
+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.
--- a/changelog/10617.feature.rst
+++ b/changelog/10617.feature.rst
@@ -0,0 +1,2 @@
+Added more comprehensive set assertion rewrites for comparisons other than equality ``==``, with
+the following operations now providing better failure messages: ``!=``, ``<=``, ``>=``, ``<``, and ``>``.
--- a/changelog/10701.bugfix.rst
+++ b/changelog/10701.bugfix.rst
@@ -0,0 +1,2 @@
+: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.
--- a/changelog/11011.doc.rst
+++ b/changelog/11011.doc.rst
@@ -0,0 +1 @@
+Added a warning about modifying the root logger during tests when using ``caplog``.
--- a/changelog/11091.doc.rst
+++ b/changelog/11091.doc.rst
@@ -0,0 +1 @@
+Updated documentation and tests to refer to hyphonated options: replaced ``--junitxml`` with ``--junit-xml`` and ``--collectonly`` with ``--collect-only``.
--- a/changelog/11122.improvement.rst
+++ b/changelog/11122.improvement.rst
@@ -0,0 +1,6 @@
+``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.
--- a/changelog/11137.breaking.rst
+++ b/changelog/11137.breaking.rst
@@ -0,0 +1,11 @@
+: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).
--- a/changelog/11146.bugfix.rst
+++ b/changelog/11146.bugfix.rst
@@ -0,0 +1 @@
+- Prevent constants at the top of file from being detected as docstrings.
--- a/changelog/11151.breaking.rst
+++ b/changelog/11151.breaking.rst
@@ -0,0 +1 @@
+Dropped support for Python 3.7, which `reached end-of-life on 2023-06-27 <https://devguide.python.org/versions/>`__.
--- a/changelog/11208.trivial.rst
+++ b/changelog/11208.trivial.rst
@@ -0,0 +1,2 @@
+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.
--- a/changelog/11216.improvement.rst
+++ b/changelog/11216.improvement.rst
@@ -0,0 +1 @@
+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.
--- a/changelog/11218.trivial.rst
+++ b/changelog/11218.trivial.rst
@@ -0,0 +1,5 @@
+(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.
--- a/changelog/11227.improvement.rst
+++ b/changelog/11227.improvement.rst
@@ -0,0 +1 @@
+Allow :func:`pytest.raises` ``match`` argument to match against `PEP-678 <https://peps.python.org/pep-0678/>` ``__notes__``.
--- a/changelog/11239.bugfix.rst
+++ b/changelog/11239.bugfix.rst
@@ -0,0 +1 @@
+Fixed ``:=`` in asserts impacting unrelated test cases.
--- a/changelog/11255.bugfix.rst
+++ b/changelog/11255.bugfix.rst
@@ -0,0 +1 @@
+Fixed crash on `parametrize(..., scope="package")` without a package present.
--- a/changelog/11277.bugfix.rst
+++ b/changelog/11277.bugfix.rst
@@ -0,0 +1,2 @@
+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.
--- a/changelog/11314.improvement.rst
+++ b/changelog/11314.improvement.rst
@@ -0,0 +1,2 @@
+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.
--- a/changelog/11315.trivial.rst
+++ b/changelog/11315.trivial.rst
@@ -0,0 +1,3 @@
+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.
--- a/changelog/11333.trivial.rst
+++ b/changelog/11333.trivial.rst
@@ -0,0 +1,2 @@
+Corrected the spelling of ``Config.ArgsSource.INVOCATION_DIR``.
+The previous spelling ``INCOVATION_DIR`` remains as an alias.
--- a/changelog/11353.trivial.rst
+++ b/changelog/11353.trivial.rst
@@ -0,0 +1 @@
+pluggy>=1.3.0 is now required. This adds typing to :class:`~pytest.PytestPluginManager`.
--- a/changelog/11439.bugfix.rst
+++ b/changelog/11439.bugfix.rst
@@ -0,0 +1 @@
+Handle an edge case where :data:`sys.stderr` might already be closed when :ref:`faulthandler` is tearing down.
--- a/changelog/11447.improvement.rst
+++ b/changelog/11447.improvement.rst
@@ -0,0 +1 @@
+:func:`pytest.deprecated_call` now also considers warnings of type :class:`FutureWarning`.
--- a/changelog/11456.bugfix.rst
+++ b/changelog/11456.bugfix.rst
@@ -0,0 +1,4 @@
+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.
--- a/changelog/3664.deprecation.rst
+++ b/changelog/3664.deprecation.rst
@@ -0,0 +1,3 @@
+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.
--- a/changelog/7363.breaking.rst
+++ b/changelog/7363.breaking.rst
@@ -0,0 +1,22 @@
+**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`.
--- a/changelog/7469.feature.rst
+++ b/changelog/7469.feature.rst
@@ -0,0 +1 @@
+:class:`~pytest.FixtureDef` is now exported as ``pytest.FixtureDef`` for typing purposes.
--- a/changelog/7966.bugfix.rst
+++ b/changelog/7966.bugfix.rst
@@ -0,0 +1 @@
+Removes unhelpful error message from assertion rewrite mechanism when exceptions raised in __iter__ methods, and instead treats them as un-iterable.
--- a/changelog/8976.breaking.rst
+++ b/changelog/8976.breaking.rst
@@ -0,0 +1,5 @@
+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`.
--- a/changelog/9036.bugfix.rst
+++ b/changelog/9036.bugfix.rst
@@ -0,0 +1 @@
+``pytest.warns`` and similar functions now capture warnings when an exception is raised inside a ``with`` block.
--- a/changelog/9288.breaking.rst
+++ b/changelog/9288.breaking.rst
@@ -0,0 +1,7 @@
+: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.
--- a/doc/en/_templates/slim_searchbox.html
+++ b/doc/en/_templates/slim_searchbox.html
@@ -5,10 +5,11 @@
 <div id="searchbox" style="display: none" role="search">
  <div class="searchformwrapper">
    <form class="search" action="{{ pathto('search') }}" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"/>
+      <input type="text" name="q" aria-labelledby="searchlabel"
+        placeholder="Search"/>
      <input type="submit" value="{{ _('Go') }}" />
    </form>
  </div>
 </div>
-<script>document.getElementById('searchbox').style.display = "block"</script>
+<script type="text/javascript">$('#searchbox').show(0);</script>
 {%- endif %}
--- a/doc/en/adopt.rst
+++ b/doc/en/adopt.rst
@@ -44,7 +44,7 @@ Partner projects, sign up here! (by 22 March)
 What does it mean to "adopt pytest"?
 -----------------------------------------

-There can be many different definitions of "success". Pytest can run many unittest_ tests by default, so using pytest as your testrunner may be possible from day 1. Job done, right?
+There can be many different definitions of "success". Pytest can run many nose_ and unittest_ tests by default, so using pytest as your testrunner may be possible from day 1. Job done, right?

 Progressive success might look like:

@@ -62,6 +62,7 @@ Progressive success might look like:

 It may be after the month is up, the partner project decides that pytest is not right for it. That's okay - hopefully the pytest team will also learn something about its weaknesses or deficiencies.

+.. _nose: nose.html
 .. _unittest: unittest.html
 .. _assert: assert.html
 .. _pycmd: https://bitbucket.org/hpk42/pycmd/overview
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,18 +6,6 @@ Release announcements
   :maxdepth: 2


-   release-8.2.1
-   release-8.2.0
-   release-8.1.2
-   release-8.1.1
-   release-8.1.0
-   release-8.0.2
-   release-8.0.1
-   release-8.0.0
-   release-8.0.0rc2
-   release-8.0.0rc1
-   release-7.4.4
-   release-7.4.3
   release-7.4.2
   release-7.4.1
   release-7.4.0
--- a/doc/en/announce/release-2.0.0.rst
+++ b/doc/en/announce/release-2.0.0.rst
@@ -62,7 +62,7 @@ New Features
 - new "-q" option which decreases verbosity and prints a more
  nose/unittest-style "dot" output.

- many, many, more detailed improvements details
+- many many more detailed improvements details

 Fixes
 -----------------------
@@ -109,7 +109,7 @@ Important Notes
    in conftest.py files.  They will cause nothing special.
  - removed support for calling the pre-1.0 collection API of "run()" and "join"
  - removed reading option values from conftest.py files or env variables.
-    This can now be done much, much, better and easier through the ini-file
+    This can now be done much much better and easier through the ini-file
    mechanism and the "addopts" entry in particular.
  - removed the "disabled" attribute in test classes.  Use the skipping
    and pytestmark mechanism to skip or xfail a test class.
--- a/doc/en/announce/release-2.2.2.rst
+++ b/doc/en/announce/release-2.2.2.rst
@@ -4,7 +4,7 @@ pytest-2.2.2: bug fixes
 pytest-2.2.2 (updated to 2.2.3 to fix packaging issues) is a minor
 backward-compatible release of the versatile py.test testing tool.   It
 contains bug fixes and a few refinements particularly to reporting with
-"--collectonly", see below for details.
+"--collectonly", see below for betails.

 For general information see here:

--- a/doc/en/announce/release-2.4.0.rst
+++ b/doc/en/announce/release-2.4.0.rst
@@ -181,7 +181,7 @@ Bug fixes:
  partially failed (finalizers would not always be called before)

 - fix issue320 - fix class scope for fixtures when mixed with
-  module-level functions.  Thanks Anatoly Bubenkoff.
+  module-level functions.  Thanks Anatloy Bubenkoff.

 - you can specify "-q" or "-qq" to get different levels of "quieter"
  reporting (thanks Katarzyna Jachim)
--- a/doc/en/announce/release-2.5.0.rst
+++ b/doc/en/announce/release-2.5.0.rst
@@ -83,7 +83,7 @@ holger krekel
  Thanks Ralph Schmitt for the precise failure example.

 - fix issue244 by implementing special index for parameters to only use
-  indices for parametrized test ids
+  indices for paramentrized test ids

 - fix issue287 by running all finalizers but saving the exception
  from the first failing finalizer and re-raising it so teardown will
--- a/doc/en/announce/release-2.6.0.rst
+++ b/doc/en/announce/release-2.6.0.rst
@@ -73,7 +73,7 @@ holger krekel
 - cleanup setup.py a bit and specify supported versions. Thanks Jurko
  Gospodnetic for the PR.

- change XPASS colour to yellow rather than red when tests are run
+- change XPASS colour to yellow rather then red when tests are run
  with -v.

 - fix issue473: work around mock putting an unbound method into a class
--- a/doc/en/announce/release-2.7.0.rst
+++ b/doc/en/announce/release-2.7.0.rst
@@ -55,7 +55,7 @@ holger krekel
  github.  See https://pytest.org/en/stable/contributing.html .
  Thanks to Anatoly for pushing and initial work on this.

- fix issue650: new option ``--doctest-ignore-import-errors`` which
+- fix issue650: new option ``--docttest-ignore-import-errors`` which
  will turn import errors in doctests into skips.  Thanks Charles Cloud
  for the complete PR.

--- a/doc/en/announce/release-7.4.3.rst
+++ b/doc/en/announce/release-7.4.3.rst
@@ -1,19 +0,0 @@
-pytest-7.4.3
-=======================================
-
-pytest 7.4.3 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Marc Mueller
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-7.4.4.rst
+++ b/doc/en/announce/release-7.4.4.rst
@@ -1,20 +0,0 @@
-pytest-7.4.4
-=======================================
-
-pytest 7.4.4 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Ran Benita
-* Zac Hatfield-Dodds
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.0.0.rst
+++ b/doc/en/announce/release-8.0.0.rst
@@ -1,26 +0,0 @@
-pytest-8.0.0
-=======================================
-
-The pytest team is proud to announce the 8.0.0 release!
-
-This release contains new features, improvements, bug fixes, and breaking changes, so users
-are encouraged to take a look at the CHANGELOG carefully:
-
-    https://docs.pytest.org/en/stable/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/stable/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.0.0rc1.rst
+++ b/doc/en/announce/release-8.0.0rc1.rst
@@ -1,82 +0,0 @@
-pytest-8.0.0rc1
-=======================================
-
-The pytest team is proud to announce the 8.0.0rc1 release!
-
-This release contains new features, improvements, bug fixes, and breaking changes, so users
-are encouraged to take a look at the CHANGELOG carefully:
-
-    https://docs.pytest.org/en/stable/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/stable/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all of the contributors to this release:
-
-* Akhilesh Ramakrishnan
-* Aleksandr Brodin
-* Anthony Sottile
-* Arthur Richard
-* Avasam
-* Benjamin Schubert
-* Bruno Oliveira
-* Carsten Grohmann
-* Cheukting
-* Chris Mahoney
-* Christoph Anton Mitterer
-* DetachHead
-* Erik Hasse
-* Florian Bruhin
-* Fraser Stark
-* Ha Pam
-* Hugo van Kemenade
-* Isaac Virshup
-* Israel Fruchter
-* Jens Tröger
-* Jon Parise
-* Kenny Y
-* Lesnek
-* Marc Mueller
-* Michał Górny
-* Mihail Milushev
-* Milan Lesnek
-* Miro Hrončok
-* Patrick Lannigan
-* Ran Benita
-* Reagan Lee
-* Ronny Pfannschmidt
-* Sadra Barikbin
-* Sean Malloy
-* Sean Patrick Malloy
-* Sharad Nair
-* Simon Blanchard
-* Sourabh Beniwal
-* Stefaan Lippens
-* Tanya Agarwal
-* Thomas Grainger
-* Tom Mortimer-Jones
-* Tushar Sadhwani
-* Tyler Smart
-* Uday Kumar
-* Warren Markham
-* WarrenTheRabbit
-* Zac Hatfield-Dodds
-* Ziad Kermadi
-* akhilramkee
-* antosikv
-* bowugit
-* mickeypash
-* neilmartin2000
-* pomponchik
-* ryanpudd
-* touilleWoman
-* ubaumann
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.0.0rc2.rst
+++ b/doc/en/announce/release-8.0.0rc2.rst
@@ -1,32 +0,0 @@
-pytest-8.0.0rc2
-=======================================
-
-The pytest team is proud to announce the 8.0.0rc2 prerelease!
-
-This is a prerelease, not intended for production use, but to test the upcoming features and improvements
-in order to catch any major problems before the final version is released to the major public.
-
-We appreciate your help testing this out before the final release, making sure to report any
-regressions to our issue tracker:
-
-https://github.com/pytest-dev/pytest/issues
-
-When doing so, please include the string ``[prerelease]`` in the title.
-
-You can upgrade from PyPI via:
-
-    pip install pytest==8.0.0rc2
-
-Users are encouraged to take a look at the CHANGELOG carefully:
-
-    https://docs.pytest.org/en/release-8.0.0rc2/changelog.html
-
-Thanks to all the contributors to this release:
-
-* Ben Brown
-* Bruno Oliveira
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.0.1.rst
+++ b/doc/en/announce/release-8.0.1.rst
@@ -1,21 +0,0 @@
-pytest-8.0.1
-=======================================
-
-pytest 8.0.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
-* Clément Robert
-* Pierre Sassoulas
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.0.2.rst
+++ b/doc/en/announce/release-8.0.2.rst
@@ -1,18 +0,0 @@
-pytest-8.0.2
-=======================================
-
-pytest 8.0.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:
-
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.1.0.rst
+++ b/doc/en/announce/release-8.1.0.rst
@@ -1,54 +0,0 @@
-pytest-8.1.0
-=======================================
-
-The pytest team is proud to announce the 8.1.0 release!
-
-This release contains new features, improvements, and bug fixes,
-the full list of changes is available in the changelog:
-
-    https://docs.pytest.org/en/stable/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/stable/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all of the contributors to this release:
-
-* Ben Brown
-* Ben Leith
-* Bruno Oliveira
-* Clément Robert
-* Dave Hall
-* Dương Quốc Khánh
-* Eero Vaher
-* Eric Larson
-* Fabian Sturm
-* Faisal Fawad
-* Florian Bruhin
-* Franck Charras
-* Joachim B Haga
-* John Litborn
-* Loïc Estève
-* Marc Bresson
-* Patrick Lannigan
-* Pierre Sassoulas
-* Ran Benita
-* Reagan Lee
-* Ronny Pfannschmidt
-* Russell Martin
-* clee2000
-* donghui
-* faph
-* jakkdl
-* mrbean-bremen
-* robotherapist
-* whysage
-* woutdenolf
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.1.1.rst
+++ b/doc/en/announce/release-8.1.1.rst
@@ -1,18 +0,0 @@
-pytest-8.1.1
-=======================================
-
-pytest 8.1.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:
-
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.1.2.rst
+++ b/doc/en/announce/release-8.1.2.rst
@@ -1,18 +0,0 @@
-pytest-8.1.2
-=======================================
-
-pytest 8.1.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
--- a/doc/en/announce/release-8.2.0.rst
+++ b/doc/en/announce/release-8.2.0.rst
@@ -1,43 +0,0 @@
-pytest-8.2.0
-=======================================
-
-The pytest team is proud to announce the 8.2.0 release!
-
-This release contains new features, improvements, and bug fixes,
-the full list of changes is available in the changelog:
-
-    https://docs.pytest.org/en/stable/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/stable/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all of the contributors to this release:
-
-* Bruno Oliveira
-* Daniel Miller
-* Florian Bruhin
-* HolyMagician03-UMich
-* John Litborn
-* Levon Saldamli
-* Linghao Zhang
-* Manuel López-Ibáñez
-* Pierre Sassoulas
-* Ran Benita
-* Ronny Pfannschmidt
-* Sebastian Meyer
-* Shekhar verma
-* Tamir Duberstein
-* Tobias Stoeckmann
-* dj
-* jakkdl
-* poulami-sau
-* tserg
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/release-8.2.1.rst
+++ b/doc/en/announce/release-8.2.1.rst
@@ -1,19 +0,0 @@
-pytest-8.2.1
-=======================================
-
-pytest 8.2.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
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team
--- a/doc/en/announce/sprint2016.rst
+++ b/doc/en/announce/sprint2016.rst
@@ -49,7 +49,7 @@ place on 20th, 21st, 22nd, 24th and 25th. On the 23rd we took a break
 day for some hot hiking in the Black Forest.

 Sprint activity was organised heavily around pairing, with plenty of group
-discussions to take advantage of the high bandwidth, and lightning talks
+discusssions to take advantage of the high bandwidth, and lightning talks
 as well.


--- a/doc/en/backwards-compatibility.rst
+++ b/doc/en/backwards-compatibility.rst
@@ -22,7 +22,7 @@ b) transitional: the old and new API don't conflict

   We will only start the removal of deprecated functionality in major releases (e.g. if we deprecate something in 3.0 we will start to remove it in 4.0), and keep it around for at least two minor releases (e.g. if we deprecate something in 3.9 and 4.0 is the next release, we start to remove it in 5.0, not in 4.0).

-   A deprecated feature scheduled to be removed in major version X will use the warning class `PytestRemovedInXWarning` (a subclass of :class:`~pytest.PytestDeprecationWarning`).
+   A deprecated feature scheduled to be removed in major version X will use the warning class `PytestRemovedInXWarning` (a subclass of :class:`~pytest.PytestDeprecationwarning`).

   When the deprecation expires (e.g. 4.0 is released), we won't remove the deprecated functionality immediately, but will use the standard warning filters to turn `PytestRemovedInXWarning` (e.g. `PytestRemovedIn4Warning`) into **errors** by default. This approach makes it explicit that removal is imminent, and still gives you time to turn the deprecated feature into a warning instead of an error so it can be dealt with in your own time. In the next minor release (e.g. 4.1), the feature will be effectively removed.

--- a/doc/en/builtin.rst
+++ b/doc/en/builtin.rst
@@ -18,11 +18,11 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a

    $ pytest  --fixtures -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collected 0 items
-    cache -- .../_pytest/cacheprovider.py:549
+    cache -- .../_pytest/cacheprovider.py:532
        Return a cache object that can persist state between testing sessions.

        cache.get(key, default)
@@ -33,7 +33,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a

        Values can be any object handled by the json stdlib module.

-    capsysbinary -- .../_pytest/capture.py:1003
+    capsysbinary -- .../_pytest/capture.py:1001
        Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.

        The captured output is made available via ``capsysbinary.readouterr()``
@@ -43,6 +43,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        Returns an instance of :class:`CaptureFixture[bytes] <pytest.CaptureFixture>`.

        Example:
+
        .. code-block:: python

            def test_output(capsysbinary):
@@ -50,7 +51,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                captured = capsysbinary.readouterr()
                assert captured.out == b"hello\n"

-    capfd -- .../_pytest/capture.py:1030
+    capfd -- .../_pytest/capture.py:1029
        Enable text capturing of writes to file descriptors ``1`` and ``2``.

        The captured output is made available via ``capfd.readouterr()`` method
@@ -60,6 +61,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        Returns an instance of :class:`CaptureFixture[str] <pytest.CaptureFixture>`.

        Example:
+
        .. code-block:: python

            def test_system_echo(capfd):
@@ -77,6 +79,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        Returns an instance of :class:`CaptureFixture[bytes] <pytest.CaptureFixture>`.

        Example:
+
        .. code-block:: python

            def test_system_echo(capfdbinary):
@@ -84,7 +87,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                captured = capfdbinary.readouterr()
                assert captured.out == b"hello\n"

-    capsys -- .../_pytest/capture.py:976
+    capsys -- .../_pytest/capture.py:973
        Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.

        The captured output is made available via ``capsys.readouterr()`` method
@@ -94,6 +97,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        Returns an instance of :class:`CaptureFixture[str] <pytest.CaptureFixture>`.

        Example:
+
        .. code-block:: python

            def test_output(capsys):
@@ -101,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:738
+    doctest_namespace [session scope] -- .../_pytest/doctest.py:757
        Fixture that returns a :py:class:`dict` that will be injected into the
        namespace of doctests.

@@ -115,7 +119,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a

        For more details: :ref:`doctest_namespace`.

-    pytestconfig [session scope] -- .../_pytest/fixtures.py:1335
+    pytestconfig [session scope] -- .../_pytest/fixtures.py:1353
        Session-scoped fixture that returns the session's :class:`pytest.Config`
        object.

@@ -125,7 +129,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                if pytestconfig.getoption("verbose") > 0:
                    ...

-    record_property -- .../_pytest/junitxml.py:284
+    record_property -- .../_pytest/junitxml.py:282
        Add extra properties to the calling test.

        User properties become part of the test report and are available to the
@@ -139,13 +143,13 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
            def test_function(record_property):
                record_property("example_key", 1)

-    record_xml_attribute -- .../_pytest/junitxml.py:307
+    record_xml_attribute -- .../_pytest/junitxml.py:305
        Add extra xml attributes to the tag for the calling test.

        The fixture is callable with ``name, value``. The value is
        automatically XML-encoded.

-    record_testsuite_property [session scope] -- .../_pytest/junitxml.py:345
+    record_testsuite_property [session scope] -- .../_pytest/junitxml.py:343
        Record a new ``<property>`` tag as child of the root ``<testsuite>``.

        This is suitable to writing global information regarding the entire test
@@ -170,18 +174,18 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
            `pytest-xdist <https://github.com/pytest-dev/pytest-xdist>`__ plugin. See
            :issue:`7767` for details.

-    tmpdir_factory [session scope] -- .../_pytest/legacypath.py:303
+    tmpdir_factory [session scope] -- .../_pytest/legacypath.py:302
        Return a :class:`pytest.TempdirFactory` instance for the test session.

-    tmpdir -- .../_pytest/legacypath.py:310
+    tmpdir -- .../_pytest/legacypath.py:309
        Return a temporary directory path object which is unique to each test
        function invocation, created as a sub directory of the base temporary
        directory.

        By default, a new base temporary directory is created each test session,
        and old bases are removed after 3 sessions, to aid in debugging. If
-        ``--basetemp`` is used then it is cleared each session. See
-        :ref:`temporary directory location and retention`.
+        ``--basetemp`` is used then it is cleared each session. See :ref:`base
+        temporary directory`.

        The returned object is a `legacy_path`_ object.

@@ -192,7 +196,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a

        .. _legacy_path: https://py.readthedocs.io/en/latest/path.html

-    caplog -- .../_pytest/logging.py:602
+    caplog -- .../_pytest/logging.py:570
        Access and control log capturing.

        Captured logs are available through the following properties/methods::
@@ -203,7 +207,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        * caplog.record_tuples   -> list of (logger_name, level, message) tuples
        * caplog.clear()         -> clear captured records and formatted log output string

-    monkeypatch -- .../_pytest/monkeypatch.py:33
+    monkeypatch -- .../_pytest/monkeypatch.py:30
        A convenient fixture for monkey-patching.

        The fixture provides these methods to modify objects, dictionaries, or
@@ -227,16 +231,16 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        To undo modifications done by the fixture in a contained scope,
        use :meth:`context() <pytest.MonkeyPatch.context>`.

-    recwarn -- .../_pytest/recwarn.py:32
+    recwarn -- .../_pytest/recwarn.py:30
        Return a :class:`WarningsRecorder` instance that records all warnings emitted by test functions.

        See https://docs.pytest.org/en/latest/how-to/capture-warnings.html for information
        on warning categories.

-    tmp_path_factory [session scope] -- .../_pytest/tmpdir.py:242
+    tmp_path_factory [session scope] -- .../_pytest/tmpdir.py:245
        Return a :class:`pytest.TempPathFactory` instance for the test session.

-    tmp_path -- .../_pytest/tmpdir.py:257
+    tmp_path -- .../_pytest/tmpdir.py:260
        Return a temporary directory path object which is unique to each test
        function invocation, created as a sub directory of the base temporary
        directory.
@@ -245,8 +249,8 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
        and old bases are removed after 3 sessions, to aid in debugging.
        This behavior can be configured with :confval:`tmp_path_retention_count` and
        :confval:`tmp_path_retention_policy`.
-        If ``--basetemp`` is used then it is cleared each session. See
-        :ref:`temporary directory location and retention`.
+        If ``--basetemp`` is used then it is cleared each session. See :ref:`base
+        temporary directory`.

        The returned object is a :class:`pathlib.Path` object.

--- a/doc/en/changelog.rst
+++ b/doc/en/changelog.rst
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -23,7 +23,6 @@ from typing import TYPE_CHECKING

 from _pytest import __version__ as version

-
 if TYPE_CHECKING:
    import sphinx.application

@@ -170,50 +169,6 @@ extlinks = {
 }


-nitpicky = True
-nitpick_ignore = [
-    # TODO (fix in pluggy?)
-    ("py:class", "HookCaller"),
-    ("py:class", "HookspecMarker"),
-    ("py:exc", "PluginValidationError"),
-    # Might want to expose/TODO (https://github.com/pytest-dev/pytest/issues/7469)
-    ("py:class", "ExceptionRepr"),
-    ("py:class", "Exit"),
-    ("py:class", "SubRequest"),
-    ("py:class", "SubRequest"),
-    ("py:class", "TerminalReporter"),
-    ("py:class", "_pytest._code.code.TerminalRepr"),
-    ("py:class", "_pytest.fixtures.FixtureFunctionMarker"),
-    ("py:class", "_pytest.logging.LogCaptureHandler"),
-    ("py:class", "_pytest.mark.structures.ParameterSet"),
-    # Intentionally undocumented/private
-    ("py:class", "_pytest._code.code.Traceback"),
-    ("py:class", "_pytest._py.path.LocalPath"),
-    ("py:class", "_pytest.capture.CaptureResult"),
-    ("py:class", "_pytest.compat.NotSetType"),
-    ("py:class", "_pytest.python.PyCollector"),
-    ("py:class", "_pytest.python.PyobjMixin"),
-    ("py:class", "_pytest.python_api.RaisesContext"),
-    ("py:class", "_pytest.recwarn.WarningsChecker"),
-    ("py:class", "_pytest.reports.BaseReport"),
-    # Undocumented third parties
-    ("py:class", "_tracing.TagTracerSub"),
-    ("py:class", "warnings.WarningMessage"),
-    # Undocumented type aliases
-    ("py:class", "LEGACY_PATH"),
-    ("py:class", "_PluggyPlugin"),
-    # TypeVars
-    ("py:class", "_pytest._code.code.E"),
-    ("py:class", "_pytest.fixtures.FixtureFunction"),
-    ("py:class", "_pytest.nodes._NodeType"),
-    ("py:class", "_pytest.python_api.E"),
-    ("py:class", "_pytest.recwarn.T"),
-    ("py:class", "_pytest.runner.TResult"),
-    ("py:obj", "_pytest.fixtures.FixtureValue"),
-    ("py:obj", "_pytest.stash.T"),
-]
-
-
 # -- Options for HTML output ---------------------------------------------------

 sys.path.append(os.path.abspath("_themes"))
@@ -395,7 +350,7 @@ epub_copyright = "2013, holger krekel et alii"
 # The format is a list of tuples containing the path and title.
 # epub_pre_files = []

-# HTML files that should be inserted after the pages created by sphinx.
+# HTML files shat should be inserted after the pages created by sphinx.
 # The format is a list of tuples containing the path and title.
 # epub_post_files = []

@@ -442,9 +397,8 @@ intersphinx_mapping = {

 def configure_logging(app: "sphinx.application.Sphinx") -> None:
    """Configure Sphinx's WarningHandler to handle (expected) missing include."""
-    import logging
-
    import sphinx.util.logging
+    import logging

    class WarnLogFilter(logging.Filter):
        def filter(self, record: logging.LogRecord) -> bool:
--- a/doc/en/contents.rst
+++ b/doc/en/contents.rst
@@ -44,6 +44,7 @@ How-to guides

   how-to/existingtestsuite
   how-to/unittest
+   how-to/nose
   how-to/xunit_setup

   how-to/bash-completion
--- a/doc/en/deprecations.rst
+++ b/doc/en/deprecations.rst
@@ -19,39 +19,129 @@ Below is a complete list of all pytest features which are considered deprecated.
 :class:`~pytest.PytestWarning` or subclasses, which can be filtered using :ref:`standard warning filters <warnings>`.


-.. _import-or-skip-import-error:
+.. _nose-deprecation:

-``pytest.importorskip`` default behavior regarding :class:`ImportError`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for tests written for nose
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-.. deprecated:: 8.2
+.. deprecated:: 7.2

-Traditionally :func:`pytest.importorskip` will capture :class:`ImportError`, with the original intent being to skip
-tests where a dependent module is not installed, for example testing with different dependencies.
+Support for running tests written for `nose <https://nose.readthedocs.io/en/latest/>`__ is now deprecated.

-However some packages might be installed in the system, but are not importable due to
-some other issue, for example, a compilation error or a broken installation. In those cases :func:`pytest.importorskip`
-would still silently skip the test, but more often than not users would like to see the unexpected
-error so the underlying issue can be fixed.
+``nose`` has been in maintenance mode-only for years, and maintaining the plugin is not trivial as it spills
+over the code base (see :issue:`9886` for more details).

-In ``8.2`` the ``exc_type`` parameter has been added, giving users the ability of passing :class:`ModuleNotFoundError`
-to skip tests only if the module cannot really be found, and not because of some other error.
+setup/teardown
+^^^^^^^^^^^^^^

-Catching only :class:`ModuleNotFoundError` by default (and letting other errors propagate) would be the best solution,
-however for backward compatibility, pytest will keep the existing behavior but raise an warning if:
+One thing that might catch users by surprise is that plain ``setup`` and ``teardown`` methods are not pytest native,
+they are in fact part of the ``nose`` support.

-1. The captured exception is of type :class:`ImportError`, and:
-2. The user does not pass ``exc_type`` explicitly.

-If the import attempt raises :class:`ModuleNotFoundError` (the usual case), then the module is skipped and no
-warning is emitted.
+.. code-block:: python

-This way, the usual cases will keep working the same way, while unexpected errors will now issue a warning, with
-users being able to supress the warning by passing ``exc_type=ImportError`` explicitly.
+    class Test:
+        def setup(self):
+            self.resource = make_resource()

-In ``9.0``, the warning will turn into an error, and in ``9.1`` :func:`pytest.importorskip` will only capture
-:class:`ModuleNotFoundError` by default and no warnings will be issued anymore -- but users can still capture
-:class:`ImportError` by passing it to ``exc_type``.
+        def teardown(self):
+            self.resource.close()
+
+        def test_foo(self):
+            ...
+
+        def test_bar(self):
+            ...
+
+
+
+Native pytest support uses ``setup_method`` and ``teardown_method`` (see :ref:`xunit-method-setup`), so the above should be changed to:
+
+.. code-block:: python
+
+    class Test:
+        def setup_method(self):
+            self.resource = make_resource()
+
+        def teardown_method(self):
+            self.resource.close()
+
+        def test_foo(self):
+            ...
+
+        def test_bar(self):
+            ...
+
+
+This is easy to do in an entire code base by doing a simple find/replace.
+
+@with_setup
+^^^^^^^^^^^
+
+Code using `@with_setup <with-setup-nose>`_ such as this:
+
+.. code-block:: python
+
+    from nose.tools import with_setup
+
+
+    def setup_some_resource():
+        ...
+
+
+    def teardown_some_resource():
+        ...
+
+
+    @with_setup(setup_some_resource, teardown_some_resource)
+    def test_foo():
+        ...
+
+Will also need to be ported to a supported pytest style. One way to do it is using a fixture:
+
+.. code-block:: python
+
+    import pytest
+
+
+    def setup_some_resource():
+        ...
+
+
+    def teardown_some_resource():
+        ...
+
+
+    @pytest.fixture
+    def some_resource():
+        setup_some_resource()
+        yield
+        teardown_some_resource()
+
+
+    def test_foo(some_resource):
+        ...
+
+
+.. _`with-setup-nose`: https://nose.readthedocs.io/en/latest/testing_tools.html?highlight=with_setup#nose.tools.with_setup
+
+.. _instance-collector-deprecation:
+
+The ``pytest.Instance`` collector
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. versionremoved:: 7.0
+
+The ``pytest.Instance`` collector type has been removed.
+
+Previously, Python test methods were collected as :class:`~pytest.Class` -> ``Instance`` -> :class:`~pytest.Function`.
+Now :class:`~pytest.Class` collects the test methods directly.
+
+Most plugins which reference ``Instance`` do so in order to ignore or skip it,
+using a check such as ``if isinstance(node, Instance): return``.
+Such plugins should simply remove consideration of ``Instance`` on pytest>=7.
+However, to keep such uses working, a dummy type has been instanted in ``pytest.Instance`` and ``_pytest.python.Instance``,
+and importing it emits a deprecation warning. This will be removed in pytest 8.


 .. _node-ctor-fspath-deprecation:
@@ -87,12 +177,13 @@ arguments they only pass on to the superclass.
    resolved in future versions as we slowly get rid of the :pypi:`py`
    dependency (see :issue:`9283` for a longer discussion).

-Due to the ongoing migration of methods like :meth:`~pytest.Item.reportinfo`
+Due to the ongoing migration of methods like :meth:`~_pytest.Item.reportinfo`
 which still is expected to return a ``py.path.local`` object, nodes still have
 both ``fspath`` (``py.path.local``) and ``path`` (``pathlib.Path``) attributes,
 no matter what argument was used in the constructor. We expect to deprecate the
 ``fspath`` attribute in a future release.

+.. _legacy-path-hooks-deprecated:

 Configuring hook specs/impls using markers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -106,11 +197,13 @@ have been available since years and should be used instead.
 .. code-block:: python

    @pytest.mark.tryfirst
-    def pytest_runtest_call(): ...
+    def pytest_runtest_call():
+        ...


    # or
-    def pytest_runtest_call(): ...
+    def pytest_runtest_call():
+        ...


    pytest_runtest_call.tryfirst = True
@@ -120,7 +213,8 @@ should be changed to:
 .. code-block:: python

    @pytest.hookimpl(tryfirst=True)
-    def pytest_runtest_call(): ...
+    def pytest_runtest_call():
+        ...

 Changed ``hookimpl`` attributes:

@@ -135,8 +229,6 @@ Changed ``hookwrapper`` attributes:
 * ``historic``


-.. _legacy-path-hooks-deprecated:
-
 ``py.path.local`` arguments for hooks replaced with ``pathlib.Path``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -181,6 +273,62 @@ Directly constructing the following classes is now deprecated:

 These constructors have always been considered private, but now issue a deprecation warning, which may become a hard error in pytest 8.

+.. _cmdline-preparse-deprecated:
+
+Passing ``msg=`` to ``pytest.skip``, ``pytest.fail`` or ``pytest.exit``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 7.0
+
+Passing the keyword argument ``msg`` to :func:`pytest.skip`, :func:`pytest.fail` or :func:`pytest.exit`
+is now deprecated and ``reason`` should be used instead.  This change is to bring consistency between these
+functions and the ``@pytest.mark.skip`` and ``@pytest.mark.xfail`` markers which already accept a ``reason`` argument.
+
+.. code-block:: python
+
+    def test_fail_example():
+        # old
+        pytest.fail(msg="foo")
+        # new
+        pytest.fail(reason="bar")
+
+
+    def test_skip_example():
+        # old
+        pytest.skip(msg="foo")
+        # new
+        pytest.skip(reason="bar")
+
+
+    def test_exit_example():
+        # old
+        pytest.exit(msg="foo")
+        # new
+        pytest.exit(reason="bar")
+
+
+Implementing the ``pytest_cmdline_preparse`` hook
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 7.0
+
+Implementing the :hook:`pytest_cmdline_preparse` hook has been officially deprecated.
+Implement the :hook:`pytest_load_initial_conftests` hook instead.
+
+.. code-block:: python
+
+    def pytest_cmdline_preparse(config: Config, args: List[str]) -> None:
+        ...
+
+
+    # becomes:
+
+
+    def pytest_load_initial_conftests(
+        early_config: Config, parser: Parser, args: List[str]
+    ) -> None:
+        ...
+
 .. _diamond-inheritance-deprecated:

 Diamond inheritance between :class:`pytest.Collector` and :class:`pytest.Item`
@@ -188,7 +336,7 @@ Diamond inheritance between :class:`pytest.Collector` and :class:`pytest.Item`

 .. deprecated:: 7.0

-Defining a custom pytest node type which is both an :class:`~pytest.Item` and a :class:`~pytest.Collector` (e.g. :class:`~pytest.File`) now issues a warning.
+Defining a custom pytest node type which is both an :class:`pytest.Item <Item>` and a :class:`pytest.Collector <Collector>` (e.g. :class:`pytest.File <File>`) now issues a warning.
 It was never sanely supported and triggers hard to debug errors.

 Some plugins providing linting/code analysis have been using this as a hack.
@@ -200,8 +348,8 @@ Instead, a separate collector node should be used, which collects the item. See

 .. _uncooperative-constructors-deprecated:

-Constructors of custom :class:`~_pytest.nodes.Node` subclasses should take ``**kwargs``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Constructors of custom :class:`pytest.Node` subclasses should take ``**kwargs``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 .. deprecated:: 7.0

@@ -233,7 +381,7 @@ conflicts (such as :class:`pytest.File` now taking ``path`` instead of
 deprecation warning is now raised.

 Applying a mark to a fixture function
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-------------------------------------

 .. deprecated:: 7.4

@@ -243,13 +391,38 @@ Applying a mark to a fixture function never had any effect, but it is a common u

    @pytest.mark.usefixtures("clean_database")
    @pytest.fixture
-    def user() -> User: ...
+    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``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 2.4
+
+Several behaviors of :meth:`Parser.addoption <pytest.Parser.addoption>` are now
+scheduled for removal in pytest 8 (deprecated since pytest 2.4.0):
+
+- ``parser.addoption(..., help=".. %default ..")`` - use ``%(default)s`` instead.
+- ``parser.addoption(..., type="int/string/float/complex")`` - use ``type=int`` etc. instead.
+
+
+Using ``pytest.warns(None)``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 7.0
+
+:func:`pytest.warns(None) <pytest.warns>` is now deprecated because it was frequently misused.
+Its correct usage was checking that the code emits at least one warning of any type - like ``pytest.warns()``
+or ``pytest.warns(Warning)``.
+
+See :ref:`warns use cases` for examples.
+
+
 Returning non-None value in test functions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -290,6 +463,19 @@ The proper fix is to change the `return` to an `assert`:
        assert foo(a, b) == result


+The ``--strict`` command-line option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 6.2
+
+The ``--strict`` command-line option has been deprecated in favor of ``--strict-markers``, which
+better conveys what the option does.
+
+We have plans to maybe in the future to reintroduce ``--strict`` and make it an encompassing
+flag for all strictness related options (``--strict-markers`` and ``--strict-config``
+at the moment, more might be introduced in the future).
+
+
 The ``yield_fixture`` function/decorator
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@@ -308,312 +494,6 @@ an appropriate period of deprecation has passed.

 Some breaking changes which could not be deprecated are also listed.

-.. _nose-deprecation:
-
-Support for tests written for nose
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.2
-.. versionremoved:: 8.0
-
-Support for running tests written for `nose <https://nose.readthedocs.io/en/latest/>`__ is now deprecated.
-
-``nose`` has been in maintenance mode-only for years, and maintaining the plugin is not trivial as it spills
-over the code base (see :issue:`9886` for more details).
-
-setup/teardown
-^^^^^^^^^^^^^^
-
-One thing that might catch users by surprise is that plain ``setup`` and ``teardown`` methods are not pytest native,
-they are in fact part of the ``nose`` support.
-
-
-.. code-block:: python
-
-    class Test:
-        def setup(self):
-            self.resource = make_resource()
-
-        def teardown(self):
-            self.resource.close()
-
-        def test_foo(self): ...
-
-        def test_bar(self): ...
-
-
-
-Native pytest support uses ``setup_method`` and ``teardown_method`` (see :ref:`xunit-method-setup`), so the above should be changed to:
-
-.. code-block:: python
-
-    class Test:
-        def setup_method(self):
-            self.resource = make_resource()
-
-        def teardown_method(self):
-            self.resource.close()
-
-        def test_foo(self): ...
-
-        def test_bar(self): ...
-
-
-This is easy to do in an entire code base by doing a simple find/replace.
-
-@with_setup
-^^^^^^^^^^^
-
-Code using `@with_setup <with-setup-nose>`_ such as this:
-
-.. code-block:: python
-
-    from nose.tools import with_setup
-
-
-    def setup_some_resource(): ...
-
-
-    def teardown_some_resource(): ...
-
-
-    @with_setup(setup_some_resource, teardown_some_resource)
-    def test_foo(): ...
-
-Will also need to be ported to a supported pytest style. One way to do it is using a fixture:
-
-.. code-block:: python
-
-    import pytest
-
-
-    def setup_some_resource(): ...
-
-
-    def teardown_some_resource(): ...
-
-
-    @pytest.fixture
-    def some_resource():
-        setup_some_resource()
-        yield
-        teardown_some_resource()
-
-
-    def test_foo(some_resource): ...
-
-
-.. _`with-setup-nose`: https://nose.readthedocs.io/en/latest/testing_tools.html?highlight=with_setup#nose.tools.with_setup
-
-
-The ``compat_co_firstlineno`` attribute
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Nose inspects this attribute on function objects to allow overriding the function's inferred line number.
-Pytest no longer respects this attribute.
-
-
-
-Passing ``msg=`` to ``pytest.skip``, ``pytest.fail`` or ``pytest.exit``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.0
-.. versionremoved:: 8.0
-
-Passing the keyword argument ``msg`` to :func:`pytest.skip`, :func:`pytest.fail` or :func:`pytest.exit`
-is now deprecated and ``reason`` should be used instead.  This change is to bring consistency between these
-functions and the ``@pytest.mark.skip`` and ``@pytest.mark.xfail`` markers which already accept a ``reason`` argument.
-
-.. code-block:: python
-
-    def test_fail_example():
-        # old
-        pytest.fail(msg="foo")
-        # new
-        pytest.fail(reason="bar")
-
-
-    def test_skip_example():
-        # old
-        pytest.skip(msg="foo")
-        # new
-        pytest.skip(reason="bar")
-
-
-    def test_exit_example():
-        # old
-        pytest.exit(msg="foo")
-        # new
-        pytest.exit(reason="bar")
-
-
-.. _instance-collector-deprecation:
-
-The ``pytest.Instance`` collector
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionremoved:: 7.0
-
-The ``pytest.Instance`` collector type has been removed.
-
-Previously, Python test methods were collected as :class:`~pytest.Class` -> ``Instance`` -> :class:`~pytest.Function`.
-Now :class:`~pytest.Class` collects the test methods directly.
-
-Most plugins which reference ``Instance`` do so in order to ignore or skip it,
-using a check such as ``if isinstance(node, Instance): return``.
-Such plugins should simply remove consideration of ``Instance`` on pytest>=7.
-However, to keep such uses working, a dummy type has been instanced in ``pytest.Instance`` and ``_pytest.python.Instance``,
-and importing it emits a deprecation warning. This was removed in pytest 8.
-
-
-Using ``pytest.warns(None)``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.0
-.. versionremoved:: 8.0
-
-:func:`pytest.warns(None) <pytest.warns>` is now deprecated because it was frequently misused.
-Its correct usage was checking that the code emits at least one warning of any type - like ``pytest.warns()``
-or ``pytest.warns(Warning)``.
-
-See :ref:`warns use cases` for examples.
-
-
-Backward compatibilities in ``Parser.addoption``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 2.4
-.. versionremoved:: 8.0
-
-Several behaviors of :meth:`Parser.addoption <pytest.Parser.addoption>` are now
-removed in pytest 8 (deprecated since pytest 2.4.0):
-
- ``parser.addoption(..., help=".. %default ..")`` - use ``%(default)s`` instead.
- ``parser.addoption(..., type="int/string/float/complex")`` - use ``type=int`` etc. instead.
-
-
-The ``--strict`` command-line option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 6.2
-.. versionremoved:: 8.0
-
-The ``--strict`` command-line option has been deprecated in favor of ``--strict-markers``, which
-better conveys what the option does.
-
-We have plans to maybe in the future to reintroduce ``--strict`` and make it an encompassing
-flag for all strictness related options (``--strict-markers`` and ``--strict-config``
-at the moment, more might be introduced in the future).
-
-
-.. _cmdline-preparse-deprecated:
-
-Implementing the ``pytest_cmdline_preparse`` hook
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.0
-.. versionremoved:: 8.0
-
-Implementing the ``pytest_cmdline_preparse`` hook has been officially deprecated.
-Implement the :hook:`pytest_load_initial_conftests` hook instead.
-
-.. code-block:: python
-
-    def pytest_cmdline_preparse(config: Config, args: List[str]) -> None: ...
-
-
-    # becomes:
-
-
-    def pytest_load_initial_conftests(
-        early_config: Config, parser: Parser, args: List[str]
-    ) -> None: ...
-
-
-Collection changes in pytest 8
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Added a new :class:`pytest.Directory` base collection node, which all collector nodes for filesystem directories are expected to subclass.
-This is analogous to the existing :class:`pytest.File` for file nodes.
-
-Changed :class:`pytest.Package` to be a subclass of :class:`pytest.Directory`.
-A ``Package`` represents a filesystem directory which is a Python package,
-i.e. contains an ``__init__.py`` file.
-
-:class:`pytest.Package` now only collects files in its own directory; previously it collected recursively.
-Sub-directories are collected as sub-collector nodes, thus creating a collection tree which mirrors the filesystem hierarchy.
-
-:attr:`session.name <pytest.Session.name>` is now ``""``; previously it was the rootdir directory name.
-This matches :attr:`session.nodeid <_pytest.nodes.Node.nodeid>` which has always been `""`.
-
-Added a new :class:`pytest.Dir` concrete collection node, a subclass of :class:`pytest.Directory`.
-This node represents a filesystem directory, which is not a :class:`pytest.Package`,
-i.e. does not contain an ``__init__.py`` file.
-Similarly to ``Package``, it only collects the files in its own directory,
-while collecting sub-directories as sub-collector nodes.
-
-Files and directories are now collected in alphabetical order jointly, unless changed by a plugin.
-Previously, files were collected before directories.
-
-The collection tree now contains directories/packages up to the :ref:`rootdir <rootdir>`,
-for initial arguments that are found within the rootdir.
-For files outside the rootdir, only the immediate directory/package is collected --
-note however that collecting from outside the rootdir is discouraged.
-
-As an example, given the following filesystem tree::
-
-    myroot/
-        pytest.ini
-        top/
-        ├── aaa
-        │   └── test_aaa.py
-        ├── test_a.py
-        ├── test_b
-        │   ├── __init__.py
-        │   └── test_b.py
-        ├── test_c.py
-        └── zzz
-            ├── __init__.py
-            └── test_zzz.py
-
-the collection tree, as shown by `pytest --collect-only top/` but with the otherwise-hidden :class:`~pytest.Session` node added for clarity,
-is now the following::
-
-    <Session>
-      <Dir myroot>
-        <Dir top>
-          <Dir aaa>
-            <Module test_aaa.py>
-              <Function test_it>
-          <Module test_a.py>
-            <Function test_it>
-          <Package test_b>
-            <Module test_b.py>
-              <Function test_it>
-          <Module test_c.py>
-            <Function test_it>
-          <Package zzz>
-            <Module test_zzz.py>
-              <Function test_it>
-
-Previously, it was::
-
-    <Session>
-      <Module top/test_a.py>
-        <Function test_it>
-      <Module top/test_c.py>
-        <Function test_it>
-      <Module top/aaa/test_aaa.py>
-        <Function test_it>
-      <Package test_b>
-        <Module test_b.py>
-          <Function test_it>
-      <Package zzz>
-        <Module test_zzz.py>
-          <Function test_it>
-
-Code/plugins which rely on a specific shape of the collection tree might need to update.
-

 :class:`pytest.Package` is no longer a :class:`pytest.Module` or :class:`pytest.File`
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -942,7 +822,8 @@ Applying marks to values of a ``pytest.mark.parametrize`` call is now deprecated
            (50, 500),
        ],
    )
-    def test_foo(a, b): ...
+    def test_foo(a, b):
+        ...

 This code applies the ``pytest.mark.xfail(reason="flaky")`` mark to the ``(6, 36)`` value of the above parametrization
 call.
@@ -965,7 +846,8 @@ To update the code, use ``pytest.param``:
            (50, 500),
        ],
    )
-    def test_foo(a, b): ...
+    def test_foo(a, b):
+        ...


 .. _pytest_funcarg__ prefix deprecated:
@@ -1116,13 +998,15 @@ This is just a matter of renaming the fixture as the API is the same:

 .. code-block:: python

-    def test_foo(record_xml_property): ...
+    def test_foo(record_xml_property):
+        ...

 Change to:

 .. code-block:: python

-    def test_foo(record_property): ...
+    def test_foo(record_property):
+        ...


 .. _passing command-line string to pytest.main deprecated:
@@ -1284,7 +1168,8 @@ Example of usage:

 .. code-block:: python

-    class MySymbol: ...
+    class MySymbol:
+        ...


    def pytest_namespace():
--- a/doc/en/example/assertion/failure_demo.py
+++ b/doc/en/example/assertion/failure_demo.py
@@ -172,7 +172,7 @@ class TestRaises:
        raise ValueError("demo error")

    def test_tupleerror(self):
-        a, b = [1]  # noqa: F841
+        a, b = [1]  # NOQA

    def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
        items = [1, 2, 3]
@@ -180,7 +180,7 @@ class TestRaises:
        a, b = items.pop()

    def test_some_error(self):
-        if namenotexi:  # noqa: F821
+        if namenotexi:  # NOQA
            pass

    def func1(self):
--- a/doc/en/example/assertion/global_testmodule_config/conftest.py
+++ b/doc/en/example/assertion/global_testmodule_config/conftest.py
@@ -2,7 +2,6 @@ import os.path

 import pytest

-
 mydir = os.path.dirname(__file__)


--- a/doc/en/example/assertion/test_failures.py
+++ b/doc/en/example/assertion/test_failures.py
@@ -1,7 +1,6 @@
 import os.path
 import shutil

-
 failure_demo = os.path.join(os.path.dirname(__file__), "failure_demo.py")
 pytest_plugins = ("pytester",)

--- a/doc/en/example/conftest.py
+++ b/doc/en/example/conftest.py
@@ -1 +1 @@
-collect_ignore = ["nonpython", "customdirectory"]
+collect_ignore = ["nonpython"]
--- a/doc/en/example/customdirectory.rst
+++ b/doc/en/example/customdirectory.rst
@@ -1,77 +0,0 @@
-.. _`custom directory collectors`:
-
-Using a custom directory collector
-====================================================
-
-By default, pytest collects directories using :class:`pytest.Package`, for directories with ``__init__.py`` files,
-and :class:`pytest.Dir` for other directories.
-If you want to customize how a directory is collected, you can write your own :class:`pytest.Directory` collector,
-and use :hook:`pytest_collect_directory` to hook it up.
-
-.. _`directory manifest plugin`:
-
-A basic example for a directory manifest file
--------------------------------------------------------------
-
-Suppose you want to customize how collection is done on a per-directory basis.
-Here is an example ``conftest.py`` plugin that allows directories to contain a ``manifest.json`` file,
-which defines how the collection should be done for the directory.
-In this example, only a simple list of files is supported,
-however you can imagine adding other keys, such as exclusions and globs.
-
-.. include:: customdirectory/conftest.py
-    :literal:
-
-You can create a ``manifest.json`` file and some test files:
-
-.. include:: customdirectory/tests/manifest.json
-    :literal:
-
-.. include:: customdirectory/tests/test_first.py
-    :literal:
-
-.. include:: customdirectory/tests/test_second.py
-    :literal:
-
-.. include:: customdirectory/tests/test_third.py
-    :literal:
-
-An you can now execute the test specification:
-
-.. code-block:: pytest
-
-    customdirectory $ pytest
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
-    rootdir: /home/sweet/project/customdirectory
-    configfile: pytest.ini
-    collected 2 items
-
-    tests/test_first.py .                                                [ 50%]
-    tests/test_second.py .                                               [100%]
-
-    ============================ 2 passed in 0.12s =============================
-
-.. regendoc:wipe
-
-Notice how ``test_three.py`` was not executed, because it is not listed in the manifest.
-
-You can verify that your custom collector appears in the collection tree:
-
-.. code-block:: pytest
-
-    customdirectory $ pytest --collect-only
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
-    rootdir: /home/sweet/project/customdirectory
-    configfile: pytest.ini
-    collected 2 items
-
-    <Dir customdirectory>
-      <ManifestDirectory tests>
-        <Module test_first.py>
-          <Function test_1>
-        <Module test_second.py>
-          <Function test_2>
-
-    ======================== 2 tests collected in 0.12s ========================
--- a/doc/en/example/customdirectory/conftest.py
+++ b/doc/en/example/customdirectory/conftest.py
@@ -1,28 +0,0 @@
-# content of conftest.py
-import json
-
-import pytest
-
-
-class ManifestDirectory(pytest.Directory):
-    def collect(self):
-        # The standard pytest behavior is to loop over all `test_*.py` files and
-        # call `pytest_collect_file` on each file. This collector instead reads
-        # the `manifest.json` file and only calls `pytest_collect_file` for the
-        # files defined there.
-        manifest_path = self.path / "manifest.json"
-        manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
-        ihook = self.ihook
-        for file in manifest["files"]:
-            yield from ihook.pytest_collect_file(
-                file_path=self.path / file, parent=self
-            )
-
-
-@pytest.hookimpl
-def pytest_collect_directory(path, parent):
-    # Use our custom collector for directories containing a `manifest.json` file.
-    if path.joinpath("manifest.json").is_file():
-        return ManifestDirectory.from_parent(parent=parent, path=path)
-    # Otherwise fallback to the standard behavior.
-    return None
--- a/doc/en/example/customdirectory/pytest.ini
+++ b/doc/en/example/customdirectory/pytest.ini
--- a/doc/en/example/customdirectory/tests/manifest.json
+++ b/doc/en/example/customdirectory/tests/manifest.json
@@ -1,6 +0,0 @@
-{
-    "files": [
-        "test_first.py",
-        "test_second.py"
-    ]
-}
--- a/doc/en/example/customdirectory/tests/test_first.py
+++ b/doc/en/example/customdirectory/tests/test_first.py
@@ -1,3 +0,0 @@
-# content of test_first.py
-def test_1():
-    pass
--- a/doc/en/example/customdirectory/tests/test_second.py
+++ b/doc/en/example/customdirectory/tests/test_second.py
@@ -1,3 +0,0 @@
-# content of test_second.py
-def test_2():
-    pass
--- a/doc/en/example/customdirectory/tests/test_third.py
+++ b/doc/en/example/customdirectory/tests/test_third.py
@@ -1,3 +0,0 @@
-# content of test_third.py
-def test_3():
-    pass
--- a/doc/en/example/index.rst
+++ b/doc/en/example/index.rst
@@ -18,6 +18,7 @@ For basic examples, see
 - :ref:`Fixtures <fixtures>` for basic fixture/setup examples
 - :ref:`parametrize` for basic test function parametrization
 - :ref:`unittest` for basic unittest integration
+- :ref:`noseintegration` for basic nosetests integration

 The following examples aim at various use cases you might encounter.

@@ -31,4 +32,3 @@ The following examples aim at various use cases you might encounter.
   special
   pythoncollection
   nonpython
-   customdirectory
--- a/doc/en/example/markers.rst
+++ b/doc/en/example/markers.rst
@@ -45,7 +45,7 @@ You can then restrict a test run to only run tests marked with ``webtest``:

    $ pytest -v -m webtest
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 4 items / 3 deselected / 1 selected
@@ -60,7 +60,7 @@ Or the inverse, running all tests except the webtest ones:

    $ pytest -v -m "not webtest"
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 4 items / 1 deselected / 3 selected
@@ -82,7 +82,7 @@ tests based on their module, class, method, or function name:

    $ pytest -v test_server.py::TestClass::test_method
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 1 item
@@ -97,7 +97,7 @@ You can also select on the class:

    $ pytest -v test_server.py::TestClass
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 1 item
@@ -112,7 +112,7 @@ Or select multiple nodes:

    $ pytest -v test_server.py::TestClass test_server.py::test_send_http
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 2 items
@@ -156,7 +156,7 @@ The expression matching is now case-insensitive.

    $ pytest -v -k http  # running with the above defined example module
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 4 items / 3 deselected / 1 selected
@@ -171,7 +171,7 @@ And you can also run all tests except the ones that match the keyword:

    $ pytest -k "not send_http" -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 4 items / 1 deselected / 3 selected
@@ -188,7 +188,7 @@ Or to select "http" and "quick" tests:

    $ pytest -k "http or quick" -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 4 items / 2 deselected / 2 selected
@@ -397,7 +397,7 @@ the test needs:

    $ pytest -E stage2
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 1 item

@@ -411,7 +411,7 @@ and here is one that specifies exactly the environment needed:

    $ pytest -E stage1
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 1 item

@@ -604,7 +604,7 @@ then you will see two tests skipped and two executed tests as expected:

    $ pytest -rs # this option reports skip reasons
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items

@@ -620,7 +620,7 @@ Note that if you specify a platform via the marker-command line option like this

    $ pytest -m linux
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items / 3 deselected / 1 selected

@@ -683,7 +683,7 @@ We can now use the ``-m option`` to select one set:

    $ pytest -m interface --tb=short
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items / 2 deselected / 2 selected

@@ -709,7 +709,7 @@ or to select both "event" and "interface" tests:

    $ pytest -m "interface or event" --tb=short
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items / 1 deselected / 3 selected

--- a/doc/en/example/multipython.py
+++ b/doc/en/example/multipython.py
@@ -1,6 +1,5 @@
 """Module containing a parametrized tests testing cross-python serialization
 via the pickle module."""
-
 import shutil
 import subprocess
 import textwrap
@@ -33,12 +32,14 @@ class Python:
        dumpfile = self.picklefile.with_name("dump.py")
        dumpfile.write_text(
            textwrap.dedent(
-                rf"""
+                r"""
                import pickle
-                f = open({str(self.picklefile)!r}, 'wb')
-                s = pickle.dump({obj!r}, f, protocol=2)
+                f = open({!r}, 'wb')
+                s = pickle.dump({!r}, f, protocol=2)
                f.close()
-                """
+                """.format(
+                    str(self.picklefile), obj
+                )
            )
        )
        subprocess.run((self.pythonpath, str(dumpfile)), check=True)
@@ -47,15 +48,17 @@ class Python:
        loadfile = self.picklefile.with_name("load.py")
        loadfile.write_text(
            textwrap.dedent(
-                rf"""
+                r"""
                import pickle
-                f = open({str(self.picklefile)!r}, 'rb')
+                f = open({!r}, 'rb')
                obj = pickle.load(f)
                f.close()
-                res = eval({expression!r})
+                res = eval({!r})
                if not res:
                    raise SystemExit(1)
-                """
+                """.format(
+                    str(self.picklefile), expression
+                )
            )
        )
        print(loadfile)
--- a/doc/en/example/nonpython.rst
+++ b/doc/en/example/nonpython.rst
@@ -28,7 +28,7 @@ now execute the test specification:

    nonpython $ pytest test_simple.yaml
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project/nonpython
    collected 2 items

@@ -64,7 +64,7 @@ consulted when reporting in ``verbose`` mode:

    nonpython $ pytest -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project/nonpython
    collecting ... collected 2 items
@@ -90,7 +90,7 @@ interesting to just look at the collection tree:

    nonpython $ pytest --collect-only
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project/nonpython
    collected 2 items

--- a/doc/en/example/parametrize.rst
+++ b/doc/en/example/parametrize.rst
@@ -4,6 +4,8 @@
 Parametrizing tests
 =================================================

+.. currentmodule:: _pytest.python
+
 ``pytest`` allows to easily parametrize test functions.
 For basic docs, see :ref:`parametrize-basics`.

@@ -158,20 +160,19 @@ objects, they are still using the default pytest representation:

    $ pytest test_time.py --collect-only
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 8 items

-    <Dir parametrize.rst-199>
-      <Module test_time.py>
-        <Function test_timedistance_v0[a0-b0-expected0]>
-        <Function test_timedistance_v0[a1-b1-expected1]>
-        <Function test_timedistance_v1[forward]>
-        <Function test_timedistance_v1[backward]>
-        <Function test_timedistance_v2[20011212-20011211-expected0]>
-        <Function test_timedistance_v2[20011211-20011212-expected1]>
-        <Function test_timedistance_v3[forward]>
-        <Function test_timedistance_v3[backward]>
+    <Module test_time.py>
+      <Function test_timedistance_v0[a0-b0-expected0]>
+      <Function test_timedistance_v0[a1-b1-expected1]>
+      <Function test_timedistance_v1[forward]>
+      <Function test_timedistance_v1[backward]>
+      <Function test_timedistance_v2[20011212-20011211-expected0]>
+      <Function test_timedistance_v2[20011211-20011212-expected1]>
+      <Function test_timedistance_v3[forward]>
+      <Function test_timedistance_v3[backward]>

    ======================== 8 tests collected in 0.12s ========================

@@ -184,7 +185,7 @@ A quick port of "testscenarios"
 Here is a quick port to run tests configured with :pypi:`testscenarios`,
 an add-on from Robert Collins for the standard unittest framework. We
 only have to work a bit to construct the correct arguments for pytest's
-:py:func:`Metafunc.parametrize <pytest.Metafunc.parametrize>`:
+:py:func:`Metafunc.parametrize`:

 .. code-block:: python

@@ -221,7 +222,7 @@ this is a fully self-contained example which you can run with:

    $ pytest test_scenarios.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items

@@ -235,17 +236,16 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia

    $ pytest --collect-only test_scenarios.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items

-    <Dir parametrize.rst-199>
-      <Module test_scenarios.py>
-        <Class TestSampleWithScenarios>
-          <Function test_demo1[basic]>
-          <Function test_demo2[basic]>
-          <Function test_demo1[advanced]>
-          <Function test_demo2[advanced]>
+    <Module test_scenarios.py>
+      <Class TestSampleWithScenarios>
+        <Function test_demo1[basic]>
+        <Function test_demo2[basic]>
+        <Function test_demo1[advanced]>
+        <Function test_demo2[advanced]>

    ======================== 4 tests collected in 0.12s ========================

@@ -314,14 +314,13 @@ Let's first see how it looks like at collection time:

    $ pytest test_backends.py --collect-only
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 2 items

-    <Dir parametrize.rst-199>
-      <Module test_backends.py>
-        <Function test_db_initialized[d1]>
-        <Function test_db_initialized[d2]>
+    <Module test_backends.py>
+      <Function test_db_initialized[d1]>
+      <Function test_db_initialized[d2]>

    ======================== 2 tests collected in 0.12s ========================

@@ -413,7 +412,7 @@ The result of this test will be successful:

    $ pytest -v test_indirect_list.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 1 item
@@ -503,11 +502,12 @@ Running it results in some skips if we don't have all the python interpreters in
 .. code-block:: pytest

   . $ pytest -rs -q multipython.py
-   ssssssssssss...ssssssssssss                                          [100%]
+   sssssssssssssssssssssssssss                                          [100%]
   ========================= short test summary info ==========================
-   SKIPPED [12] multipython.py:65: 'python3.9' not found
-   SKIPPED [12] multipython.py:65: 'python3.11' not found
-   3 passed, 24 skipped in 0.12s
+   SKIPPED [9] multipython.py:69: 'python3.5' not found
+   SKIPPED [9] multipython.py:69: 'python3.6' not found
+   SKIPPED [9] multipython.py:69: 'python3.7' not found
+   27 skipped in 0.12s

 Parametrization of optional implementations/imports
 ---------------------------------------------------
@@ -567,7 +567,7 @@ If you run this with reporting for skips enabled:

    $ pytest -rs test_module.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 2 items

@@ -628,7 +628,7 @@ Then run ``pytest`` with verbose mode and with only the ``basic`` marker:

    $ pytest -v -m basic
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    rootdir: /home/sweet/project
    collecting ... collected 24 items / 21 deselected / 3 selected
--- a/doc/en/example/pythoncollection.rst
+++ b/doc/en/example/pythoncollection.rst
@@ -147,16 +147,15 @@ The test collection would look like this:

    $ pytest --collect-only
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    configfile: pytest.ini
    collected 2 items

-    <Dir pythoncollection.rst-200>
-      <Module check_myapp.py>
-        <Class CheckMyApp>
-          <Function simple_check>
-          <Function complex_check>
+    <Module check_myapp.py>
+      <Class CheckMyApp>
+        <Function simple_check>
+        <Function complex_check>

    ======================== 2 tests collected in 0.12s ========================

@@ -210,18 +209,16 @@ You can always peek at the collection tree without running tests like this:

    . $ pytest --collect-only pythoncollection.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    configfile: pytest.ini
    collected 3 items

-    <Dir pythoncollection.rst-200>
-      <Dir CWD>
-        <Module pythoncollection.py>
-          <Function test_function>
-          <Class TestClass>
-            <Function test_method>
-            <Function test_anothermethod>
+    <Module CWD/pythoncollection.py>
+      <Function test_function>
+      <Class TestClass>
+        <Function test_method>
+        <Function test_anothermethod>

    ======================== 3 tests collected in 0.12s ========================

@@ -294,7 +291,7 @@ file will be left out:

    $ pytest --collect-only
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    configfile: pytest.ini
    collected 0 items
--- a/doc/en/example/reportingdemo.rst
+++ b/doc/en/example/reportingdemo.rst
@@ -9,7 +9,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:

    assertion $ pytest failure_demo.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project/assertion
    collected 44 items

@@ -80,7 +80,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_text(self):
    >       assert "spam" == "eggs"
    E       AssertionError: assert 'spam' == 'eggs'
-    E
    E         - eggs
    E         + spam

@@ -92,7 +91,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_similar_text(self):
    >       assert "foo 1 bar" == "foo 2 bar"
    E       AssertionError: assert 'foo 1 bar' == 'foo 2 bar'
-    E
    E         - foo 2 bar
    E         ?     ^
    E         + foo 1 bar
@@ -106,7 +104,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_multiline_text(self):
    >       assert "foo\nspam\nbar" == "foo\neggs\nbar"
    E       AssertionError: assert 'foo\nspam\nbar' == 'foo\neggs\nbar'
-    E
    E           foo
    E         - eggs
    E         + spam
@@ -122,7 +119,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            b = "1" * 100 + "b" + "2" * 100
    >       assert a == b
    E       AssertionError: assert '111111111111...2222222222222' == '111111111111...2222222222222'
-    E
    E         Skipping 90 identical leading characters in diff, use -v to show
    E         Skipping 91 identical trailing characters in diff, use -v to show
    E         - 1111111111b222222222
@@ -140,15 +136,15 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            b = "1\n" * 100 + "b" + "2\n" * 100
    >       assert a == b
    E       AssertionError: assert '1\n1\n1\n1\n...n2\n2\n2\n2\n' == '1\n1\n1\n1\n...n2\n2\n2\n2\n'
-    E
    E         Skipping 190 identical leading characters in diff, use -v to show
    E         Skipping 191 identical trailing characters in diff, use -v to show
    E           1
    E           1
    E           1
+    E           1
    E           1...
    E
-    E         ...Full output truncated (7 lines hidden), use '-vv' to show
+    E         ...Full output truncated (6 lines hidden), use '-vv' to show

    failure_demo.py:60: AssertionError
    _________________ TestSpecialisedExplanations.test_eq_list _________________
@@ -158,7 +154,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_list(self):
    >       assert [0, 1, 2] == [0, 1, 3]
    E       assert [0, 1, 2] == [0, 1, 3]
-    E
    E         At index 2 diff: 2 != 3
    E         Use -v to get more diff

@@ -172,7 +167,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            b = [0] * 100 + [2] + [3] * 100
    >       assert a == b
    E       assert [0, 0, 0, 0, 0, 0, ...] == [0, 0, 0, 0, 0, 0, ...]
-    E
    E         At index 100 diff: 1 != 2
    E         Use -v to get more diff

@@ -184,7 +178,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_dict(self):
    >       assert {"a": 0, "b": 1, "c": 0} == {"a": 0, "b": 2, "d": 0}
    E       AssertionError: assert {'a': 0, 'b': 1, 'c': 0} == {'a': 0, 'b': 2, 'd': 0}
-    E
    E         Omitting 1 identical items, use -vv to show
    E         Differing items:
    E         {'b': 1} != {'b': 2}
@@ -202,7 +195,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_set(self):
    >       assert {0, 10, 11, 12} == {0, 20, 21}
    E       assert {0, 10, 11, 12} == {0, 20, 21}
-    E
    E         Extra items in the left set:
    E         10
    E         11
@@ -220,7 +212,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
        def test_eq_longer_list(self):
    >       assert [1, 2] == [1, 2, 3]
    E       assert [1, 2] == [1, 2, 3]
-    E
    E         Right contains one more item: 3
    E         Use -v to get more diff

@@ -242,7 +233,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            text = "some multiline\ntext\nwhich\nincludes foo\nand a\ntail"
    >       assert "foo" not in text
    E       AssertionError: assert 'foo' not in 'some multil...nand a\ntail'
-    E
    E         'foo' is contained here:
    E           some multiline
    E           text
@@ -261,7 +251,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            text = "single foo line"
    >       assert "foo" not in text
    E       AssertionError: assert 'foo' not in 'single foo line'
-    E
    E         'foo' is contained here:
    E           single foo line
    E         ?        +++
@@ -275,7 +264,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            text = "head " * 50 + "foo " + "tail " * 20
    >       assert "foo" not in text
    E       AssertionError: assert 'foo' not in 'head head h...l tail tail '
-    E
    E         'foo' is contained here:
    E           head head foo tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
    E         ?           +++
@@ -289,7 +277,6 @@ Here is a nice run of several failures and how ``pytest`` presents things:
            text = "head " * 50 + "f" * 70 + "tail " * 20
    >       assert "f" * 70 not in text
    E       AssertionError: assert 'fffffffffff...ffffffffffff' not in 'head head h...l tail tail '
-    E
    E         'ffffffffffffffffff...fffffffffffffffffff' is contained here:
    E           head head fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffftail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail tail
    E         ?           ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -445,7 +432,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
    self = <failure_demo.TestRaises object at 0xdeadbeef0020>

        def test_tupleerror(self):
-    >       a, b = [1]  # noqa: F841
+    >       a, b = [1]  # NOQA
    E       ValueError: not enough values to unpack (expected 2, got 1)

    failure_demo.py:175: ValueError
@@ -467,7 +454,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
    self = <failure_demo.TestRaises object at 0xdeadbeef0022>

        def test_some_error(self):
-    >       if namenotexi:  # noqa: F821
+    >       if namenotexi:  # NOQA
    E       NameError: name 'namenotexi' is not defined

    failure_demo.py:183: NameError
--- a/doc/en/example/simple.rst
+++ b/doc/en/example/simple.rst
@@ -168,7 +168,7 @@ Now we'll get feedback on a bad argument:


 If you need to provide more detailed error messages, you can use the
-``type`` parameter and raise :exc:`pytest.UsageError`:
+``type`` parameter and raise ``pytest.UsageError``:

 .. code-block:: python

@@ -232,7 +232,7 @@ directory with the above conftest.py:

    $ pytest
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 0 items

@@ -296,7 +296,7 @@ and when running it will see a skipped "slow" test:

    $ pytest -rs    # "-rs" means report details on the little 's'
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 2 items

@@ -312,7 +312,7 @@ Or run it including the ``slow`` marked test:

    $ pytest --runslow
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 2 items

@@ -456,7 +456,7 @@ which will add the string to the test header accordingly:

    $ pytest
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    project deps: mylib-1.1
    rootdir: /home/sweet/project
    collected 0 items
@@ -484,7 +484,7 @@ which will add info only when run with "--v":

    $ pytest -v
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y -- $PYTHON_PREFIX/bin/python
    cachedir: .pytest_cache
    info1: did you know that ...
    did you?
@@ -499,7 +499,7 @@ and nothing when run plainly:

    $ pytest
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 0 items

@@ -538,7 +538,7 @@ Now we can profile which test functions execute the slowest:

    $ pytest --durations=3
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 3 items

@@ -644,7 +644,7 @@ If we run this:

    $ pytest -rx
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 4 items

@@ -660,31 +660,6 @@ If we run this:
    E       assert 0

    test_step.py:11: AssertionError
-    ================================ XFAILURES =================================
-    ______________________ TestUserHandling.test_deletion ______________________
-
-    item = <Function test_deletion>
-
-        def pytest_runtest_setup(item):
-            if "incremental" in item.keywords:
-                # retrieve the class name of the test
-                cls_name = str(item.cls)
-                # check if a previous test has failed for this class
-                if cls_name in _test_failed_incremental:
-                    # retrieve the index of the test (if parametrize is used in combination with incremental)
-                    parametrize_index = (
-                        tuple(item.callspec.indices.values())
-                        if hasattr(item, "callspec")
-                        else ()
-                    )
-                    # retrieve the name of the first test function to fail for this class name and index
-                    test_name = _test_failed_incremental[cls_name].get(parametrize_index, None)
-                    # if name found, test has failed for the combination of class name & test name
-                    if test_name is not None:
-    >                   pytest.xfail(f"previous test failed ({test_name})")
-    E                   _pytest.outcomes.XFailed: previous test failed (test_modification)
-
-    conftest.py:47: XFailed
    ========================= short test summary info ==========================
    XFAIL test_step.py::TestUserHandling::test_deletion - reason: previous test failed (test_modification)
    ================== 1 failed, 2 passed, 1 xfailed in 0.12s ==================
@@ -751,14 +726,14 @@ We can run this:

    $ pytest
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 7 items

-    a/test_db.py F                                                       [ 14%]
-    a/test_db2.py F                                                      [ 28%]
-    b/test_error.py E                                                    [ 42%]
-    test_step.py .Fx.                                                    [100%]
+    test_step.py .Fx.                                                    [ 57%]
+    a/test_db.py F                                                       [ 71%]
+    a/test_db2.py F                                                      [ 85%]
+    b/test_error.py E                                                    [100%]

    ================================== ERRORS ==================================
    _______________________ ERROR at setup of test_root ________________________
@@ -770,39 +745,39 @@ We can run this:

    /home/sweet/project/b/test_error.py:1
    ================================= FAILURES =================================
-    _________________________________ test_a1 __________________________________
-
-    db = <conftest.DB object at 0xdeadbeef0002>
-
-        def test_a1(db):
-    >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB object at 0xdeadbeef0002>
-    E       assert 0
-
-    a/test_db.py:2: AssertionError
-    _________________________________ test_a2 __________________________________
-
-    db = <conftest.DB object at 0xdeadbeef0002>
-
-        def test_a2(db):
-    >       assert 0, db  # to show value
-    E       AssertionError: <conftest.DB object at 0xdeadbeef0002>
-    E       assert 0
-
-    a/test_db2.py:2: AssertionError
    ____________________ TestUserHandling.test_modification ____________________

-    self = <test_step.TestUserHandling object at 0xdeadbeef0003>
+    self = <test_step.TestUserHandling object at 0xdeadbeef0002>

        def test_modification(self):
    >       assert 0
    E       assert 0

    test_step.py:11: AssertionError
+    _________________________________ test_a1 __________________________________
+
+    db = <conftest.DB object at 0xdeadbeef0003>
+
+        def test_a1(db):
+    >       assert 0, db  # to show value
+    E       AssertionError: <conftest.DB object at 0xdeadbeef0003>
+    E       assert 0
+
+    a/test_db.py:2: AssertionError
+    _________________________________ test_a2 __________________________________
+
+    db = <conftest.DB object at 0xdeadbeef0003>
+
+        def test_a2(db):
+    >       assert 0, db  # to show value
+    E       AssertionError: <conftest.DB object at 0xdeadbeef0003>
+    E       assert 0
+
+    a/test_db2.py:2: AssertionError
    ========================= short test summary info ==========================
+    FAILED test_step.py::TestUserHandling::test_modification - assert 0
    FAILED a/test_db.py::test_a1 - AssertionError: <conftest.DB object at 0x7...
    FAILED a/test_db2.py::test_a2 - AssertionError: <conftest.DB object at 0x...
-    FAILED test_step.py::TestUserHandling::test_modification - assert 0
    ERROR b/test_error.py::test_root
    ============= 3 failed, 2 passed, 1 xfailed, 1 error in 0.12s ==============

@@ -871,7 +846,7 @@ and run them:

    $ pytest test_module.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 2 items

@@ -980,7 +955,7 @@ and run it:

    $ pytest -s test_module.py
    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-8.x.y, pluggy-1.x.y
+    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
    collected 3 items

--- a/doc/en/example/xfail_demo.py
+++ b/doc/en/example/xfail_demo.py
@@ -1,6 +1,5 @@
 import pytest

-
 xfail = pytest.mark.xfail


--- a/doc/en/explanation/fixtures.rst
+++ b/doc/en/explanation/fixtures.rst
@@ -85,7 +85,7 @@ style of setup/teardown functions:
 In addition, pytest continues to support :ref:`xunitsetup`.  You can mix
 both styles, moving incrementally from classic to new style, as you
 prefer.  You can also start out from existing :ref:`unittest.TestCase
-style <unittest.TestCase>`.
+style <unittest.TestCase>` or :ref:`nose based <nosestyle>` projects.



@@ -162,7 +162,7 @@ A note about fixture cleanup
 ----------------------------

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

--- a/doc/en/explanation/flaky.rst
+++ b/doc/en/explanation/flaky.rst
@@ -52,9 +52,10 @@ Plugins

 Rerunning any failed tests can mitigate the negative effects of flaky tests by giving them additional chances to pass, so that the overall build does not fail. Several pytest plugins support this:

+* `flaky <https://github.com/box/flaky>`_
+* `pytest-flakefinder <https://github.com/dropbox/pytest-flakefinder>`_ - `blog post <https://blogs.dropbox.com/tech/2016/03/open-sourcing-pytest-tools/>`_
 * `pytest-rerunfailures <https://github.com/pytest-dev/pytest-rerunfailures>`_
 * `pytest-replay <https://github.com/ESSS/pytest-replay>`_: This plugin helps to reproduce locally crashes or flaky tests observed during CI runs.
-* `pytest-flakefinder <https://github.com/dropbox/pytest-flakefinder>`_ - `blog post <https://blogs.dropbox.com/tech/2016/03/open-sourcing-pytest-tools/>`_

 Plugins to deliberately randomize tests can help expose tests with state problems:

@@ -105,7 +106,7 @@ This is a limited list, please submit an issue or pull request to expand it!
 * Gao, Zebao, Yalan Liang, Myra B. Cohen, Atif M. Memon, and Zhen Wang. "Making system user interactive tests repeatable: When and what should we control?." In *Software Engineering (ICSE), 2015 IEEE/ACM 37th IEEE International Conference on*, vol. 1, pp. 55-65. IEEE, 2015.  `PDF <http://www.cs.umd.edu/~atif/pubs/gao-icse15.pdf>`__
 * Palomba, Fabio, and Andy Zaidman. "Does refactoring of test smells induce fixing flaky tests?." In *Software Maintenance and Evolution (ICSME), 2017 IEEE International Conference on*, pp. 1-12. IEEE, 2017. `PDF in Google Drive <https://drive.google.com/file/d/10HdcCQiuQVgW3yYUJD-TSTq1NbYEprl0/view>`__
 *  Bell, Jonathan, Owolabi Legunsen, Michael Hilton, Lamyaa Eloussi, Tifany Yung, and Darko Marinov. "DeFlaker: Automatically detecting flaky tests." In *Proceedings of the 2018 International Conference on Software Engineering*. 2018. `PDF <https://www.jonbell.net/icse18-deflaker.pdf>`__
-*  Dutta, Saikat and Shi, August and Choudhary, Rutvik and Zhang, Zhekun and Jain, Aryaman and Misailovic, Sasa. "Detecting flaky tests in probabilistic and machine learning applications." In *Proceedings of the 29th ACM SIGSOFT International Symposium on Software Testing and Analysis (ISSTA)*, pp. 211-224. ACM, 2020. `PDF <https://www.cs.cornell.edu/~saikatd/papers/flash-issta20.pdf>`__
+

 Resources
 ^^^^^^^^^
--- a/doc/en/explanation/goodpractices.rst
+++ b/doc/en/explanation/goodpractices.rst
@@ -60,10 +60,8 @@ Within Python modules, ``pytest`` also discovers tests using the standard
 :ref:`unittest.TestCase <unittest.TestCase>` subclassing technique.


-.. _`test layout`:
-
-Choosing a test layout
----------------------
+Choosing a test layout / import rules
+-------------------------------------

 ``pytest`` supports two common test layouts:

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Grainger	662fc9c012	docs	2023-10-19 18:31:45 +01:00
Thomas Grainger	db62b80e8d	fix some_dir NameError	2023-10-19 18:29:24 +01:00
Thomas Grainger	4821a41967	add type annotations	2023-10-19 18:29:11 +01:00
Thomas Grainger	ff12e083c5	doc exc param to importorskip	2023-10-19 18:25:56 +01:00
Thomas Grainger	6e40458fc1	make exc kwonly	2023-10-19 18:25:43 +01:00
Thomas Grainger	e74a6da699	use old style type annotation	2023-10-19 18:23:36 +01:00
pre-commit-ci[bot]	5e6dc297c2	[pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci	2023-10-19 17:18:56 +00:00
Thomas Grainger	5ba3351b52	add tests	2023-10-19 18:17:27 +01:00
pre-commit-ci[bot]	f34091f0ec	[pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci	2023-10-19 17:11:49 +00:00
Thomas Grainger	dc2080f3be	gh-11523: add importorskip(exc=...) kwarg Fixes #11523	2023-10-19 18:10:41 +01:00
				`@@ -0,0 +1 @@`
				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.
				`@@ -0,0 +1 @@`
				Added a warning about modifying the root logger during tests when using ``caplog``.
				`@@ -0,0 +1 @@`
				Updated documentation and tests to refer to hyphonated options: replaced ``--junitxml`` with ``--junit-xml`` and ``--collectonly`` with ``--collect-only``.
				`@@ -0,0 +1 @@`
				`- Prevent constants at the top of file from being detected as docstrings.`
				`@@ -0,0 +1 @@`
				Dropped support for Python 3.7, which `reached end-of-life on 2023-06-27 <https://devguide.python.org/versions/>`__.
				`@@ -0,0 +1 @@`
				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.
				`@@ -0,0 +1 @@`
				Allow :func:`pytest.raises` ``match`` argument to match against `PEP-678 <https://peps.python.org/pep-0678/>` ``__notes__``.
				`@@ -0,0 +1 @@`
				Fixed ``:=`` in asserts impacting unrelated test cases.
				`@@ -0,0 +1 @@`
				Fixed crash on `parametrize(..., scope="package")` without a package present.