Prepare release version 7.0.0rc1

.github/dependabot.yml

@@ -9,9 +9,3 @@ updates:
   allow:
   - dependency-type: direct
   - dependency-type: indirect
-- package-ecosystem: github-actions
-  directory: /
-  schedule:
-    interval: weekly
-    time: "03:00"
-  open-pull-requests-limit: 10

.github/workflows/backport.yml

@@ -1,51 +0,0 @@
-name: backport
-
-on:
-  # Note that `pull_request_target` has security implications:
-  # https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
-  # In particular:
-  # - Only allow triggers that can be used only be trusted users
-  # - Don't execute any code from the target branch
-  # - Don't use cache
-  pull_request_target:
-    types: [labeled]
-
-# Set permissions at the job level.
-permissions: {}
-
-jobs:
-  backport:
-    if: startsWith(github.event.label.name, 'backport ') && github.event.pull_request.merged
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        persist-credentials: true
-
-    - name: Create backport PR
-      run: |
-        set -eux
-
-        git config --global user.name "pytest bot"
-        git config --global user.email "pytestbot@gmail.com"
-
-        label='${{ github.event.label.name }}'
-        target_branch="${label#backport }"
-        backport_branch=backport-${{ github.event.number }}-to-"${target_branch}"
-        subject="[$target_branch] $(gh pr view --json title -q .title ${{ github.event.number }})"
-
-        git checkout origin/"${target_branch}" -b "${backport_branch}"
-        git cherry-pick -x --mainline 1 ${{ github.event.pull_request.merge_commit_sha }}
-        git commit --amend --message "$subject"
-        git push --set-upstream origin --force-with-lease "${backport_branch}"
-        gh pr create \
-          --base "${target_branch}" \
-          --title "${subject}" \
-          --body "Backport of PR #${{ github.event.number }} to $target_branch branch. PR created by backport workflow."
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy.yml

@@ -1,55 +0,0 @@
-name: deploy
-
-on:
-  push:
-    tags:
-      # These tags are protected, see:
-      # https://github.com/pytest-dev/pytest/settings/tag_protection
-      - "[0-9]+.[0-9]+.[0-9]+"
-      - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
-
-
-# Set permissions at the job level.
-permissions: {}
-
-jobs:
-
-  deploy:
-    if: github.repository == 'pytest-dev/pytest'
-
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    permissions:
-      contents: write
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.7"
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade build tox
-
-    - name: Build package
-      run: |
-        python -m build
-
-    - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        password: ${{ secrets.pypi_token }}
-
-    - name: Publish GitHub release notes
-      env:
-        GH_RELEASE_NOTES_TOKEN: ${{ github.token }}
-      run: |
-        sudo apt-get install pandoc
-        tox -e publish-gh-release-notes

.github/workflows/main.yml

@@ -1,11 +1,10 @@
-name: test
+name: main
 
 on:
   push:
     branches:
       - main
       - "[0-9]+.[0-9]+.x"
-      - "test-me-*"
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+rc[0-9]+"
@@ -24,7 +23,7 @@ permissions: {}
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 45
+    timeout-minutes: 30
     permissions:
       contents: read
 
@@ -32,26 +31,24 @@ jobs:
       fail-fast: false
       matrix:
         name: [
+          "windows-py36",
           "windows-py37",
           "windows-py37-pluggy",
           "windows-py38",
           "windows-py39",
           "windows-py310",
-          "windows-py311",
 
+          "ubuntu-py36",
           "ubuntu-py37",
           "ubuntu-py37-pluggy",
           "ubuntu-py37-freeze",
           "ubuntu-py38",
           "ubuntu-py39",
           "ubuntu-py310",
-          "ubuntu-py311",
           "ubuntu-pypy3",
 
           "macos-py37",
           "macos-py38",
-          "macos-py39",
-          "macos-py310",
 
           "docs",
           "doctesting",
@@ -59,6 +56,10 @@ jobs:
         ]
 
         include:
+          - name: "windows-py36"
+            python: "3.6"
+            os: windows-latest
+            tox_env: "py36-xdist"
           - name: "windows-py37"
             python: "3.7"
             os: windows-latest
@@ -66,7 +67,7 @@ jobs:
           - name: "windows-py37-pluggy"
             python: "3.7"
             os: windows-latest
-            tox_env: "py37-pluggymain-pylib-xdist"
+            tox_env: "py37-pluggymain-xdist"
           - name: "windows-py38"
             python: "3.8"
             os: windows-latest
@@ -77,14 +78,14 @@ jobs:
             os: windows-latest
             tox_env: "py39-xdist"
           - name: "windows-py310"
-            python: "3.10"
+            python: "3.10-dev"
             os: windows-latest
             tox_env: "py310-xdist"
-          - name: "windows-py311"
-            python: "3.11-dev"
-            os: windows-latest
-            tox_env: "py311"
 
+          - name: "ubuntu-py36"
+            python: "3.6"
+            os: ubuntu-latest
+            tox_env: "py36-xdist"
           - name: "ubuntu-py37"
             python: "3.7"
             os: ubuntu-latest
@@ -93,7 +94,7 @@ jobs:
           - name: "ubuntu-py37-pluggy"
             python: "3.7"
             os: ubuntu-latest
-            tox_env: "py37-pluggymain-pylib-xdist"
+            tox_env: "py37-pluggymain-xdist"
           - name: "ubuntu-py37-freeze"
             python: "3.7"
             os: ubuntu-latest
@@ -107,14 +108,9 @@ jobs:
             os: ubuntu-latest
             tox_env: "py39-xdist"
           - name: "ubuntu-py310"
-            python: "3.10"
+            python: "3.10-dev"
             os: ubuntu-latest
             tox_env: "py310-xdist"
-          - name: "ubuntu-py311"
-            python: "3.11-dev"
-            os: ubuntu-latest
-            tox_env: "py311"
-            use_coverage: true
           - name: "ubuntu-pypy3"
             python: "pypy-3.7"
             os: ubuntu-latest
@@ -129,17 +125,9 @@ jobs:
             os: macos-latest
             tox_env: "py38-xdist"
             use_coverage: true
-          - name: "macos-py39"
-            python: "3.9"
-            os: macos-latest
-            tox_env: "py39-xdist"
-          - name: "macos-py310"
-            python: "3.10"
-            os: macos-latest
-            tox_env: "py310-xdist"
 
           - name: "plugins"
-            python: "3.9"
+            python: "3.7"
             os: ubuntu-latest
             tox_env: "plugins"
 
@@ -154,13 +142,13 @@ jobs:
             use_coverage: true
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
       with:
         fetch-depth: 0
         persist-credentials: false
 
     - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
 
@@ -183,9 +171,51 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: "matrix.use_coverage"
-      uses: codecov/codecov-action@v3
-      continue-on-error: true
+      uses: codecov/codecov-action@v2
       with:
         fail_ci_if_error: true
         files: ./coverage.xml
         verbose: true
+
+  deploy:
+    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest'
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    permissions:
+      contents: write
+
+    needs: [build]
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.7"
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade build tox
+
+    - name: Build package
+      run: |
+        python -m build
+
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_token }}
+
+    - name: Publish GitHub release notes
+      env:
+        GH_RELEASE_NOTES_TOKEN: ${{ github.token }}
+      run: |
+        sudo apt-get install pandoc
+        tox -e publish-gh-release-notes

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

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

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

@@ -11,8 +11,7 @@ on:
 permissions: {}
 
 jobs:
-  update-plugin-list:
-    if: github.repository_owner == 'pytest-dev'
+  createPullRequest:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -20,12 +19,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
 
@@ -38,7 +37,7 @@ jobs:
         run: python scripts/update-plugin-list.py
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04
+        uses: peter-evans/create-pull-request@2455e1596942c2902952003bbb574afbbe2ab2e6
         with:
           commit-message: '[automated] Update plugin list'
           author: 'pytest bot <pytestbot@users.noreply.github.com>'

.gitignore

@@ -50,7 +50,6 @@ coverage.xml
 .project
 .settings
 .vscode
-__pycache__/
 
 # generated by pip
 pip-wheel-metadata/

.pre-commit-config.yaml

@@ -1,18 +1,16 @@
-default_language_version:
-    python: "3.10"
 repos:
 -   repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 21.11b1
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.1
+    rev: v1.12.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==20.8b1]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.0.1
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -22,56 +20,47 @@ repos:
     -   id: debug-statements
         exclude: _pytest/(debugging|hookspec).py
         language_version: python3
--   repo: https://github.com/PyCQA/autoflake
-    rev: v2.0.0
-    hooks:
-    -   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.0.0
+    rev: 4.0.1
     hooks:
     -   id: flake8
         language_version: python3
         additional_dependencies:
-          - flake8-typing-imports==1.12.0
+          - flake8-typing-imports==1.9.0
           - flake8-docstrings==1.5.0
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.9.0
+    rev: v2.6.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py37-plus]
+        args: ['--application-directories=.:src', --py36-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v2.29.1
     hooks:
     -   id: pyupgrade
-        args: [--py37-plus]
+        args: [--py36-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
+    rev: v1.20.0
     hooks:
     -   id: setup-cfg-fmt
-        args: ["--max-py-version=3.11", "--include-version-classifiers"]
+        args: [--max-py-version=3.10]
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.9.0
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.991
+    rev: v0.910-1
     hooks:
     -   id: mypy
         files: ^(src/|testing/)
         args: []
         additional_dependencies:
           - iniconfig>=1.1.0
+          - py>=1.8.2
           - attrs>=19.2.0
           - packaging
           - tomli
+          - types-atomicwrites
           - types-pkg_resources
-            # for mypy running on python>=3.11 since exceptiongroup is only a dependency
-            # on <3.11
-          - exceptiongroup>=1.0.0rc8
 -   repo: local
     hooks:
     -   id: rst
@@ -104,7 +93,7 @@ repos:
         types: [python]
     -   id: py-path-deprecated
         name: py.path usage is deprecated
-        exclude: docs|src/_pytest/deprecated.py|testing/deprecated_test.py|src/_pytest/legacypath.py
+        exclude: docs|src/_pytest/deprecated.py|testing/deprecated_test.py
         language: pygrep
         entry: \bpy\.path\.local
         types: [python]

.readthedocs.yml

@@ -2,12 +2,9 @@ version: 2
 
 python:
    install:
-     # Install pytest first, then doc/en/requirements.txt.
-     # This order is important to honor any pins in doc/en/requirements.txt
-     # when the pinned library is also a dependency of pytest.
-     - method: pip
-       path: .
-     - requirements: doc/en/requirements.txt
+      - requirements: doc/en/requirements.txt
+      - method: pip
+        path: .
 
 build:
   os: ubuntu-20.04

AUTHORS

@@ -15,7 +15,6 @@ Alan Velasco
 Alexander Johnson
 Alexander King
 Alexei Kozlenok
-Alice Purcell
 Allan Feldman
 Aly Sivji
 Amir Elkess
@@ -43,10 +42,8 @@ Ariel Pillemer
 Armin Rigo
 Aron Coyle
 Aron Curzon
-Ashish Kurmi
 Aviral Verma
 Aviv Palivoda
-Babak Keyvani
 Barney Gale
 Ben Gartner
 Ben Webb
@@ -58,7 +55,6 @@ Brian Maissy
 Brian Okken
 Brianna Laugher
 Bruno Oliveira
-Cal Jacobson
 Cal Leeming
 Carl Friedrich Bolz
 Carlos Jenkins
@@ -66,11 +62,9 @@ Ceridwen
 Charles Cloud
 Charles Machalow
 Charnjit SiNGH (CCSJ)
-Cheuk Ting Ho
 Chris Lamb
 Chris NeJame
 Chris Rose
-Chris Wheeler
 Christian Boelsen
 Christian Fetzer
 Christian Neumüller
@@ -89,8 +83,6 @@ Damian Skrzypczak
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
-Daniel Sánchez Castelló
-Daniel Valenzuela Zenteno
 Daniel Wandschneider
 Daniele Procida
 Danielle Jenkins
@@ -132,7 +124,6 @@ Feng Ma
 Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
-Gabriel Landau
 Gabriel Reis
 Garvit Shubham
 Gene Wood
@@ -158,7 +149,6 @@ Ian Bicking
 Ian Lesperance
 Ilya Konstantinov
 Ionuț Turturică
-Itxaso Aizpurua
 Iwan Briquemont
 Jaap Broekhuizen
 Jakob van Santen
@@ -173,9 +163,7 @@ Jeff Rackauckas
 Jeff Widman
 Jenni Rinker
 John Eddie Ayson
-John Litborn
 John Towler
-Jon Parise
 Jon Sonesen
 Jonas Obrist
 Jordan Guymon
@@ -185,8 +173,8 @@ Joseph Hunkeler
 Josh Karpel
 Joshua Bronson
 Jurko Gospodnetić
-Justice Ndou
 Justyna Janczyszyn
+Justice Ndou
 Kale Kundert
 Kamran Ahmad
 Karl O. Pinc
@@ -195,14 +183,9 @@ Katarzyna Jachim
 Katarzyna Król
 Katerina Koukiou
 Keri Volans
-Kevin C
 Kevin Cox
-Kevin Hierro Carrasco
 Kevin J. Foley
-Kian Eliasi
-Kian-Meng Ang
 Kodi B. Arfer
-Kojo Idrissa
 Kostis Anagnostopoulos
 Kristoffer Nordström
 Kyle Altendorf
@@ -225,7 +208,6 @@ Marcin Bachry
 Marco Gorelli
 Mark Abramowitz
 Mark Dickinson
-Marko Pacak
 Markus Unterwaditzer
 Martijn Faassen
 Martin Altmayer
@@ -239,6 +221,7 @@ Matthias Hafner
 Maxim Filipenko
 Maximilian Cosmo Sitter
 mbyt
+Mickey Pashov
 Michael Aquilina
 Michael Birtwell
 Michael Droettboom
@@ -247,7 +230,6 @@ Michael Krebs
 Michael Seifert
 Michal Wajszczuk
 Michał Zięba
-Mickey Pashov
 Mihai Capotă
 Mike Hoyle (hoylemd)
 Mike Lundy
@@ -261,10 +243,9 @@ Nicholas Murphy
 Niclas Olofsson
 Nicolas Delaby
 Nikolay Kondratyev
-Nipunn Koorapati
+Olga Matoula
 Oleg Pidsadnyi
 Oleg Sushchenko
-Olga Matoula
 Oliver Bestwalter
 Omar Kohl
 Omer Hadari
@@ -272,15 +253,12 @@ Ondřej Súkup
 Oscar Benjamin
 Parth Patel
 Patrick Hayes
-Paul Müller
-Paul Reece
 Pauli Virtanen
 Pavel Karateev
 Paweł Adamczak
 Pedro Algarvio
 Petter Strandmark
 Philipp Loose
-Pierre Sassoulas
 Pieter Mulder
 Piotr Banaszkiewicz
 Piotr Helm
@@ -291,8 +269,8 @@ Pulkit Goyal
 Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
-Ralph Giles
 Ram Rachum
+Ralph Giles
 Ran Benita
 Raphael Castaneda
 Raphael Pierzina
@@ -309,7 +287,6 @@ Ruaridh Williamson
 Russel Winder
 Ryan Wooden
 Saiprasad Kale
-Samuel Colvin
 Samuel Dion-Girardeau
 Samuel Searles-Bryant
 Samuele Pedroni
@@ -321,7 +298,6 @@ Seth Junot
 Shantanu Jain
 Shubham Adep
 Simon Gomizelj
-Simon Holesch
 Simon Kerr
 Skylar Downes
 Srinivas Reddy Thatiparthy
@@ -339,31 +315,26 @@ Taneli Hukkinen
 Tanvi Mehta
 Tarcisio Fischer
 Tareq Alayan
-Tatiana Ovary
 Ted Xiao
 Terje Runde
 Thomas Grainger
 Thomas Hisch
 Tim Hoffmann
 Tim Strazny
-Tobias Diez
 Tom Dalton
 Tom Viner
 Tomáš Gavenčiak
 Tomer Keren
-Tony Narlock
 Tor Colvin
 Trevor Bekolay
 Tyler Goodlet
 Tzu-ping Chung
 Vasily Kuznetsov
 Victor Maryama
-Victor Rodriguez
 Victor Uriarte
 Vidar T. Fauske
 Virgil Dupras
 Vitaly Lashmanov
-Vivaan Verma
 Vlad Dragos
 Vlad Radziuk
 Vladyslav Rachek
@@ -377,11 +348,7 @@ Xixi Zhao
 Xuan Luong
 Xuecong Liao
 Yoav Caspi
-Yusuke Kadowaki
-Yuval Shimon
 Zac Hatfield-Dodds
 Zachary Kneupper
-Zachary OBrien
-Zhouxin Qiu
 Zoltán Máté
 Zsolt Cserna

CONTRIBUTING.rst

@@ -50,8 +50,6 @@ Fix bugs
 --------
 
 Look through the `GitHub issues for bugs <https://github.com/pytest-dev/pytest/labels/type:%20bug>`_.
-See also the `"status: easy" issues <https://github.com/pytest-dev/pytest/labels/status%3A%20easy>`_
-that are friendly to new contributors.
 
 :ref:`Talk <contact>` to developers to find out how you can fix specific bugs. To indicate that you are going
 to work on a particular issue, add a comment to that effect on the specific issue.
@@ -223,7 +221,7 @@ changes you want to review and merge.  Pull requests are stored on
 Once you send a pull request, we can discuss its potential modifications and
 even add more commits to it later on. There's an excellent tutorial on how Pull
 Requests work in the
-`GitHub Help Center <https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests>`_.
+`GitHub Help Center <https://help.github.com/articles/using-pull-requests/>`_.
 
 Here is a simple overview, with pytest-specific bits:
 
@@ -244,11 +242,6 @@ Here is a simple overview, with pytest-specific bits:
    be released in micro releases whereas features will be released in
    minor releases and incompatible changes in major releases.
 
-   You will need the tags to test locally, so be sure you have the tags from the main repository. If you suspect you don't, set the main repository as upstream and fetch the tags::
-
-     $ git remote add upstream https://github.com/pytest-dev/pytest
-     $ git fetch upstream --tags
-
    If you need some help with Git, follow this quick start
    guide: https://git.wiki.kernel.org/index.php/QuickStart
 
@@ -385,7 +378,7 @@ them.
 Backporting bug fixes for the next patch release
 ------------------------------------------------
 
-Pytest makes a feature release every few weeks or months. In between, patch releases
+Pytest makes feature release every few weeks or months. In between, patch releases
 are made to the previous feature release, containing bug fixes only. The bug fixes
 usually fix regressions, but may be any change that should reach users before the
 next feature release.
@@ -394,17 +387,10 @@ Suppose for example that the latest release was 1.2.3, and you want to include
 a bug fix in 1.2.4 (check https://github.com/pytest-dev/pytest/releases for the
 actual latest release). The procedure for this is:
 
-#. First, make sure the bug is fixed in the ``main`` branch, with a regular pull
+#. First, make sure the bug is fixed the ``main`` branch, with a regular pull
    request, as described above. An exception to this is if the bug fix is not
    applicable to ``main`` anymore.
 
-Automatic method:
-
-Add a ``backport 1.2.x`` label to the PR you want to backport. This will create
-a backport PR against the ``1.2.x`` branch.
-
-Manual method:
-
 #. ``git checkout origin/1.2.x -b backport-XXXX`` # use the main PR number here
 
 #. Locate the merge commit on the PR, in the *merged* message, for example:

README.rst

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

RELEASING.rst

@@ -37,7 +37,7 @@ breaking changes or new features.
 
 For a new minor release, first create a new maintenance branch from ``main``::
 
-     git fetch upstream
+     git fetch --all
      git branch 7.1.x upstream/main
      git push upstream 7.1.x
 
@@ -63,7 +63,7 @@ Major releases
 
 1. Create a new maintenance branch from ``main``::
 
-        git fetch upstream
+        git fetch --all
         git branch 8.0.x upstream/main
         git push upstream 8.0.x
 
@@ -136,31 +136,29 @@ Both automatic and manual processes described above follow the same steps from t
 #. After all tests pass and the PR has been approved, tag the release commit
    in the ``release-MAJOR.MINOR.PATCH`` branch and push it. This will publish to PyPI::
 
-     git fetch upstream
+     git fetch --all
      git tag MAJOR.MINOR.PATCH upstream/release-MAJOR.MINOR.PATCH
-     git push upstream MAJOR.MINOR.PATCH
+     git push git@github.com:pytest-dev/pytest.git MAJOR.MINOR.PATCH
 
    Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
 
-#. Merge the PR. **Make sure it's not squash-merged**, so that the tagged commit ends up in the main branch.
+#. Merge the PR.
 
 #. Cherry-pick the CHANGELOG / announce files to the ``main`` branch::
 
-       git fetch upstream
+       git fetch --all --prune
        git checkout upstream/main -b cherry-pick-release
        git cherry-pick -x -m1 upstream/MAJOR.MINOR.x
 
 #. Open a PR for ``cherry-pick-release`` and merge it once CI passes. No need to wait for approvals if there were no conflicts on the previous step.
 
-#. For major and minor releases (or the first prerelease of it), tag the release cherry-pick merge commit in main with
+#. For major and minor releases, tag the release cherry-pick merge commit in main with
    a dev tag for the next feature release::
 
        git checkout main
        git pull
        git tag MAJOR.{MINOR+1}.0.dev0
-       git push upstream MAJOR.{MINOR+1}.0.dev0
-
-#. For major and minor releases, change the default version in the `Read the Docs Settings <https://readthedocs.org/dashboard/pytest/advanced/>`_ to the new branch.
+       git push git@github.com:pytest-dev/pytest.git MAJOR.{MINOR+1}.0.dev0
 
 #. Send an email announcement with the contents from::
 

changelog/10226.improvement.rst

@@ -1 +0,0 @@
-If multiple errors are raised in teardown, we now re-raise an ``ExceptionGroup`` of them instead of discarding all but the last.

changelog/10452.bugfix.rst

@@ -1 +0,0 @@
-Fix 'importlib.abc.TraversableResources' deprecation warning in Python 3.12.

changelog/10457.bugfix.rst

@@ -1 +0,0 @@
-If a test is skipped from inside a fixture, the test summary now shows the test location instead of the fixture location.

changelog/10506.bugfix.rst

@@ -1 +0,0 @@
-Fix bug where sometimes pytest would use the file system root directory as :ref:`rootdir <rootdir>` on Windows.

changelog/10525.feature.rst

@@ -1 +0,0 @@
-Test methods decorated with ``@classmethod`` can now be discovered as tests, following the same rules as normal methods. This fills the gap that static methods were discoverable as tests but not class methods.

changelog/6267.improvement.rst

@@ -1,2 +0,0 @@
-The full output of a test is no longer truncated if the truncation message would be longer than
-the hidden text. The line number shown has also been fixed.

changelog/7431.feature.rst

@@ -1 +0,0 @@
-``--log-disable`` CLI option added to disable individual loggers.

changelog/8141.feature.rst

@@ -1,2 +0,0 @@
-Added :confval:`tmp_path_retention_count` and :confval:`tmp_path_retention_policy` configuration options to control how directories created by the :fixture:`tmp_path` fixture are kept.
-The default behavior has changed to keep only directories for failed tests, equivalent to `tmp_path_retention_policy="failed"`.

doc/en/_templates/globaltoc.html

@@ -17,6 +17,7 @@
   <li><a href="{{ pathto('changelog') }}">Changelog</a></li>
   <li><a href="{{ pathto('contributing') }}">Contributing</a></li>
   <li><a href="{{ pathto('backwards-compatibility') }}">Backwards Compatibility</a></li>
+  <li><a href="{{ pathto('py27-py34-deprecation') }}">Python 2.7 and 3.4 Support</a></li>
   <li><a href="{{ pathto('sponsor') }}">Sponsor</a></li>
   <li><a href="{{ pathto('tidelift') }}">pytest for Enterprise</a></li>
   <li><a href="{{ pathto('license') }}">License</a></li>
@@ -29,3 +30,5 @@
 {%- endif %}
 
 <hr>
+<a href="{{ pathto('genindex') }}">Index</a>
+<hr>

doc/en/announce/index.rst

@@ -6,13 +6,6 @@ Release announcements
    :maxdepth: 2
 
 
-   release-7.2.0
-   release-7.1.3
-   release-7.1.2
-   release-7.1.1
-   release-7.1.0
-   release-7.0.1
-   release-7.0.0
    release-7.0.0rc1
    release-6.2.5
    release-6.2.4

doc/en/announce/release-2.5.0.rst

@@ -11,7 +11,7 @@ clear information about the circumstances and a simple example which
 reproduces the problem.
 
 The issue tracker is of course not empty now.  We have many remaining
-"enhancement" issues which we'll hopefully can tackle in 2014 with your
+"enhacement" issues which we'll hopefully can tackle in 2014 with your
 help.
 
 For those who use older Python versions, please note that pytest is not

doc/en/announce/release-7.0.0.rst

@@ -1,74 +0,0 @@
-pytest-7.0.0
-=======================================
-
-The pytest team is proud to announce the 7.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:
-
-* Adam J. Stewart
-* Alexander King
-* Amin Alaee
-* Andrew Neitsch
-* Anthony Sottile
-* Ben Davies
-* Bernát Gábor
-* Brian Okken
-* Bruno Oliveira
-* Cristian Vera
-* Dan Alvizu
-* David Szotten
-* Eddie
-* Emmanuel Arias
-* Emmanuel Meric de Bellefon
-* Eric Liu
-* Florian Bruhin
-* GergelyKalmar
-* Graeme Smecher
-* Harshna
-* Hugo van Kemenade
-* Jakub Kulík
-* James Myatt
-* Jeff Rasley
-* Kale Kundert
-* Kian Meng, Ang
-* Miro Hrončok
-* Naveen-Pratap
-* Oleg Höfling
-* Olga Matoula
-* Ran Benita
-* Ronny Pfannschmidt
-* Simon K
-* Srip
-* Sören Wegener
-* Taneli Hukkinen
-* Terje Runde
-* Thomas Grainger
-* Thomas Hisch
-* William Jamir Silva
-* Yuval Shimon
-* Zac Hatfield-Dodds
-* andrewdotn
-* denivyruck
-* ericluoliu
-* oleg.hoefling
-* symonk
-* ziebam
-* Éloi Rivard
-* Éric
-
-
-Happy testing,
-The pytest Development Team

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

@@ -19,7 +19,7 @@ You can upgrade from PyPI via:
 
 Users are encouraged to take a look at the CHANGELOG carefully:
 
-    https://docs.pytest.org/en/7.0.x/changelog.html
+    https://docs.pytest.org/en/stable/changelog.html
 
 Thanks to all the contributors to this release:
 

doc/en/announce/release-7.0.1.rst

@@ -1,20 +0,0 @@
-pytest-7.0.1
-=======================================
-
-pytest 7.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:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.1.0.rst

@@ -1,48 +0,0 @@
-pytest-7.1.0
-=======================================
-
-The pytest team is proud to announce the 7.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:
-
-* Akuli
-* Andrew Svetlov
-* Anthony Sottile
-* Brett Holman
-* Bruno Oliveira
-* Chris NeJame
-* Dan Alvizu
-* Elijah DeLee
-* Emmanuel Arias
-* Fabian Egli
-* Florian Bruhin
-* Gabor Szabo
-* Hasan Ramezani
-* Hugo van Kemenade
-* Kian Meng, Ang
-* Kojo Idrissa
-* Masaru Tsuchiyama
-* Olga Matoula
-* P. L. Lim
-* Ran Benita
-* Tobias Deiminger
-* Yuval Shimon
-* eduardo naufel schettino
-* Éric
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.1.1.rst

@@ -1,18 +0,0 @@
-pytest-7.1.1
-=======================================
-
-pytest 7.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

doc/en/announce/release-7.1.2.rst

@@ -1,23 +0,0 @@
-pytest-7.1.2
-=======================================
-
-pytest 7.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:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Hugo van Kemenade
-* Kian Eliasi
-* Ran Benita
-* Zac Hatfield-Dodds
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.1.3.rst

@@ -1,28 +0,0 @@
-pytest-7.1.3
-=======================================
-
-pytest 7.1.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:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Gergely Kalmár
-* Nipunn Koorapati
-* Pax
-* Sviatoslav Sydorenko
-* Tim Hoffmann
-* Tony Narlock
-* Wolfremium
-* Zach OBrien
-* aizpurua23a
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-7.2.0.rst

@@ -1,93 +0,0 @@
-pytest-7.2.0
-=======================================
-
-The pytest team is proud to announce the 7.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:
-
-* Aaron Berdy
-* Adam Turner
-* Albert Villanova del Moral
-* Alice Purcell
-* Anthony Sottile
-* Anton Yakutovich
-* Babak Keyvani
-* Brandon Chinn
-* Bruno Oliveira
-* Chanvin Xiao
-* Cheuk Ting Ho
-* Chris Wheeler
-* EmptyRabbit
-* Ezio Melotti
-* Florian Best
-* Florian Bruhin
-* Fredrik Berndtsson
-* Gabriel Landau
-* Gergely Kalmár
-* Hugo van Kemenade
-* James Gerity
-* John Litborn
-* Jon Parise
-* Kevin C
-* Kian Eliasi
-* MatthewFlamm
-* Miro Hrončok
-* Nate Meyvis
-* Neil Girdhar
-* Nhieuvu1802
-* Nipunn Koorapati
-* Ofek Lev
-* Paul Müller
-* Paul Reece
-* Pax
-* Pete Baughman
-* Peyman Salehi
-* Philipp A
-* Ran Benita
-* Robert O'Shea
-* Ronny Pfannschmidt
-* Rowin
-* Ruth Comer
-* Samuel Colvin
-* Samuel Gaist
-* Sandro Tosi
-* Shantanu
-* Simon K
-* Stephen Rosen
-* Sviatoslav Sydorenko
-* Tatiana Ovary
-* Thierry Moisan
-* Thomas Grainger
-* Tim Hoffmann
-* Tobias Diez
-* Tony Narlock
-* Vivaan Verma
-* Wolfremium
-* Zac Hatfield-Dodds
-* Zach OBrien
-* aizpurua23a
-* gresm
-* holesch
-* itxasos23
-* johnkangw
-* skhomuti
-* sommersoft
-* wodny
-* zx.qiu
-
-
-Happy testing,
-The pytest Development Team

doc/en/backwards-compatibility.rst

@@ -77,18 +77,3 @@ Deprecation Roadmap
 Features currently deprecated and removed in previous releases can be found in :ref:`deprecations`.
 
 We track future deprecation and removal of features using milestones and the `deprecation <https://github.com/pytest-dev/pytest/issues?q=label%3A%22type%3A+deprecation%22>`_ and `removal <https://github.com/pytest-dev/pytest/labels/type%3A%20removal>`_ labels on GitHub.
-
-
-Python version support
-======================
-
-Released pytest versions support all Python versions that are actively maintained at the time of the release:
-
-==============  ===================
-pytest version  min. Python version
-==============  ===================
-7.1+            3.7+
-6.2 - 7.0       3.6+
-5.0 - 6.1       3.5+
-3.3 - 4.6       2.7, 3.4+
-==============  ===================

doc/en/builtin.rst

@@ -33,93 +33,39 @@ 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.
 
-    capsys -- .../_pytest/capture.py:905
+    capsys -- .../_pytest/capture.py:878
         Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.
 
         The captured output is made available via ``capsys.readouterr()`` method
         calls, which return a ``(out, err)`` namedtuple.
         ``out`` and ``err`` will be ``text`` objects.
 
-        Returns an instance of :class:`CaptureFixture[str] <pytest.CaptureFixture>`.
-
-        Example:
-
-        .. code-block:: python
-
-            def test_output(capsys):
-                print("hello")
-                captured = capsys.readouterr()
-                assert captured.out == "hello\n"
-
-    capsysbinary -- .../_pytest/capture.py:933
+    capsysbinary -- .../_pytest/capture.py:895
         Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.
 
         The captured output is made available via ``capsysbinary.readouterr()``
         method calls, which return a ``(out, err)`` namedtuple.
         ``out`` and ``err`` will be ``bytes`` objects.
 
-        Returns an instance of :class:`CaptureFixture[bytes] <pytest.CaptureFixture>`.
-
-        Example:
-
-        .. code-block:: python
-
-            def test_output(capsysbinary):
-                print("hello")
-                captured = capsysbinary.readouterr()
-                assert captured.out == b"hello\n"
-
-    capfd -- .../_pytest/capture.py:961
+    capfd -- .../_pytest/capture.py:912
         Enable text capturing of writes to file descriptors ``1`` and ``2``.
 
         The captured output is made available via ``capfd.readouterr()`` method
         calls, which return a ``(out, err)`` namedtuple.
         ``out`` and ``err`` will be ``text`` objects.
 
-        Returns an instance of :class:`CaptureFixture[str] <pytest.CaptureFixture>`.
-
-        Example:
-
-        .. code-block:: python
-
-            def test_system_echo(capfd):
-                os.system('echo "hello"')
-                captured = capfd.readouterr()
-                assert captured.out == "hello\n"
-
-    capfdbinary -- .../_pytest/capture.py:989
+    capfdbinary -- .../_pytest/capture.py:929
         Enable bytes capturing of writes to file descriptors ``1`` and ``2``.
 
         The captured output is made available via ``capfd.readouterr()`` method
         calls, which return a ``(out, err)`` namedtuple.
         ``out`` and ``err`` will be ``byte`` objects.
 
-        Returns an instance of :class:`CaptureFixture[bytes] <pytest.CaptureFixture>`.
-
-        Example:
-
-        .. code-block:: python
-
-            def test_system_echo(capfdbinary):
-                os.system('echo "hello"')
-                captured = capfdbinary.readouterr()
-                assert captured.out == b"hello\n"
-
-    doctest_namespace [session scope] -- .../_pytest/doctest.py:738
+    doctest_namespace [session scope] -- .../_pytest/doctest.py:731
         Fixture that returns a :py:class:`dict` that will be injected into the
         namespace of doctests.
 
-        Usually this fixture is used in conjunction with another ``autouse`` fixture:
-
-        .. code-block:: python
-
-            @pytest.fixture(autouse=True)
-            def add_np(doctest_namespace):
-                doctest_namespace["np"] = numpy
-
-        For more details: :ref:`doctest_namespace`.
-
-    pytestconfig [session scope] -- .../_pytest/fixtures.py:1351
+    pytestconfig [session scope] -- .../_pytest/fixtures.py:1365
         Session-scoped fixture that returns the session's :class:`pytest.Config`
         object.
 
@@ -163,10 +109,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
                 record_testsuite_property("ARCH", "PPC")
                 record_testsuite_property("STORAGE_TYPE", "CEPH")
 
-        :param name:
-            The property name.
-        :param value:
-            The property value. Will be converted to a string.
+        ``name`` must be a string, ``value`` will be converted to a string and properly xml-escaped.
 
         .. warning::
 
@@ -174,10 +117,10 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             `pytest-xdist <https://github.com/pytest-dev/pytest-xdist>`__ plugin. See
             :issue:`7767` for details.
 
-    tmpdir_factory [session scope] -- .../_pytest/legacypath.py:302
+    tmpdir_factory [session scope] -- .../_pytest/legacypath.py:292
         Return a :class:`pytest.TempdirFactory` instance for the test session.
 
-    tmpdir -- .../_pytest/legacypath.py:309
+    tmpdir -- .../_pytest/legacypath.py:299
         Return a temporary directory path object which is unique to each test
         function invocation, created as a sub directory of the base temporary
         directory.
@@ -189,14 +132,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         The returned object is a `legacy_path`_ object.
 
-        .. note::
-            These days, it is preferred to use ``tmp_path``.
-
-            :ref:`About the tmpdir and tmpdir_factory fixtures<tmpdir and tmpdir_factory>`.
-
         .. _legacy_path: https://py.readthedocs.io/en/latest/path.html
 
-    caplog -- .../_pytest/logging.py:491
+    caplog -- .../_pytest/logging.py:483
         Access and control log capturing.
 
         Captured logs are available through the following properties/methods::
@@ -210,37 +148,32 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
     monkeypatch -- .../_pytest/monkeypatch.py:29
         A convenient fixture for monkey-patching.
 
-        The fixture provides these methods to modify objects, dictionaries, or
-        :data:`os.environ`:
+        The fixture provides these methods to modify objects, dictionaries or
+        os.environ::
 
-        * :meth:`monkeypatch.setattr(obj, name, value, raising=True) <pytest.MonkeyPatch.setattr>`
-        * :meth:`monkeypatch.delattr(obj, name, raising=True) <pytest.MonkeyPatch.delattr>`
-        * :meth:`monkeypatch.setitem(mapping, name, value) <pytest.MonkeyPatch.setitem>`
-        * :meth:`monkeypatch.delitem(obj, name, raising=True) <pytest.MonkeyPatch.delitem>`
-        * :meth:`monkeypatch.setenv(name, value, prepend=None) <pytest.MonkeyPatch.setenv>`
-        * :meth:`monkeypatch.delenv(name, raising=True) <pytest.MonkeyPatch.delenv>`
-        * :meth:`monkeypatch.syspath_prepend(path) <pytest.MonkeyPatch.syspath_prepend>`
-        * :meth:`monkeypatch.chdir(path) <pytest.MonkeyPatch.chdir>`
-        * :meth:`monkeypatch.context() <pytest.MonkeyPatch.context>`
+            monkeypatch.setattr(obj, name, value, raising=True)
+            monkeypatch.delattr(obj, name, raising=True)
+            monkeypatch.setitem(mapping, name, value)
+            monkeypatch.delitem(obj, name, raising=True)
+            monkeypatch.setenv(name, value, prepend=None)
+            monkeypatch.delenv(name, raising=True)
+            monkeypatch.syspath_prepend(path)
+            monkeypatch.chdir(path)
 
         All modifications will be undone after the requesting test function or
-        fixture has finished. The ``raising`` parameter determines if a :class:`KeyError`
-        or :class:`AttributeError` will be raised if the set/deletion operation does not have the
-        specified target.
+        fixture has finished. The ``raising`` parameter determines if a KeyError
+        or AttributeError will be raised if the set/deletion operation has no target.
 
-        To undo modifications done by the fixture in a contained scope,
-        use :meth:`context() <pytest.MonkeyPatch.context>`.
-
-    recwarn -- .../_pytest/recwarn.py:30
+    recwarn -- .../_pytest/recwarn.py:29
         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
+        See https://docs.python.org/library/how-to/capture-warnings.html for information
         on warning categories.
 
-    tmp_path_factory [session scope] -- .../_pytest/tmpdir.py:188
+    tmp_path_factory [session scope] -- .../_pytest/tmpdir.py:183
         Return a :class:`pytest.TempPathFactory` instance for the test session.
 
-    tmp_path -- .../_pytest/tmpdir.py:203
+    tmp_path -- .../_pytest/tmpdir.py:198
         Return a temporary directory path object which is unique to each test
         function invocation, created as a sub directory of the base temporary
         directory.

doc/en/changelog.rst

@@ -28,380 +28,6 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
-pytest 7.2.0 (2022-10-23)
-=========================
-
-Deprecations
-------------
-
-- `#10012 <https://github.com/pytest-dev/pytest/issues/10012>`_: Update :class:`pytest.PytestUnhandledCoroutineWarning` to a deprecation; it will raise an error in pytest 8.
-
-
-- `#10396 <https://github.com/pytest-dev/pytest/issues/10396>`_: pytest no longer depends on the ``py`` library.  ``pytest`` provides a vendored copy of ``py.error`` and ``py.path`` modules but will use the ``py`` library if it is installed.  If you need other ``py.*`` modules, continue to install the deprecated ``py`` library separately, otherwise it can usually be removed as a dependency.
-
-
-- `#4562 <https://github.com/pytest-dev/pytest/issues/4562>`_: Deprecate configuring hook specs/impls using attributes/marks.
-
-  Instead use :py:func:`pytest.hookimpl` and :py:func:`pytest.hookspec`.
-  For more details, see the :ref:`docs <legacy-path-hooks-deprecated>`.
-
-
-- `#9886 <https://github.com/pytest-dev/pytest/issues/9886>`_: The functionality for running tests written for ``nose`` has been officially deprecated.
-
-  This includes:
-
-  * Plain ``setup`` and ``teardown`` functions and methods: this might catch users by surprise, as ``setup()`` and ``teardown()`` are not pytest idioms, but part of the ``nose`` support.
-  * Setup/teardown using the `@with_setup <with-setup-nose>`_ decorator.
-
-  For more details, consult the :ref:`deprecation docs <nose-deprecation>`.
-
-  .. _`with-setup-nose`: https://nose.readthedocs.io/en/latest/testing_tools.html?highlight=with_setup#nose.tools.with_setup
-
-- `#7337 <https://github.com/pytest-dev/pytest/issues/7337>`_: A deprecation warning is now emitted if a test function returns something other than `None`. This prevents a common mistake among beginners that expect that returning a `bool` (for example `return foo(a, b) == result`) would cause a test to pass or fail, instead of using `assert`. The plan is to make returning non-`None` from tests an error in the future.
-
-
-Features
---------
-
-- `#9897 <https://github.com/pytest-dev/pytest/issues/9897>`_: Added shell-style wildcard support to ``testpaths``.
-
-
-
-Improvements
-------------
-
-- `#10218 <https://github.com/pytest-dev/pytest/issues/10218>`_: ``@pytest.mark.parametrize()`` (and similar functions) now accepts any ``Sequence[str]`` for the argument names,
-  instead of just ``list[str]`` and ``tuple[str, ...]``.
-
-  (Note that ``str``, which is itself a ``Sequence[str]``, is still treated as a
-  comma-delimited name list, as before).
-
-
-- `#10381 <https://github.com/pytest-dev/pytest/issues/10381>`_: The ``--no-showlocals`` flag has been added. This can be passed directly to tests to override ``--showlocals`` declared through ``addopts``.
-
-
-- `#3426 <https://github.com/pytest-dev/pytest/issues/3426>`_: Assertion failures with strings in NFC and NFD forms that normalize to the same string now have a dedicated error message detailing the issue, and their utf-8 representation is expressed instead.
-
-
-- `#8508 <https://github.com/pytest-dev/pytest/issues/8508>`_: Introduce multiline display for warning matching  via :py:func:`pytest.warns` and
-  enhance match comparison for :py:func:`_pytest._code.ExceptionInfo.match` as returned by :py:func:`pytest.raises`.
-
-
-- `#8646 <https://github.com/pytest-dev/pytest/issues/8646>`_: Improve :py:func:`pytest.raises`. Previously passing an empty tuple would give a confusing
-  error. We now raise immediately with a more helpful message.
-
-
-- `#9741 <https://github.com/pytest-dev/pytest/issues/9741>`_: On Python 3.11, use the standard library's :mod:`tomllib` to parse TOML.
-
-  :mod:`tomli` is no longer a dependency on Python 3.11.
-
-
-- `#9742 <https://github.com/pytest-dev/pytest/issues/9742>`_: Display assertion message without escaped newline characters with ``-vv``.
-
-
-- `#9823 <https://github.com/pytest-dev/pytest/issues/9823>`_: Improved error message that is shown when no collector is found for a given file.
-
-
-- `#9873 <https://github.com/pytest-dev/pytest/issues/9873>`_: Some coloring has been added to the short test summary.
-
-
-- `#9883 <https://github.com/pytest-dev/pytest/issues/9883>`_: Normalize the help description of all command-line options.
-
-
-- `#9920 <https://github.com/pytest-dev/pytest/issues/9920>`_: Display full crash messages in ``short test summary info``, when running in a CI environment.
-
-
-- `#9987 <https://github.com/pytest-dev/pytest/issues/9987>`_: Added support for hidden configuration file by allowing ``.pytest.ini`` as an alternative to ``pytest.ini``.
-
-
-
-Bug Fixes
----------
-
-- `#10150 <https://github.com/pytest-dev/pytest/issues/10150>`_: :data:`sys.stdin` now contains all expected methods of a file-like object when capture is enabled.
-
-
-- `#10382 <https://github.com/pytest-dev/pytest/issues/10382>`_: Do not break into pdb when ``raise unittest.SkipTest()`` appears top-level in a file.
-
-
-- `#7792 <https://github.com/pytest-dev/pytest/issues/7792>`_: Marks are now inherited according to the full MRO in test classes. Previously, if a test class inherited from two or more classes, only marks from the first super-class would apply.
-
-  When inheriting marks from super-classes, marks from the sub-classes are now ordered before marks from the super-classes, in MRO order. Previously it was the reverse.
-
-  When inheriting marks from super-classes, the `pytestmark` attribute of the sub-class now only contains the marks directly applied to it. Previously, it also contained marks from its super-classes. Please note that this attribute should not normally be accessed directly; use :func:`pytest.Node.iter_markers` instead.
-
-
-- `#9159 <https://github.com/pytest-dev/pytest/issues/9159>`_: Showing inner exceptions by forcing native display in ``ExceptionGroups`` even when using display options other than ``--tb=native``. A temporary step before full implementation of pytest-native display for inner exceptions in ``ExceptionGroups``.
-
-
-- `#9877 <https://github.com/pytest-dev/pytest/issues/9877>`_: Ensure ``caplog.get_records(when)`` returns current/correct data after invoking ``caplog.clear()``.
-
-
-
-Improved Documentation
-----------------------
-
-- `#10344 <https://github.com/pytest-dev/pytest/issues/10344>`_: Update information on writing plugins to use ``pyproject.toml`` instead of ``setup.py``.
-
-
-- `#9248 <https://github.com/pytest-dev/pytest/issues/9248>`_: The documentation is now built using Sphinx 5.x (up from 3.x previously).
-
-
-- `#9291 <https://github.com/pytest-dev/pytest/issues/9291>`_: Update documentation on how :func:`pytest.warns` affects :class:`DeprecationWarning`.
-
-
-
-Trivial/Internal Changes
-------------------------
-
-- `#10313 <https://github.com/pytest-dev/pytest/issues/10313>`_: Made ``_pytest.doctest.DoctestItem`` export ``pytest.DoctestItem`` for
-  type check and runtime purposes. Made `_pytest.doctest` use internal APIs
-  to avoid circular imports.
-
-
-- `#9906 <https://github.com/pytest-dev/pytest/issues/9906>`_: Made ``_pytest.compat`` re-export ``importlib_metadata`` in the eyes of type checkers.
-
-
-- `#9910 <https://github.com/pytest-dev/pytest/issues/9910>`_: Fix default encoding warning (``EncodingWarning``) in ``cacheprovider``
-
-
-- `#9984 <https://github.com/pytest-dev/pytest/issues/9984>`_: Improve the error message when we attempt to access a fixture that has been
-  torn down.
-  Add an additional sentence to the docstring explaining when it's not a good
-  idea to call ``getfixturevalue``.
-
-
-pytest 7.1.3 (2022-08-31)
-=========================
-
-Bug Fixes
----------
-
-- `#10060 <https://github.com/pytest-dev/pytest/issues/10060>`_: When running with ``--pdb``, ``TestCase.tearDown`` is no longer called for tests when the *class* has been skipped via ``unittest.skip`` or ``pytest.mark.skip``.
-
-
-- `#10190 <https://github.com/pytest-dev/pytest/issues/10190>`_: Invalid XML characters in setup or teardown error messages are now properly escaped for JUnit XML reports.
-
-
-- `#10230 <https://github.com/pytest-dev/pytest/issues/10230>`_: Ignore ``.py`` files created by ``pyproject.toml``-based editable builds introduced in `pip 21.3 <https://pip.pypa.io/en/stable/news/#v21-3>`__.
-
-
-- `#3396 <https://github.com/pytest-dev/pytest/issues/3396>`_: Doctests now respect the ``--import-mode`` flag.
-
-
-- `#9514 <https://github.com/pytest-dev/pytest/issues/9514>`_: Type-annotate ``FixtureRequest.param`` as ``Any`` as a stop gap measure until :issue:`8073` is fixed.
-
-
-- `#9791 <https://github.com/pytest-dev/pytest/issues/9791>`_: Fixed a path handling code in ``rewrite.py`` that seems to work fine, but was incorrect and fails in some systems.
-
-
-- `#9917 <https://github.com/pytest-dev/pytest/issues/9917>`_: Fixed string representation for :func:`pytest.approx` when used to compare tuples.
-
-
-
-Improved Documentation
-----------------------
-
-- `#9937 <https://github.com/pytest-dev/pytest/issues/9937>`_: Explicit note that :fixture:`tmpdir` fixture is discouraged in favour of :fixture:`tmp_path`.
-
-
-
-Trivial/Internal Changes
-------------------------
-
-- `#10114 <https://github.com/pytest-dev/pytest/issues/10114>`_: Replace `atomicwrites <https://github.com/untitaker/python-atomicwrites>`__ dependency on windows with `os.replace`.
-
-
-pytest 7.1.2 (2022-04-23)
-=========================
-
-Bug Fixes
----------
-
-- `#9726 <https://github.com/pytest-dev/pytest/issues/9726>`_: An unnecessary ``numpy`` import inside :func:`pytest.approx` was removed.
-
-
-- `#9820 <https://github.com/pytest-dev/pytest/issues/9820>`_: Fix comparison of  ``dataclasses`` with ``InitVar``.
-
-
-- `#9869 <https://github.com/pytest-dev/pytest/issues/9869>`_: Increase ``stacklevel`` for the ``NODE_CTOR_FSPATH_ARG`` deprecation to point to the
-  user's code, not pytest.
-
-
-- `#9871 <https://github.com/pytest-dev/pytest/issues/9871>`_: Fix a bizarre (and fortunately rare) bug where the `temp_path` fixture could raise
-  an internal error while attempting to get the current user's username.
-
-
-pytest 7.1.1 (2022-03-17)
-=========================
-
-Bug Fixes
----------
-
-- `#9767 <https://github.com/pytest-dev/pytest/issues/9767>`_: Fixed a regression in pytest 7.1.0 where some conftest.py files outside of the source tree (e.g. in the `site-packages` directory) were not picked up.
-
-
-pytest 7.1.0 (2022-03-13)
-=========================
-
-Breaking Changes
-----------------
-
-- `#8838 <https://github.com/pytest-dev/pytest/issues/8838>`_: As per our policy, the following features have been deprecated in the 6.X series and are now
-  removed:
-
-  * ``pytest._fillfuncargs`` function.
-
-  * ``pytest_warning_captured`` hook - use ``pytest_warning_recorded`` instead.
-
-  * ``-k -foobar`` syntax - use ``-k 'not foobar'`` instead.
-
-  * ``-k foobar:`` syntax.
-
-  * ``pytest.collect`` module - import from ``pytest`` directly.
-
-  For more information consult
-  `Deprecations and Removals <https://docs.pytest.org/en/latest/deprecations.html>`__ in the docs.
-
-
-- `#9437 <https://github.com/pytest-dev/pytest/issues/9437>`_: Dropped support for Python 3.6, which reached `end-of-life <https://devguide.python.org/#status-of-python-branches>`__ at 2021-12-23.
-
-
-
-Improvements
-------------
-
-- `#5192 <https://github.com/pytest-dev/pytest/issues/5192>`_: Fixed test output for some data types where ``-v`` would show less information.
-
-  Also, when showing diffs for sequences, ``-q`` would produce full diffs instead of the expected diff.
-
-
-- `#9362 <https://github.com/pytest-dev/pytest/issues/9362>`_: pytest now avoids specialized assert formatting when it is detected that the default ``__eq__`` is overridden in ``attrs`` or ``dataclasses``.
-
-
-- `#9536 <https://github.com/pytest-dev/pytest/issues/9536>`_: When ``-vv`` is given on command line, show skipping and xfail reasons in full instead of truncating them to fit the terminal width.
-
-
-- `#9644 <https://github.com/pytest-dev/pytest/issues/9644>`_: More information about the location of resources that led Python to raise :class:`ResourceWarning` can now
-  be obtained by enabling :mod:`tracemalloc`.
-
-  See :ref:`resource-warnings` for more information.
-
-
-- `#9678 <https://github.com/pytest-dev/pytest/issues/9678>`_: More types are now accepted in the ``ids`` argument to ``@pytest.mark.parametrize``.
-  Previously only `str`, `float`, `int` and `bool` were accepted;
-  now `bytes`, `complex`, `re.Pattern`, `Enum` and anything with a `__name__` are also accepted.
-
-
-- `#9692 <https://github.com/pytest-dev/pytest/issues/9692>`_: :func:`pytest.approx` now raises a :class:`TypeError` when given an unordered sequence (such as :class:`set`).
-
-  Note that this implies that custom classes which only implement ``__iter__`` and ``__len__`` are no longer supported as they don't guarantee order.
-
-
-
-Bug Fixes
----------
-
-- `#8242 <https://github.com/pytest-dev/pytest/issues/8242>`_: The deprecation of raising :class:`unittest.SkipTest` to skip collection of
-  tests during the pytest collection phase is reverted - this is now a supported
-  feature again.
-
-
-- `#9493 <https://github.com/pytest-dev/pytest/issues/9493>`_: Symbolic link components are no longer resolved in conftest paths.
-  This means that if a conftest appears twice in collection tree, using symlinks, it will be executed twice.
-  For example, given
-
-      tests/real/conftest.py
-      tests/real/test_it.py
-      tests/link -> tests/real
-
-  running ``pytest tests`` now imports the conftest twice, once as ``tests/real/conftest.py`` and once as ``tests/link/conftest.py``.
-  This is a fix to match a similar change made to test collection itself in pytest 6.0 (see :pull:`6523` for details).
-
-
-- `#9626 <https://github.com/pytest-dev/pytest/issues/9626>`_: Fixed count of selected tests on terminal collection summary when there were errors or skipped modules.
-
-  If there were errors or skipped modules on collection, pytest would mistakenly subtract those from the selected count.
-
-
-- `#9645 <https://github.com/pytest-dev/pytest/issues/9645>`_: Fixed regression where ``--import-mode=importlib`` used together with :envvar:`PYTHONPATH` or :confval:`pythonpath` would cause import errors in test suites.
-
-
-- `#9708 <https://github.com/pytest-dev/pytest/issues/9708>`_: :fixture:`pytester` now requests a :fixture:`monkeypatch` fixture instead of creating one internally. This solves some issues with tests that involve pytest environment variables.
-
-
-- `#9730 <https://github.com/pytest-dev/pytest/issues/9730>`_: Malformed ``pyproject.toml`` files now produce a clearer error message.
-
-
-pytest 7.0.1 (2022-02-11)
-=========================
-
-Bug Fixes
----------
-
-- `#9608 <https://github.com/pytest-dev/pytest/issues/9608>`_: Fix invalid importing of ``importlib.readers`` in Python 3.9.
-
-
-- `#9610 <https://github.com/pytest-dev/pytest/issues/9610>`_: Restore `UnitTestFunction.obj` to return unbound rather than bound method.
-  Fixes a crash during a failed teardown in unittest TestCases with non-default `__init__`.
-  Regressed in pytest 7.0.0.
-
-
-- `#9636 <https://github.com/pytest-dev/pytest/issues/9636>`_: The ``pythonpath`` plugin was renamed to ``python_path``. This avoids a conflict with the ``pytest-pythonpath`` plugin.
-
-
-- `#9642 <https://github.com/pytest-dev/pytest/issues/9642>`_: Fix running tests by id with ``::`` in the parametrize portion.
-
-
-- `#9643 <https://github.com/pytest-dev/pytest/issues/9643>`_: Delay issuing a :class:`~pytest.PytestWarning` about diamond inheritance involving :class:`~pytest.Item` and
-  :class:`~pytest.Collector` so it can be filtered using :ref:`standard warning filters <warnings>`.
-
-
-pytest 7.0.0 (2022-02-03)
-=========================
-
-(**Please see the full set of changes for this release also in the 7.0.0rc1 notes below**)
-
-Deprecations
-------------
-
-- `#9488 <https://github.com/pytest-dev/pytest/issues/9488>`_: If custom subclasses of nodes like :class:`pytest.Item` override the
-  ``__init__`` method, they should take ``**kwargs``. See
-  :ref:`uncooperative-constructors-deprecated` for details.
-
-  Note that a deprection warning is only emitted when there is a conflict in the
-  arguments pytest expected to pass. This deprecation was already part of pytest
-  7.0.0rc1 but wasn't documented.
-
-
-
-Bug Fixes
----------
-
-- `#9355 <https://github.com/pytest-dev/pytest/issues/9355>`_: Fixed error message prints function decorators when using assert in Python 3.8 and above.
-
-
-- `#9396 <https://github.com/pytest-dev/pytest/issues/9396>`_: Ensure :attr:`pytest.Config.inifile` is available during the :func:`pytest_cmdline_main <_pytest.hookspec.pytest_cmdline_main>` hook (regression during ``7.0.0rc1``).
-
-
-
-Improved Documentation
-----------------------
-
-- `#9404 <https://github.com/pytest-dev/pytest/issues/9404>`_: Added extra documentation on alternatives to common misuses of `pytest.warns(None)` ahead of its deprecation.
-
-
-- `#9505 <https://github.com/pytest-dev/pytest/issues/9505>`_: Clarify where the configuration files are located. To avoid confusions documentation mentions
-  that configuration file is located in the root of the repository.
-
-
-
-Trivial/Internal Changes
-------------------------
-
-- `#9521 <https://github.com/pytest-dev/pytest/issues/9521>`_: Add test coverage to assertion rewrite path.
-
-
 pytest 7.0.0rc1 (2021-12-06)
 ============================
 
@@ -516,8 +142,6 @@ Deprecations
   :class:`unittest.SkipTest` / :meth:`unittest.TestCase.skipTest` /
   :func:`unittest.skip` in unittest test cases is fully supported.
 
-  .. note:: This deprecation has been reverted in pytest 7.1.0.
-
 
 - `#8315 <https://github.com/pytest-dev/pytest/issues/8315>`_: Several behaviors of :meth:`Parser.addoption <pytest.Parser.addoption>` are now
   scheduled for removal in pytest 8 (deprecated since pytest 2.4.0):
@@ -532,7 +156,7 @@ Deprecations
   See :ref:`the deprecation note <diamond-inheritance-deprecated>` for full details.
 
 
-- `#8592 <https://github.com/pytest-dev/pytest/issues/8592>`_: :hook:`pytest_cmdline_preparse` has been officially deprecated.  It will be removed in a future release.  Use :hook:`pytest_load_initial_conftests` instead.
+- `#8592 <https://github.com/pytest-dev/pytest/issues/8592>`_: :func:`pytest_cmdline_preparse <_pytest.hookspec.pytest_cmdline_preparse>` has been officially deprecated.  It will be removed in a future release.  Use :func:`pytest_load_initial_conftests <_pytest.hookspec.pytest_load_initial_conftests>` instead.
 
   See :ref:`the deprecation note <cmdline-preparse-deprecated>` for full details.
 
@@ -549,12 +173,6 @@ Deprecations
   This was changed for consistency with :func:`pytest.mark.skip <pytest.mark.skip>` and  :func:`pytest.mark.xfail <pytest.mark.xfail>` which both accept
   ``reason`` as an argument.
 
-- `#8174 <https://github.com/pytest-dev/pytest/issues/8174>`_: The following changes have been made to types reachable through :attr:`pytest.ExceptionInfo.traceback`:
-
-  - The ``path`` property of ``_pytest.code.Code`` returns ``Path`` instead of ``py.path.local``.
-  - The ``path`` property of ``_pytest.code.TracebackEntry`` returns ``Path`` instead of ``py.path.local``.
-
-  There was no deprecation period for this change (sorry!).
 
 
 Features
@@ -585,11 +203,11 @@ Features
   - ``pytest.Mark`` for :class:`marks <pytest.Mark>`.
   - ``pytest.MarkDecorator`` for :class:`mark decorators <pytest.MarkDecorator>`.
   - ``pytest.MarkGenerator`` for the :class:`pytest.mark <pytest.MarkGenerator>` singleton.
-  - ``pytest.Metafunc`` for the :class:`metafunc <pytest.MarkGenerator>` argument to the :hook:`pytest_generate_tests` hook.
+  - ``pytest.Metafunc`` for the :class:`metafunc <pytest.MarkGenerator>` argument to the :func:`pytest_generate_tests <pytest.hookspec.pytest_generate_tests>` hook.
   - ``pytest.CallInfo`` for the :class:`CallInfo <pytest.CallInfo>` type passed to various hooks.
   - ``pytest.PytestPluginManager`` for :class:`PytestPluginManager <pytest.PytestPluginManager>`.
   - ``pytest.ExceptionInfo`` for the :class:`ExceptionInfo <pytest.ExceptionInfo>` type returned from :func:`pytest.raises` and passed to various hooks.
-  - ``pytest.Parser`` for the :class:`Parser <pytest.Parser>` type passed to the :hook:`pytest_addoption` hook.
+  - ``pytest.Parser`` for the :class:`Parser <pytest.Parser>` type passed to the :func:`pytest_addoption <pytest.hookspec.pytest_addoption>` hook.
   - ``pytest.OptionGroup`` for the :class:`OptionGroup <pytest.OptionGroup>` type returned from the :func:`parser.addgroup <pytest.Parser.getgroup>` method.
   - ``pytest.HookRecorder`` for the :class:`HookRecorder <pytest.HookRecorder>` type returned from :class:`~pytest.Pytester`.
   - ``pytest.RecordedHookCall`` for the :class:`RecordedHookCall <pytest.HookRecorder>` type returned from :class:`~pytest.HookRecorder`.
@@ -610,11 +228,11 @@ Features
 
 - `#8144 <https://github.com/pytest-dev/pytest/issues/8144>`_: The following hooks now receive an additional ``pathlib.Path`` argument, equivalent to an existing ``py.path.local`` argument:
 
-  - :hook:`pytest_ignore_collect` - The ``collection_path`` parameter (equivalent to existing ``path`` parameter).
-  - :hook:`pytest_collect_file` - The ``file_path`` parameter (equivalent to existing ``path`` parameter).
-  - :hook:`pytest_pycollect_makemodule` - The ``module_path`` parameter (equivalent to existing ``path`` parameter).
-  - :hook:`pytest_report_header` - The ``start_path`` parameter (equivalent to existing ``startdir`` parameter).
-  - :hook:`pytest_report_collectionfinish` - The ``start_path`` parameter (equivalent to existing ``startdir`` parameter).
+  - :func:`pytest_ignore_collect <_pytest.hookspec.pytest_ignore_collect>` - The ``collection_path`` parameter (equivalent to existing ``path`` parameter).
+  - :func:`pytest_collect_file <_pytest.hookspec.pytest_collect_file>` - The ``file_path`` parameter (equivalent to existing ``path`` parameter).
+  - :func:`pytest_pycollect_makemodule <_pytest.hookspec.pytest_pycollect_makemodule>` - The ``module_path`` parameter (equivalent to existing ``path`` parameter).
+  - :func:`pytest_report_header <_pytest.hookspec.pytest_report_header>` - The ``start_path`` parameter (equivalent to existing ``startdir`` parameter).
+  - :func:`pytest_report_collectionfinish <_pytest.hookspec.pytest_report_collectionfinish>` - The ``start_path`` parameter (equivalent to existing ``startdir`` parameter).
 
   .. note::
       The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
@@ -855,9 +473,10 @@ Trivial/Internal Changes
 
 - `#8174 <https://github.com/pytest-dev/pytest/issues/8174>`_: The following changes have been made to internal pytest types/functions:
 
+  - The ``path`` property of ``_pytest.code.Code`` returns ``Path`` instead of ``py.path.local``.
+  - The ``path`` property of ``_pytest.code.TracebackEntry`` returns ``Path`` instead of ``py.path.local``.
   - The ``_pytest.code.getfslineno()`` function returns ``Path`` instead of ``py.path.local``.
   - The ``_pytest.python.path_matches_patterns()`` function takes ``Path`` instead of ``py.path.local``.
-  - The ``_pytest._code.Traceback.cut()`` function accepts any ``os.PathLike[str]``, not just ``py.path.local``.
 
 
 - `#8248 <https://github.com/pytest-dev/pytest/issues/8248>`_: Internal Restructure: let ``python.PyObjMixin`` inherit from ``nodes.Node`` to carry over typing information.
@@ -872,7 +491,7 @@ Trivial/Internal Changes
 - `#8913 <https://github.com/pytest-dev/pytest/issues/8913>`_: The private ``CallSpec2._arg2scopenum`` attribute has been removed after an internal refactoring.
 
 
-- `#8967 <https://github.com/pytest-dev/pytest/issues/8967>`_: :hook:`pytest_assertion_pass` is no longer considered experimental and
+- `#8967 <https://github.com/pytest-dev/pytest/issues/8967>`_: :func:`pytest_assertion_pass <_pytest.hookspec.pytest_assertion_pass>` is no longer considered experimental and
   future changes to it will be considered more carefully.
 
 
@@ -919,7 +538,7 @@ Bug Fixes
   the ``tmp_path``/``tmpdir`` fixture). Now the directories are created with
   private permissions.
 
-  pytest used to silently use a pre-existing ``/tmp/pytest-of-<username>`` directory,
+  pytest used to silenty use a pre-existing ``/tmp/pytest-of-<username>`` directory,
   even if owned by another user. This means another user could pre-create such a
   directory and gain control of another user's temporary directory. Now such a
   condition results in an error.
@@ -1234,8 +853,8 @@ Deprecations
   if you use this and want a replacement.
 
 
-- :issue:`7255`: The :hook:`pytest_warning_captured` hook is deprecated in favor
-  of :hook:`pytest_warning_recorded`, and will be removed in a future version.
+- :issue:`7255`: The :func:`pytest_warning_captured <_pytest.hookspec.pytest_warning_captured>` hook is deprecated in favor
+  of :func:`pytest_warning_recorded <_pytest.hookspec.pytest_warning_recorded>`, and will be removed in a future version.
 
 
 - :issue:`7648`: The ``gethookproxy()`` and ``isinitpath()`` methods of ``FSCollector`` and ``Package`` are deprecated;
@@ -1343,7 +962,7 @@ Trivial/Internal Changes
   process, pytest now ignores builtin attributes (like ``__class__``,
   ``__delattr__`` and ``__new__``) without consulting the :confval:`python_classes` and
   :confval:`python_functions` configuration options and without passing them to plugins
-  using the :hook:`pytest_pycollect_makeitem` hook.
+  using the :func:`pytest_pycollect_makeitem <_pytest.hookspec.pytest_pycollect_makeitem>` hook.
 
 
 pytest 6.0.2 (2020-09-04)
@@ -1685,7 +1304,7 @@ Improvements
   is not displayed by default for passing tests. This change makes the mistake
   visible during testing.
 
-  You may suppress this behavior temporarily or permanently by setting
+  You may supress this behavior temporarily or permanently by setting
   ``logging.raiseExceptions = False``.
 
 
@@ -2132,7 +1751,7 @@ Bug Fixes
 - :issue:`6646`: Assertion rewriting hooks are (re)stored for the current item, which fixes them being still used after e.g. pytester's :func:`testdir.runpytest <_pytest.pytester.Testdir.runpytest>` etc.
 
 
-- :issue:`6660`: :py:func:`pytest.exit` is handled when emitted from the :hook:`pytest_sessionfinish` hook.  This includes quitting from a debugger.
+- :issue:`6660`: :py:func:`pytest.exit` is handled when emitted from the :func:`pytest_sessionfinish <_pytest.hookspec.pytest_sessionfinish>` hook.  This includes quitting from a debugger.
 
 
 - :issue:`6752`: When :py:func:`pytest.raises` is used as a function (as opposed to a context manager),
@@ -2140,7 +1759,7 @@ Bug Fixes
   it was swallowed and ignored (regression in pytest 5.1.0).
 
 
-- :issue:`6801`: Do not display empty lines in between traceback for unexpected exceptions with doctests.
+- :issue:`6801`: Do not display empty lines inbetween traceback for unexpected exceptions with doctests.
 
 
 - :issue:`6802`: The :fixture:`testdir fixture <testdir>` works within doctests now.
@@ -2244,7 +1863,7 @@ Improvements
 - :issue:`6231`: Improve check for misspelling of :ref:`pytest.mark.parametrize ref`.
 
 
-- :issue:`6257`: Handle :func:`pytest.exit` being used via :hook:`pytest_internalerror`, e.g. when quitting pdb from post mortem.
+- :issue:`6257`: Handle :py:func:`pytest.exit` being used via :py:func:`~_pytest.hookspec.pytest_internalerror`, e.g. when quitting pdb from post mortem.
 
 
 
@@ -2802,8 +2421,7 @@ Important
 
 This release is a Python3.5+ only release.
 
-For more details, see our `Python 2.7 and 3.4 support plan
-<https://docs.pytest.org/en/7.0.x/py27-py34-deprecation.html>`_.
+For more details, see our :std:doc:`Python 2.7 and 3.4 support plan <py27-py34-deprecation>`.
 
 Removals
 --------
@@ -2879,7 +2497,7 @@ Deprecations
 Features
 --------
 
-- :issue:`3457`: New :hook:`pytest_assertion_pass`
+- :issue:`3457`: New :func:`~_pytest.hookspec.pytest_assertion_pass`
   hook, called with context information when an assertion *passes*.
 
   This hook is still **experimental** so use it with caution.
@@ -3027,11 +2645,7 @@ Features
 
 - :issue:`6870`: New ``Config.invocation_args`` attribute containing the unchanged arguments passed to ``pytest.main()``.
 
-  Remark: while this is technically a new feature and according to our
-  `policy <https://docs.pytest.org/en/7.0.x/py27-py34-deprecation.html#what-goes-into-4-6-x-releases>`_
-  it should not have been backported, we have opened an exception in this
-  particular case because it fixes a serious interaction with ``pytest-xdist``,
-  so it can also be considered a bugfix.
+  Remark: while this is technically a new feature and according to our :ref:`policy <what goes into 4.6.x releases>` it should not have been backported, we have opened an exception in this particular case because it fixes a serious interaction with ``pytest-xdist``, so it can also be considered a bugfix.
 
 Trivial/Internal Changes
 ------------------------
@@ -3203,8 +2817,7 @@ Important
 
 The ``4.6.X`` series will be the last series to support **Python 2 and Python 3.4**.
 
-For more details, see our `Python 2.7 and 3.4 support plan
-<https://docs.pytest.org/en/7.0.x/py27-py34-deprecation.html>`_.
+For more details, see our :std:doc:`Python 2.7 and 3.4 support plan <py27-py34-deprecation>`.
 
 
 Features
@@ -5015,7 +4628,7 @@ Bug Fixes
 - Fixed a bug where stdout and stderr were logged twice by junitxml when a test
   was marked xfail. (:issue:`3491`)
 
-- Fix ``usefixtures`` mark applied to unittest tests by correctly instantiating
+- Fix ``usefixtures`` mark applyed to unittest tests by correctly instantiating
   ``FixtureInfo``. (:issue:`3498`)
 
 - Fix assertion rewriter compatibility with libraries that monkey patch
@@ -5404,9 +5017,9 @@ Features
 - Console output falls back to "classic" mode when capturing is disabled (``-s``),
   otherwise the output gets garbled to the point of being useless. (:issue:`3038`)
 
-- New :hook:`pytest_runtest_logfinish`
+- New :func:`~_pytest.hookspec.pytest_runtest_logfinish`
   hook which is called when a test item has finished executing, analogous to
-  :hook:`pytest_runtest_logstart`.
+  :func:`~_pytest.hookspec.pytest_runtest_logstart`.
   (:issue:`3101`)
 
 - Improve performance when collecting tests using many fixtures. (:issue:`3107`)
@@ -6372,7 +5985,7 @@ Bug Fixes
   Thanks :user:`adborden` for the report and :user:`nicoddemus` for the PR.
 
 * Clean up unittest TestCase objects after tests are complete (:issue:`1649`).
-  Thanks :user:`d-b-w` for the report and PR.
+  Thanks :user:`d_b_w` for the report and PR.
 
 
 3.0.3 (2016-09-28)
@@ -6387,7 +6000,7 @@ Bug Fixes
   Thanks :user:`nicoddemus` for the PR.
 
 * Fix pkg_resources import error in Jython projects (:issue:`1853`).
-  Thanks :user:`raquelalegre` for the PR.
+  Thanks :user:`raquel-ucl` for the PR.
 
 * Got rid of ``AttributeError: 'Module' object has no attribute '_obj'`` exception
   in Python 3 (:issue:`1944`).
@@ -8396,7 +8009,7 @@ Bug fixes:
   or through plugin hooks.  Also introduce a "--strict" option which
   will treat unregistered markers as errors
   allowing to avoid typos and maintain a well described set of markers
-  for your test suite.  See examples at http://pytest.org/en/stable/how-to/mark.html
+  for your test suite.  See exaples at http://pytest.org/en/stable/how-to/mark.html
   and its links.
 - issue50: introduce "-m marker" option to select tests based on markers
   (this is a stricter and more predictable version of '-k' in that "-m"
@@ -8708,7 +8321,7 @@ Bug fixes:
 - fix issue57 -f|--looponfail to work with xpassing tests (thanks Ronny)
 - fix issue92 collectonly reporter and --pastebin (thanks Benjamin Peterson)
 - fix py.code.compile(source) to generate unique filenames
-- fix assertion re-interp problems on PyPy, by deferring code
+- fix assertion re-interp problems on PyPy, by defering code
   compilation to the (overridable) Frame.eval class. (thanks Amaury Forgeot)
 - fix py.path.local.pyimport() to work with directories
 - streamline py.path.local.mkdtemp implementation and usage
@@ -8782,7 +8395,7 @@ Bug fixes:
 - improve support for raises and other dynamically compiled code by
   manipulating python's linecache.cache instead of the previous
   rather hacky way of creating custom code objects.  This makes
-  it seamlessly work on Jython and PyPy where it previously didn't.
+  it seemlessly work on Jython and PyPy where it previously didn't.
 
 - fix issue96: make capturing more resilient against Control-C
   interruptions (involved somewhat substantial refactoring

doc/en/conf.py

@@ -38,7 +38,6 @@ release = ".".join(version.split(".")[:2])
 
 autodoc_member_order = "bysource"
 autodoc_typehints = "description"
-autodoc_typehints_description_target = "documented"
 todo_include_todos = 1
 
 latex_engine = "lualatex"
@@ -163,11 +162,11 @@ linkcheck_workers = 5
 
 _repo = "https://github.com/pytest-dev/pytest"
 extlinks = {
-    "bpo": ("https://bugs.python.org/issue%s", "bpo-%s"),
-    "pypi": ("https://pypi.org/project/%s/", "%s"),
-    "issue": (f"{_repo}/issues/%s", "issue #%s"),
-    "pull": (f"{_repo}/pull/%s", "pull request #%s"),
-    "user": ("https://github.com/%s", "@%s"),
+    "bpo": ("https://bugs.python.org/issue%s", "bpo-"),
+    "pypi": ("https://pypi.org/project/%s/", ""),
+    "issue": (f"{_repo}/issues/%s", "issue #"),
+    "pull": (f"{_repo}/pull/%s", "pull request #"),
+    "user": ("https://github.com/%s", "@"),
 }
 
 
@@ -248,7 +247,7 @@ html_sidebars = {
 html_domain_indices = True
 
 # If false, no index is generated.
-html_use_index = False
+html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
 # html_split_index = False
@@ -321,9 +320,7 @@ latex_domain_indices = False
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    ("how-to/usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)
-]
+man_pages = [("usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)]
 
 
 # -- Options for Epub output ---------------------------------------------------
@@ -385,6 +382,7 @@ texinfo_documents = [
 ]
 
 
+# Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     "pluggy": ("https://pluggy.readthedocs.io/en/stable", None),
     "python": ("https://docs.python.org/3", None),
@@ -392,8 +390,11 @@ intersphinx_mapping = {
     "pip": ("https://pip.pypa.io/en/stable", None),
     "tox": ("https://tox.wiki/en/stable", None),
     "virtualenv": ("https://virtualenv.pypa.io/en/stable", None),
+    "django": (
+        "http://docs.djangoproject.com/en/stable",
+        "http://docs.djangoproject.com/en/stable/_objects",
+    ),
     "setuptools": ("https://setuptools.pypa.io/en/stable", None),
-    "packaging": ("https://packaging.python.org/en/latest", None),
 }
 
 
@@ -421,6 +422,8 @@ def configure_logging(app: "sphinx.application.Sphinx") -> None:
 
 
 def setup(app: "sphinx.application.Sphinx") -> None:
+    # from sphinx.ext.autodoc import cut_lines
+    # app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
     app.add_crossref_type(
         "fixture",
         "fixture",
@@ -442,13 +445,6 @@ def setup(app: "sphinx.application.Sphinx") -> None:
         indextemplate="pair: %s; global variable interpreted by pytest",
     )
 
-    app.add_crossref_type(
-        directivename="hook",
-        rolename="hook",
-        objname="pytest hook",
-        indextemplate="pair: %s; hook",
-    )
-
     configure_logging(app)
 
     # Make Sphinx mark classes with "final" when decorated with @final.

doc/en/contents.rst

@@ -85,6 +85,7 @@ Further topics
 
    backwards-compatibility
    deprecations
+   py27-py34-deprecation
 
    contributing
    development_guide

doc/en/deprecations.rst

@@ -16,114 +16,7 @@ Deprecated Features
 -------------------
 
 Below is a complete list of all pytest features which are considered deprecated. Using those features will issue
-:class:`~pytest.PytestWarning` or subclasses, which can be filtered using :ref:`standard warning filters <warnings>`.
-
-
-.. _nose-deprecation:
-
-Support for tests written for nose
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.2
-
-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
+:class:`PytestWarning` or subclasses, which can be filtered using :ref:`standard warning filters <warnings>`.
 
 .. _instance-collector-deprecation:
 
@@ -163,10 +56,6 @@ Plugins which implement custom items and collectors are encouraged to replace
 ``fspath`` parameters (``py.path.local``) with ``path`` parameters
 (``pathlib.Path``), and drop any other usage of the ``py`` library if possible.
 
-If possible, plugins with custom items should use :ref:`cooperative
-constructors <uncooperative-constructors-deprecated>` to avoid hardcoding
-arguments they only pass on to the superclass.
-
 .. note::
     The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
     new attribute being ``path``) is **the opposite** of the situation for
@@ -185,50 +74,6 @@ no matter what argument was used in the constructor. We expect to deprecate the
 
 .. _legacy-path-hooks-deprecated:
 
-Configuring hook specs/impls using markers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Before pluggy, pytest's plugin library, was its own package and had a clear API,
-pytest just used ``pytest.mark`` to configure hooks.
-
-The :py:func:`pytest.hookimpl` and :py:func:`pytest.hookspec` decorators
-have been available since years and should be used instead.
-
-.. code-block:: python
-
-    @pytest.mark.tryfirst
-    def pytest_runtest_call():
-        ...
-
-
-    # or
-    def pytest_runtest_call():
-        ...
-
-
-    pytest_runtest_call.tryfirst = True
-
-should be changed to:
-
-.. code-block:: python
-
-    @pytest.hookimpl(tryfirst=True)
-    def pytest_runtest_call():
-        ...
-
-Changed ``hookimpl`` attributes:
-
-* ``tryfirst``
-* ``trylast``
-* ``optionalhook``
-* ``hookwrapper``
-
-Changed ``hookwrapper`` attributes:
-
-* ``firstresult``
-* ``historic``
-
-
 ``py.path.local`` arguments for hooks replaced with ``pathlib.Path``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -236,11 +81,11 @@ Changed ``hookwrapper`` attributes:
 
 In order to support the transition from ``py.path.local`` to :mod:`pathlib`, the following hooks now receive additional arguments:
 
-*  :hook:`pytest_ignore_collect(collection_path: pathlib.Path) <pytest_ignore_collect>` as equivalent to ``path``
-*  :hook:`pytest_collect_file(file_path: pathlib.Path) <pytest_collect_file>` as equivalent to ``path``
-*  :hook:`pytest_pycollect_makemodule(module_path: pathlib.Path) <pytest_pycollect_makemodule>` as equivalent to ``path``
-*  :hook:`pytest_report_header(start_path: pathlib.Path) <pytest_report_header>` as equivalent to ``startdir``
-*  :hook:`pytest_report_collectionfinish(start_path: pathlib.Path) <pytest_report_collectionfinish>` as equivalent to ``startdir``
+*  :func:`pytest_ignore_collect(collection_path: pathlib.Path) <_pytest.hookspec.pytest_ignore_collect>` as equivalent to ``path``
+*  :func:`pytest_collect_file(file_path: pathlib.Path) <_pytest.hookspec.pytest_collect_file>` as equivalent to ``path``
+*  :func:`pytest_pycollect_makemodule(module_path: pathlib.Path) <_pytest.hookspec.pytest_pycollect_makemodule>` as equivalent to ``path``
+*  :func:`pytest_report_header(start_path: pathlib.Path) <_pytest.hookspec.pytest_report_header>` as equivalent to ``startdir``
+*  :func:`pytest_report_collectionfinish(start_path: pathlib.Path) <_pytest.hookspec.pytest_report_collectionfinish>` as equivalent to ``startdir``
 
 The accompanying ``py.path.local`` based paths have been deprecated: plugins which manually invoke those hooks should only pass the new ``pathlib.Path`` arguments, and users should change their hook implementations to use the new ``pathlib.Path`` arguments.
 
@@ -282,7 +127,7 @@ Passing ``msg=`` to ``pytest.skip``, ``pytest.fail`` or ``pytest.exit``
 
 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.
+functions and the``@pytest.mark.skip`` and ``@pytest.mark.xfail`` markers which already accept a ``reason`` argument.
 
 .. code-block:: python
 
@@ -312,8 +157,8 @@ 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.
+Implementing the :func:`pytest_cmdline_preparse <_pytest.hookspec.pytest_cmdline_preparse>` hook has been officially deprecated.
+Implement the :func:`pytest_load_initial_conftests <_pytest.hookspec.pytest_load_initial_conftests>` hook instead.
 
 .. code-block:: python
 
@@ -346,40 +191,6 @@ Instead, a separate collector node should be used, which collects the item. See
 .. _example pr fixing inheritance: https://github.com/asmeurer/pytest-flakes/pull/40/files
 
 
-.. _uncooperative-constructors-deprecated:
-
-Constructors of custom :class:`pytest.Node` subclasses should take ``**kwargs``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.0
-
-If custom subclasses of nodes like :class:`pytest.Item` override the
-``__init__`` method, they should take ``**kwargs``. Thus,
-
-.. code-block:: python
-
-    class CustomItem(pytest.Item):
-        def __init__(self, name, parent, additional_arg):
-            super().__init__(name, parent)
-            self.additional_arg = additional_arg
-
-should be turned into:
-
-.. code-block:: python
-
-    class CustomItem(pytest.Item):
-        def __init__(self, *, additional_arg, **kwargs):
-            super().__init__(**kwargs)
-            self.additional_arg = additional_arg
-
-to avoid hard-coding the arguments pytest can pass to the superclass.
-See :ref:`non-python tests` for a full example.
-
-For cases without conflicts, no deprecation warning is emitted. For cases with
-conflicts (such as :class:`pytest.File` now taking ``path`` instead of
-``fspath``, as :ref:`outlined above <node-ctor-fspath-deprecation>`), a
-deprecation warning is now raised.
-
 Backward compatibilities in ``Parser.addoption``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -392,57 +203,29 @@ scheduled for removal in pytest 8 (deprecated since pytest 2.4.0):
 - ``parser.addoption(..., type="int/string/float/complex")`` - use ``type=int`` etc. instead.
 
 
+Raising ``unittest.SkipTest`` during collection
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 7.0
+
+Raising :class:`unittest.SkipTest` to skip collection of tests during the
+pytest collection phase is deprecated. Use :func:`pytest.skip` instead.
+
+Note: This deprecation only relates to using `unittest.SkipTest` during test
+collection. You are probably not doing that. Ordinary usage of
+:class:`unittest.SkipTest` / :meth:`unittest.TestCase.skipTest` /
+:func:`unittest.skip` in unittest test cases is fully supported.
+
 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()``
+:func:`pytest.warns(None) <pytest.warns>` is now deprecated because many people used
+it to mean "this code does not emit warnings", but it actually had the effect of
+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
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 7.2
-
-A :class:`pytest.PytestReturnNotNoneWarning` is now emitted if a test function returns something other than `None`.
-
-This prevents a common mistake among beginners that expect that returning a `bool` would cause a test to pass or fail, for example:
-
-.. code-block:: python
-
-    @pytest.mark.parametrize(
-        ["a", "b", "result"],
-        [
-            [1, 2, 5],
-            [2, 3, 8],
-            [5, 3, 18],
-        ],
-    )
-    def test_foo(a, b, result):
-        return foo(a, b) == result
-
-Given that pytest ignores the return value, this might be surprising that it will never fail.
-
-The proper fix is to change the `return` to an `assert`:
-
-.. code-block:: python
-
-    @pytest.mark.parametrize(
-        ["a", "b", "result"],
-        [
-            [1, 2, 5],
-            [2, 3, 8],
-            [5, 3, 18],
-        ],
-    )
-    def test_foo(a, b, result):
-        assert foo(a, b) == result
-
 
 The ``--strict`` command-line option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -467,42 +250,29 @@ The ``yield_fixture`` function/decorator
 It has been so for a very long time, so can be search/replaced safely.
 
 
-Removed Features
-----------------
+The ``pytest_warning_captured`` hook
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-As stated in our :ref:`backwards-compatibility` policy, deprecated features are removed only in major releases after
-an appropriate period of deprecation has passed.
+.. deprecated:: 6.0
 
+This hook has an `item` parameter which cannot be serialized by ``pytest-xdist``.
+
+Use the ``pytest_warning_recored`` hook instead, which replaces the ``item`` parameter
+by a ``nodeid`` parameter.
 
 The ``pytest.collect`` module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. deprecated:: 6.0
-.. versionremoved:: 7.0
 
 The ``pytest.collect`` module is no longer part of the public API, all its names
 should now be imported from ``pytest`` directly instead.
 
 
-
-The ``pytest_warning_captured`` hook
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 6.0
-.. versionremoved:: 7.0
-
-This hook has an `item` parameter which cannot be serialized by ``pytest-xdist``.
-
-Use the ``pytest_warning_recorded`` hook instead, which replaces the ``item`` parameter
-by a ``nodeid`` parameter.
-
-
-
 The ``pytest._fillfuncargs`` function
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. deprecated:: 6.0
-.. versionremoved:: 7.0
 
 This function was kept for backward compatibility with an older plugin.
 
@@ -511,6 +281,12 @@ it, use `function._request._fillfixtures()` instead, though note this is not
 a public API and may break in the future.
 
 
+Removed Features
+----------------
+
+As stated in our :ref:`backwards-compatibility` policy, deprecated features are removed only in major releases after
+an appropriate period of deprecation has passed.
+
 ``--no-print-logs`` command-line option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -548,8 +324,8 @@ at some point, depending on the plans for the plugins and number of users using
 
 .. versionremoved:: 6.0
 
-The ``pytest_collect_directory`` hook has not worked properly for years (it was called
-but the results were ignored). Users may consider using :hook:`pytest_collection_modifyitems` instead.
+The ``pytest_collect_directory`` has not worked properly for years (it was called
+but the results were ignored). Users may consider using :func:`pytest_collection_modifyitems <_pytest.hookspec.pytest_collection_modifyitems>` instead.
 
 TerminalReporter.writer
 ~~~~~~~~~~~~~~~~~~~~~~~

doc/en/example/attic.rst

@@ -25,7 +25,7 @@ example: specifying and selecting acceptance tests
             self.tmpdir = request.config.mktemp(request.function.__name__, numbered=True)
 
         def run(self, *cmd):
-            """called by test code to execute an acceptance test."""
+            """ called by test code to execute an acceptance test. """
             self.tmpdir.chdir()
             return subprocess.check_output(cmd).decode()
 

doc/en/example/fixtures/test_fixtures_order_autouse_flat.svg

@@ -1,56 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="112" height="682">
-    <style>
-        text {
-            font-family: 'Consolas', 'Menlo', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
-            dominant-baseline: middle;
-            text-anchor: middle;
-            fill: #062886;
-            font-size: medium;
-        }
-        ellipse.fixture, rect.test {
-            fill: #eeffcc;
-            stroke: #007020;
-            stroke-width: 2;
-        }
-        text.fixture {
-            color: #06287e;
-        }
-        circle.class {
-            fill: #c3e0ec;
-            stroke: #0e84b5;
-            stroke-width: 2;
-        }
-        text.class {
-            fill: #0e84b5;
-        }
-        path, line {
-            stroke: black;
-            stroke-width: 2;
-            fill: none;
-        }
-        rect.autouse {
-            fill: #ca7f3d;
-        }
-    </style>
-    <line x1="56" x2="56" y1="681" y2="26" />
-    <ellipse class="fixture" rx="50" ry="25" cx="56" cy="26" />
-    <text x="56" y="26">order</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="96" />
-    <text x="56" y="96">a</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="166" />
-    <text x="56" y="166">b</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="236" />
-    <text x="56" y="236">c</text>
-    <rect class="autouse" width="112" height="40" x="0" y="286" />
-    <text x="56" y="306">autouse</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="376" />
-    <text x="56" y="376">d</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="446" />
-    <text x="56" y="446">e</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="516" />
-    <text x="56" y="516">f</text>
-    <ellipse class="fixture" rx="25" ry="25" cx="56" cy="586" />
-    <text x="56" y="586">g</text>
-    <rect class="test" width="110" height="50" x="1" y="631" />
-    <text x="56" y="656">test_order</text>
-</svg>

doc/en/example/markers.rst

@@ -246,9 +246,9 @@ You can ask which markers exist for your test suite - the list includes our just
 
     @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see https://docs.pytest.org/en/stable/explanation/fixtures.html#usefixtures
 
-    @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible. DEPRECATED, use @pytest.hookimpl(tryfirst=True) instead.
+    @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible.
 
-    @pytest.mark.trylast: mark a hook implementation function such that the plugin machinery will try to call it last/as late as possible. DEPRECATED, use @pytest.hookimpl(trylast=True) instead.
+    @pytest.mark.trylast: mark a hook implementation function such that the plugin machinery will try to call it last/as late as possible.
 
 
 For an example on how to add and work with markers from a plugin, see
@@ -346,7 +346,7 @@ Custom marker and command line option to control test runs
 Plugins can provide custom markers and implement specific behaviour
 based on it. This is a self-contained example which adds a command
 line option and a parametrized test function marker to run tests
-specified via named environments:
+specifies via named environments:
 
 .. code-block:: python
 
@@ -375,7 +375,7 @@ specified via named environments:
         envnames = [mark.args[0] for mark in item.iter_markers(name="env")]
         if envnames:
             if item.config.getoption("-E") not in envnames:
-                pytest.skip(f"test requires env in {envnames!r}")
+                pytest.skip("test requires env in {!r}".format(envnames))
 
 A test file using this local plugin:
 
@@ -438,9 +438,9 @@ The ``--markers`` option always gives you a list of available markers:
 
     @pytest.mark.usefixtures(fixturename1, fixturename2, ...): mark tests as needing all of the specified fixtures. see https://docs.pytest.org/en/stable/explanation/fixtures.html#usefixtures
 
-    @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible. DEPRECATED, use @pytest.hookimpl(tryfirst=True) instead.
+    @pytest.mark.tryfirst: mark a hook implementation function such that the plugin machinery will try to call it first/as early as possible.
 
-    @pytest.mark.trylast: mark a hook implementation function such that the plugin machinery will try to call it last/as late as possible. DEPRECATED, use @pytest.hookimpl(trylast=True) instead.
+    @pytest.mark.trylast: mark a hook implementation function such that the plugin machinery will try to call it last/as late as possible.
 
 
 .. _`passing callables to custom markers`:
@@ -528,7 +528,7 @@ test function.  From a conftest file we can read it like this:
 
     def pytest_runtest_setup(item):
         for mark in item.iter_markers(name="glob"):
-            print(f"glob args={mark.args} kwargs={mark.kwargs}")
+            print("glob args={} kwargs={}".format(mark.args, mark.kwargs))
             sys.stdout.flush()
 
 Let's run this without capturing output and see what we get:
@@ -558,7 +558,6 @@ for your particular platform, you could use the following plugin:
     # content of conftest.py
     #
     import sys
-
     import pytest
 
     ALL = set("darwin linux win32".split())
@@ -568,7 +567,7 @@ for your particular platform, you could use the following plugin:
         supported_platforms = ALL.intersection(mark.name for mark in item.iter_markers())
         plat = sys.platform
         if supported_platforms and plat not in supported_platforms:
-            pytest.skip(f"cannot run on platform {plat}")
+            pytest.skip("cannot run on platform {}".format(plat))
 
 then tests will be skipped if they were specified for a different platform.
 Let's do a little test file to show how this looks like:
@@ -611,7 +610,7 @@ then you will see two tests skipped and two executed tests as expected:
     test_plat.py s.s.                                                    [100%]
 
     ========================= short test summary info ==========================
-    SKIPPED [2] conftest.py:13: cannot run on platform linux
+    SKIPPED [2] conftest.py:12: cannot run on platform linux
     ======================= 2 passed, 2 skipped in 0.12s =======================
 
 Note that if you specify a platform via the marker-command line option like this:

doc/en/example/nonpython.rst

@@ -9,7 +9,7 @@ Working with non-python tests
 A basic example for specifying tests in Yaml files
 --------------------------------------------------------------
 
-.. _`pytest-yamlwsgi`: https://pypi.org/project/pytest-yamlwsgi/
+.. _`pytest-yamlwsgi`: http://bitbucket.org/aafshar/pytest-yamlwsgi/src/tip/pytest_yamlwsgi.py
 
 Here is an example ``conftest.py`` (extracted from Ali Afshar's special purpose `pytest-yamlwsgi`_ plugin).   This ``conftest.py`` will  collect ``test*.yaml`` files and will execute the yaml-formatted content as custom tests:
 

doc/en/example/nonpython/conftest.py

@@ -18,8 +18,8 @@ class YamlFile(pytest.File):
 
 
 class YamlItem(pytest.Item):
-    def __init__(self, *, spec, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, name, parent, spec):
+        super().__init__(name, parent)
         self.spec = spec
 
     def runtest(self):

doc/en/example/parametrize.rst

@@ -657,17 +657,20 @@ Use :func:`pytest.raises` with the
 :ref:`pytest.mark.parametrize ref` decorator to write parametrized tests
 in which some tests raise exceptions and others do not.
 
-It may be helpful to use ``nullcontext`` as a complement to ``raises``.
-
-For example:
+It is helpful to define a no-op context manager ``does_not_raise`` to serve
+as a complement to ``raises``. For example:
 
 .. code-block:: python
 
-    from contextlib import nullcontext as does_not_raise
-
+    from contextlib import contextmanager
     import pytest
 
 
+    @contextmanager
+    def does_not_raise():
+        yield
+
+
     @pytest.mark.parametrize(
         "example_input,expectation",
         [
@@ -684,3 +687,22 @@ For example:
 
 In the example above, the first three test cases should run unexceptionally,
 while the fourth should raise ``ZeroDivisionError``.
+
+If you're only supporting Python 3.7+, you can simply use ``nullcontext``
+to define ``does_not_raise``:
+
+.. code-block:: python
+
+    from contextlib import nullcontext as does_not_raise
+
+Or, if you're supporting Python 3.3+ you can use:
+
+.. code-block:: python
+
+    from contextlib import ExitStack as does_not_raise
+
+Or, if desired, you can ``pip install contextlib2`` and use:
+
+.. code-block:: python
+
+    from contextlib2 import nullcontext as does_not_raise

doc/en/example/reportingdemo.rst

@@ -155,7 +155,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
     >       assert [0, 1, 2] == [0, 1, 3]
     E       assert [0, 1, 2] == [0, 1, 3]
     E         At index 2 diff: 2 != 3
-    E         Use -v to get more diff
+    E         Use -v to get the full diff
 
     failure_demo.py:63: AssertionError
     ______________ TestSpecialisedExplanations.test_eq_list_long _______________
@@ -168,7 +168,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
     >       assert a == b
     E       assert [0, 0, 0, 0, 0, 0, ...] == [0, 0, 0, 0, 0, 0, ...]
     E         At index 100 diff: 1 != 2
-    E         Use -v to get more diff
+    E         Use -v to get the full diff
 
     failure_demo.py:68: AssertionError
     _________________ TestSpecialisedExplanations.test_eq_dict _________________
@@ -215,7 +215,7 @@ Here is a nice run of several failures and how ``pytest`` presents things:
     >       assert [1, 2] == [1, 2, 3]
     E       assert [1, 2] == [1, 2, 3]
     E         Right contains one more item: 3
-    E         Use -v to get more diff
+    E         Use -v to get the full diff
 
     failure_demo.py:77: AssertionError
     _________________ TestSpecialisedExplanations.test_in_list _________________

doc/en/example/simple.rst

@@ -342,7 +342,7 @@ Example:
     def checkconfig(x):
         __tracebackhide__ = True
         if not hasattr(x, "config"):
-            pytest.fail(f"not configured: {x}")
+            pytest.fail("not configured: {}".format(x))
 
 
     def test_something():
@@ -376,7 +376,6 @@ this to make sure unexpected exception types aren't hidden:
 .. code-block:: python
 
     import operator
-
     import pytest
 
 
@@ -387,7 +386,7 @@ this to make sure unexpected exception types aren't hidden:
     def checkconfig(x):
         __tracebackhide__ = operator.methodcaller("errisinstance", ConfigException)
         if not hasattr(x, "config"):
-            raise ConfigException(f"not configured: {x}")
+            raise ConfigException("not configured: {}".format(x))
 
 
     def test_something():
@@ -566,7 +565,6 @@ an ``incremental`` marker which is to be used on classes:
     # content of conftest.py
 
     from typing import Dict, Tuple
-
     import pytest
 
     # store history of failures per test class name and per index in parametrize (if parametrize used)
@@ -610,7 +608,7 @@ an ``incremental`` marker which is to be used on classes:
                 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})")
+                    pytest.xfail("previous test failed ({})".format(test_name))
 
 
 These two hook implementations work together to abort incremental-marked
@@ -661,7 +659,8 @@ If we run this:
 
     test_step.py:11: AssertionError
     ========================= short test summary info ==========================
-    XFAIL test_step.py::TestUserHandling::test_deletion - reason: previous test failed (test_modification)
+    XFAIL test_step.py::TestUserHandling::test_deletion
+      reason: previous test failed (test_modification)
     ================== 1 failed, 2 passed, 1 xfailed in 0.12s ==================
 
 We'll see that ``test_deletion`` was not executed because ``test_modification``
@@ -803,9 +802,8 @@ case we just write some information out to a ``failures`` file:
 
     # content of conftest.py
 
-    import os.path
-
     import pytest
+    import os.path
 
 
     @pytest.hookimpl(tryfirst=True, hookwrapper=True)
@@ -895,8 +893,6 @@ here is a little example implemented via a local plugin:
 
     import pytest
 
-    phase_report_key = StashKey[Dict[str, CollectReport]]()
-
 
     @pytest.hookimpl(tryfirst=True, hookwrapper=True)
     def pytest_runtest_makereport(item, call):
@@ -904,9 +900,10 @@ here is a little example implemented via a local plugin:
         outcome = yield
         rep = outcome.get_result()
 
-        # store test results for each phase of a call, which can
+        # set a report attribute for each phase of a call, which can
         # be "setup", "call", "teardown"
-        item.stash.setdefault(phase_report_key, {})[rep.when] = rep
+
+        setattr(item, "rep_" + rep.when, rep)
 
 
     @pytest.fixture
@@ -914,11 +911,11 @@ here is a little example implemented via a local plugin:
         yield
         # request.node is an "item" because we use the default
         # "function" scope
-        report = request.node.stash[phase_report_key]
-        if report["setup"].failed:
-            print("setting up a test failed or skipped", request.node.nodeid)
-        elif ("call" not in report) or report["call"].failed:
-            print("executing test failed or skipped", request.node.nodeid)
+        if request.node.rep_setup.failed:
+            print("setting up a test failed!", request.node.nodeid)
+        elif request.node.rep_setup.passed:
+            if request.node.rep_call.failed:
+                print("executing test failed", request.node.nodeid)
 
 
 if you then have failing tests:
@@ -1069,7 +1066,6 @@ like ``pytest-timeout`` they must be imported explicitly and passed on to pytest
 
     # contents of app_main.py
     import sys
-
     import pytest_timeout  # Third party plugin
 
     if len(sys.argv) > 1 and sys.argv[1] == "--pytest":

doc/en/explanation/flaky.rst

@@ -94,7 +94,7 @@ Mark Lapierre discusses the `Pros and Cons of Quarantined Tests <https://dev.to/
 CI tools that rerun on failure
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Azure Pipelines (the Azure cloud CI/CD tool, formerly Visual Studio Team Services or VSTS) has a feature to `identify flaky tests <https://docs.microsoft.com/en-us/previous-versions/azure/devops/2017/dec-11-vsts?view=tfs-2017#identify-flaky-tests>`_ and rerun failed tests.
+Azure Pipelines (the Azure cloud CI/CD tool, formerly Visual Studio Team Services or VSTS) has a feature to `identify flaky tests <https://docs.microsoft.com/en-us/azure/devops/release-notes/2017/dec-11-vsts#identify-flaky-tests>`_ and rerun failed tests.
 
 
 

doc/en/explanation/goodpractices.rst

@@ -12,26 +12,41 @@ For development, we recommend you use :mod:`venv` for virtual environments and
 as well as the ``pytest`` package itself.
 This ensures your code and dependencies are isolated from your system Python installation.
 
-Create a ``pyproject.toml`` file in the root of your repository as described in
-:doc:`packaging:tutorials/packaging-projects`.
-The first few lines should look like this:
+Next, place a ``pyproject.toml`` file in the root of your package:
 
 .. code-block:: toml
 
     [build-system]
-    requires = ["hatchling"]
-    build-backend = "hatchling.build"
+    requires = ["setuptools>=42", "wheel"]
+    build-backend = "setuptools.build_meta"
 
-    [project]
-    name = "PACKAGENAME"
+and a ``setup.cfg`` file containing your package's metadata with the following minimum content:
+
+.. code-block:: ini
+
+    [metadata]
+    name = PACKAGENAME
+
+    [options]
+    packages = find:
 
 where ``PACKAGENAME`` is the name of your package.
 
+.. note::
+
+    If your pip version is older than ``21.3``, you'll also need a ``setup.py`` file:
+
+    .. code-block:: python
+
+        from setuptools import setup
+
+        setup()
+
 You can then install your package in "editable" mode by running from the same directory:
 
 .. code-block:: bash
 
-    pip install -e .
+     pip install -e .
 
 which lets you change your source code (both tests and application) and rerun tests at will.
 
@@ -50,8 +65,8 @@ Conventions for Python test discovery
 * In those directories, search for ``test_*.py`` or ``*_test.py`` files, imported by their `test package name`_.
 * From those files, collect test items:
 
-  * ``test`` prefixed test functions or methods outside of class.
-  * ``test`` prefixed test functions or methods inside ``Test`` prefixed test classes (without an ``__init__`` method). Methods decorated with ``@staticmethod`` and ``@classmethods`` are also considered.
+  * ``test`` prefixed test functions or methods outside of class
+  * ``test`` prefixed test functions or methods inside ``Test`` prefixed test classes (without an ``__init__`` method)
 
 For examples of how to customize your test discovery :doc:`/example/pythoncollection`.
 
@@ -74,11 +89,11 @@ to keep tests separate from actual application code (often a good idea):
 .. code-block:: text
 
     pyproject.toml
-    src/
-        mypkg/
-            __init__.py
-            app.py
-            view.py
+    setup.cfg
+    mypkg/
+        __init__.py
+        app.py
+        view.py
     tests/
         test_app.py
         test_view.py
@@ -88,57 +103,84 @@ This has the following benefits:
 
 * Your tests can run against an installed version after executing ``pip install .``.
 * Your tests can run against the local copy with an editable install after executing ``pip install --editable .``.
-
-For new projects, we recommend to use ``importlib`` :ref:`import mode <import-modes>`
-(see which-import-mode_ for a detailed explanation).
-To this end, add the following to your ``pyproject.toml``:
-
-.. code-block:: toml
-
-    [tool.pytest.ini_options]
-    addopts = [
-        "--import-mode=importlib",
-    ]
-
-.. _src-layout:
-
-Generally, but especially if you use the default import mode ``prepend``,
-it is **strongly** suggested to use a ``src`` layout.
-Here, your application root package resides in a sub-directory of your root,
-i.e. ``src/mypkg/`` instead of ``mypkg``.
-
-This layout prevents a lot of common pitfalls and has many benefits,
-which are better explained in this excellent `blog post`_ by Ionel Cristian Mărieș.
-
-.. _blog post: https://blog.ionelmc.ro/2014/05/25/python-packaging/#the-structure>
+* If you don't use an editable install and are relying on the fact that Python by default puts the current
+  directory in ``sys.path`` to import your package, you can execute ``python -m pytest`` to execute the tests against the
+  local copy directly, without using ``pip``.
 
 .. note::
 
-    If you do not use an editable install and use the ``src`` layout as above you need to extend the Python's
-    search path for module files to execute the tests against the local copy directly. You can do it in an
-    ad-hoc manner by setting the ``PYTHONPATH`` environment variable:
-
-    .. code-block:: bash
-
-       PYTHONPATH=src pytest
-
-    or in a permanent manner by using the :confval:`pythonpath` configuration variable and adding the
-    following to your ``pyproject.toml``:
-
-    .. code-block:: toml
-
-        [tool.pytest.ini_options]
-        pythonpath = "src"
-
-.. note::
-
-    If you do not use an editable install and not use the ``src`` layout (``mypkg`` directly in the root
-    directory) you can rely on the fact that Python by default puts the current directory in ``sys.path`` to
-    import your package and run ``python -m pytest`` to execute the tests against the local copy directly.
-
     See :ref:`pytest vs python -m pytest` for more information about the difference between calling ``pytest`` and
     ``python -m pytest``.
 
+Note that this scheme has a drawback if you are using ``prepend`` :ref:`import mode <import-modes>`
+(which is the default): your test files must have **unique names**, because
+``pytest`` will import them as *top-level* modules since there are no packages
+to derive a full package name from. In other words, the test files in the example above will
+be imported as ``test_app`` and ``test_view`` top-level modules by adding ``tests/`` to
+``sys.path``.
+
+If you need to have test modules with the same name, you might add ``__init__.py`` files to your
+``tests`` folder and subfolders, changing them to packages:
+
+.. code-block:: text
+
+    pyproject.toml
+    setup.cfg
+    mypkg/
+        ...
+    tests/
+        __init__.py
+        foo/
+            __init__.py
+            test_view.py
+        bar/
+            __init__.py
+            test_view.py
+
+Now pytest will load the modules as ``tests.foo.test_view`` and ``tests.bar.test_view``, allowing
+you to have modules with the same name. But now this introduces a subtle problem: in order to load
+the test modules from the ``tests`` directory, pytest prepends the root of the repository to
+``sys.path``, which adds the side-effect that now ``mypkg`` is also importable.
+
+This is problematic if you are using a tool like `tox`_ to test your package in a virtual environment,
+because you want to test the *installed* version of your package, not the local code from the repository.
+
+.. _`src-layout`:
+
+In this situation, it is **strongly** suggested to use a ``src`` layout where application root package resides in a
+sub-directory of your root:
+
+.. code-block:: text
+
+    pyproject.toml
+    setup.cfg
+    src/
+        mypkg/
+            __init__.py
+            app.py
+            view.py
+    tests/
+        __init__.py
+        foo/
+            __init__.py
+            test_view.py
+        bar/
+            __init__.py
+            test_view.py
+
+
+This layout prevents a lot of common pitfalls and has many benefits, which are better explained in this excellent
+`blog post by Ionel Cristian Mărieș <https://blog.ionelmc.ro/2014/05/25/python-packaging/#the-structure>`_.
+
+.. note::
+    The new ``--import-mode=importlib`` (see :ref:`import-modes`) doesn't have
+    any of the drawbacks above because ``sys.path`` is not changed when importing
+    test modules, so users that run
+    into this issue are strongly encouraged to try it and report if the new option works well for them.
+
+    The ``src`` directory layout is still strongly recommended however.
+
+
 Tests as part of application code
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -149,11 +191,12 @@ want to distribute them along with your application:
 .. code-block:: text
 
     pyproject.toml
-    [src/]mypkg/
+    setup.cfg
+    mypkg/
         __init__.py
         app.py
         view.py
-        tests/
+        test/
             __init__.py
             test_app.py
             test_view.py
@@ -211,56 +254,6 @@ Note that this layout also works in conjunction with the ``src`` layout mentione
     much less surprising.
 
 
-.. _which-import-mode:
-
-Choosing an import mode
-^^^^^^^^^^^^^^^^^^^^^^^
-
-For historical reasons, pytest defaults to the ``prepend`` :ref:`import mode <import-modes>`
-instead of the ``importlib`` import mode we recommend for new projects.
-The reason lies in the way the ``prepend`` mode works:
-
-Since there are no packages to derive a full package name from,
-``pytest`` will import your test files as *top-level* modules.
-The test files in the first example (:ref:`src layout <src-layout>`) would be imported as
-``test_app`` and ``test_view`` top-level modules by adding ``tests/`` to ``sys.path``.
-
-This results in a drawback compared to the import mode ``importlib``:
-your test files must have **unique names**.
-
-If you need to have test modules with the same name,
-as a workaround you might add ``__init__.py`` files to your ``tests`` folder and subfolders,
-changing them to packages:
-
-.. code-block:: text
-
-    pyproject.toml
-    mypkg/
-        ...
-    tests/
-        __init__.py
-        foo/
-            __init__.py
-            test_view.py
-        bar/
-            __init__.py
-            test_view.py
-
-Now pytest will load the modules as ``tests.foo.test_view`` and ``tests.bar.test_view``,
-allowing you to have modules with the same name.
-But now this introduces a subtle problem:
-in order to load the test modules from the ``tests`` directory,
-pytest prepends the root of the repository to ``sys.path``,
-which adds the side-effect that now ``mypkg`` is also importable.
-
-This is problematic if you are using a tool like tox_ to test your package in a virtual environment,
-because you want to test the *installed* version of your package,
-not the local code from the repository.
-
-The ``importlib`` import mode does not have any of the drawbacks above,
-because ``sys.path`` is not changed when importing test modules.
-
-
 .. _`buildout`: http://www.buildout.org/en/latest/
 
 .. _`use tox`:
@@ -270,8 +263,8 @@ tox
 
 Once you are done with your work and want to make sure that your actual
 package passes all tests you may want to look into :doc:`tox <tox:index>`, the
-virtualenv test automation tool.
-``tox`` helps you to setup virtualenv environments with pre-defined
+virtualenv test automation tool and its :doc:`pytest support <tox:example/pytest>`.
+tox helps you to setup virtualenv environments with pre-defined
 dependencies and then executing a pre-configured test command with
 options.  It will run tests against the installed package and not
 against your source code checkout, helping to detect packaging

doc/en/explanation/pythonpath.rst

@@ -45,19 +45,10 @@ these values:
 
 * ``importlib``: new in pytest-6.0, this mode uses :mod:`importlib` to import test modules. This gives full control over the import process, and doesn't require changing :py:data:`sys.path`.
 
-  For this reason this doesn't require test module names to be unique.
-
-  One drawback however is that test modules are non-importable by each other. Also,  utility
-  modules in the tests directories are not automatically importable because the tests directory is no longer
-  added to :py:data:`sys.path`.
-
-  Initially we intended to make ``importlib`` the default in future releases, however it is clear now that
-  it has its own set of drawbacks so the default will remain ``prepend`` for the foreseeable future.
-
-.. seealso::
-
-    The :confval:`pythonpath` configuration variable.
+  For this reason this doesn't require test module names to be unique, but also makes test
+  modules non-importable by each other.
 
+  We intend to make ``importlib`` the default in future releases, depending on feedback.
 
 ``prepend`` and ``append`` import modes scenarios
 -------------------------------------------------

doc/en/getting-started.rst

@@ -9,7 +9,7 @@ Get Started
 Install ``pytest``
 ----------------------------------------
 
-``pytest`` requires: Python 3.7+ or PyPy3.
+``pytest`` requires: Python 3.6, 3.7, 3.8, 3.9, or PyPy3.
 
 1. Run the following command in your command line:
 
@@ -22,7 +22,7 @@ Install ``pytest``
 .. code-block:: bash
 
     $ pytest --version
-    pytest 7.2.0
+    pytest 7.0.0rc1
 
 .. _`simpletest`:
 

doc/en/history.rst

@@ -139,7 +139,7 @@ project:
    which adds ``pytest`` (rather than ``py.test``) as the recommended
    command-line entry point
 
-Due to this history, it's difficult to answer the question when pytest was started.
+Due to this history, it's diffcult to answer the question when pytest was started.
 It depends what point should really be seen as the start of it all. One
 possible interpretation is to  pick Europython 2004, i.e. around June/July
 2004.

doc/en/how-to/assert.rst

@@ -201,7 +201,7 @@ if you run this module:
     E         '1'
     E         Extra items in the right set:
     E         '5'
-    E         Use -v to get more diff
+    E         Use -v to get the full diff
 
     test_assert2.py:4: AssertionError
     ========================= short test summary info ==========================
@@ -238,7 +238,7 @@ file which provides an alternative explanation for ``Foo`` objects:
        if isinstance(left, Foo) and isinstance(right, Foo) and op == "==":
            return [
                "Comparing Foo instances:",
-               f"   vals: {left.val} != {right.val}",
+               "   vals: {} != {}".format(left.val, right.val),
            ]
 
 now, given this test module:

doc/en/how-to/bash-completion.rst

@@ -5,7 +5,7 @@ How to set up bash completion
 =============================
 
 When using bash as your shell, ``pytest`` can use argcomplete
-(https://kislyuk.github.io/argcomplete/) for auto-completion.
+(https://argcomplete.readthedocs.io/) for auto-completion.
 For this ``argcomplete`` needs to be installed **and** enabled.
 
 Install argcomplete using:

doc/en/how-to/cache.rst

@@ -199,6 +199,7 @@ across pytest invocations:
 
     # content of test_caching.py
     import pytest
+    import time
 
 
     def expensive_computation():
@@ -233,7 +234,7 @@ If you run this command for the first time, you can see the print statement:
     >       assert mydata == 23
     E       assert 42 == 23
 
-    test_caching.py:19: AssertionError
+    test_caching.py:20: AssertionError
     -------------------------- Captured stdout setup ---------------------------
     running expensive computation...
     ========================= short test summary info ==========================
@@ -256,7 +257,7 @@ the cache and nothing will be printed:
     >       assert mydata == 23
     E       assert 42 == 23
 
-    test_caching.py:19: AssertionError
+    test_caching.py:20: AssertionError
     ========================= short test summary info ==========================
     FAILED test_caching.py::test_function - assert 42 == 23
     1 failed in 0.12s

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

@@ -42,20 +42,8 @@ Running pytest now produces this output:
     -- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
     ======================= 1 passed, 1 warning in 0.12s =======================
 
-.. _`controlling-warnings`:
-
-Controlling warnings
---------------------
-
-Similar to Python's `warning filter`_ and :option:`-W option <python:-W>` flag, pytest provides
-its own ``-W`` flag to control which warnings are ignored, displayed, or turned into
-errors. See the `warning filter`_ documentation for more
-advanced use-cases.
-
-.. _`warning filter`: https://docs.python.org/3/library/warnings.html#warning-filter
-
-This code sample shows how to treat any ``UserWarning`` category class of warning
-as an error:
+The ``-W`` flag can be passed to control which warnings will be displayed or even turn
+them into errors:
 
 .. code-block:: pytest
 
@@ -108,6 +96,9 @@ all other warnings into errors.
 When a warning matches more than one option in the list, the action for the last matching option
 is performed.
 
+Both ``-W`` command-line option and ``filterwarnings`` ini option are based on Python's own
+:option:`-W option <python:-W>` and :func:`warnings.simplefilter`, so please refer to those sections in the Python
+documentation for other examples and advanced usage.
 
 .. _`filterwarnings`:
 
@@ -178,14 +169,11 @@ using an external system.
 DeprecationWarning and PendingDeprecationWarning
 ------------------------------------------------
 
+
 By default pytest will display ``DeprecationWarning`` and ``PendingDeprecationWarning`` warnings from
 user code and third-party libraries, as recommended by :pep:`565`.
 This helps users keep their code modern and avoid breakages when deprecated warnings are effectively removed.
 
-However, in the specific case where users capture any type of warnings in their test, either with
-:func:`pytest.warns`, :func:`pytest.deprecated_call` or using the :ref:`recwarn <recwarn>` fixture,
-no warning will be displayed at all.
-
 Sometimes it is useful to hide some specific deprecation warnings that happen in code that you have no control over
 (such as third-party libraries), in which case you might use the warning filters options (ini or marks) to ignore
 those warnings.
@@ -202,9 +190,6 @@ For example:
 This will ignore all warnings of type ``DeprecationWarning`` where the start of the message matches
 the regular expression ``".*U.*mode is deprecated"``.
 
-See :ref:`@pytest.mark.filterwarnings <filterwarnings>` and
-:ref:`Controlling warnings <controlling-warnings>` for more examples.
-
 .. note::
 
     If warnings are configured at the interpreter level, using
@@ -253,15 +238,14 @@ when called with a ``17`` argument.
 Asserting warnings with the warns function
 ------------------------------------------
 
+
+
 You can check that code raises a particular warning using :func:`pytest.warns`,
-which works in a similar manner to :ref:`raises <assertraises>` (except that
-:ref:`raises <assertraises>` does not capture all exceptions, only the
-``expected_exception``):
+which works in a similar manner to :ref:`raises <assertraises>`:
 
 .. code-block:: python
 
     import warnings
-
     import pytest
 
 
@@ -269,8 +253,8 @@ which works in a similar manner to :ref:`raises <assertraises>` (except that
         with pytest.warns(UserWarning):
             warnings.warn("my warning", UserWarning)
 
-The test will fail if the warning in question is not raised. Use the keyword
-argument ``match`` to assert that the warning matches a text or regex::
+The test will fail if the warning in question is not raised. The keyword
+argument ``match`` to assert that the exception matches a text or regex::
 
     >>> with warns(UserWarning, match='must be 0 or None'):
     ...     warnings.warn("value must be 0 or None", UserWarning)
@@ -360,49 +344,6 @@ warnings, or index into it to get a particular recorded warning.
 
 Full API: :class:`~_pytest.recwarn.WarningsRecorder`.
 
-.. _`warns use cases`:
-
-Additional use cases of warnings in tests
------------------------------------------
-
-Here are some use cases involving warnings that often come up in tests, and suggestions on how to deal with them:
-
-- To ensure that **at least one** of the indicated warnings is issued, use:
-
-.. code-block:: python
-
-    def test_warning():
-        with pytest.warns((RuntimeWarning, UserWarning)):
-            ...
-
-- To ensure that **only** certain warnings are issued, use:
-
-.. code-block:: python
-
-    def test_warning(recwarn):
-        ...
-        assert len(recwarn) == 1
-        user_warning = recwarn.pop(UserWarning)
-        assert issubclass(user_warning.category, UserWarning)
-
--  To ensure that **no** warnings are emitted, use:
-
-.. code-block:: python
-
-    def test_warning():
-        with warnings.catch_warnings():
-            warnings.simplefilter("error")
-            ...
-
-- To suppress warnings, use:
-
-.. code-block:: python
-
-    with warnings.catch_warnings():
-        warnings.simplefilter("ignore")
-        ...
-
-
 .. _custom_failure_messages:
 
 Custom failure messages
@@ -462,18 +403,3 @@ Please read our :ref:`backwards-compatibility` to learn how we proceed about dep
 features.
 
 The full list of warnings is listed in :ref:`the reference documentation <warnings ref>`.
-
-
-.. _`resource-warnings`:
-
-Resource Warnings
------------------
-
-Additional information of the source of a :class:`ResourceWarning` can be obtained when captured by pytest if
-:mod:`tracemalloc` module is enabled.
-
-One convenient way to enable :mod:`tracemalloc` when running tests is to set the :envvar:`PYTHONTRACEMALLOC` to a large
-enough number of frames (say ``20``, but that number is application dependent).
-
-For more information, consult the `Python Development Mode <https://docs.python.org/3/library/devmode.html>`__
-section in the Python documentation.

doc/en/how-to/doctest.rst

@@ -126,17 +126,14 @@ pytest also introduces new options:
   in expected doctest output.
 
 * ``NUMBER``: when enabled, floating-point numbers only need to match as far as
-  the precision you have written in the expected doctest output. The numbers are
-  compared using :func:`pytest.approx` with relative tolerance equal to the
-  precision. For example, the following output would only need to match to 2
-  decimal places when comparing ``3.14`` to
-  ``pytest.approx(math.pi, rel=10**-2)``::
+  the precision you have written in the expected doctest output. For example,
+  the following output would only need to match to 2 decimal places::
 
       >>> math.pi
       3.14
 
-  If you wrote ``3.1416`` then the actual output would need to match to
-  approximately 4 decimal places; and so on.
+  If you wrote ``3.1416`` then the actual output would need to match to 4
+  decimal places; and so on.
 
   This avoids false positives caused by limited floating-point precision, like
   this::
@@ -242,6 +239,7 @@ which can then be used in your doctests directly:
         >>> len(a)
         10
         """
+        pass
 
 Note that like the normal ``conftest.py``, the fixtures are discovered in the directory tree conftest is in.
 Meaning that if you put your doctest with your source code, the relevant conftest.py needs to be in the same directory tree.

doc/en/how-to/fixtures.rst

@@ -398,9 +398,8 @@ access the fixture function:
 .. code-block:: python
 
     # content of conftest.py
-    import smtplib
-
     import pytest
+    import smtplib
 
 
     @pytest.fixture(scope="module")
@@ -610,10 +609,10 @@ Here's what that might look like:
 .. code-block:: python
 
     # content of test_emaillib.py
-    from emaillib import Email, MailAdminClient
-
     import pytest
 
+    from emaillib import Email, MailAdminClient
+
 
     @pytest.fixture
     def mail_admin():
@@ -631,7 +630,6 @@ Here's what that might look like:
     def receiving_user(mail_admin):
         user = mail_admin.create_user()
         yield user
-        user.clear_mailbox()
         mail_admin.delete_user(user)
 
 
@@ -685,10 +683,10 @@ Here's how the previous example would look using the ``addfinalizer`` method:
 .. code-block:: python
 
     # content of test_emaillib.py
-    from emaillib import Email, MailAdminClient
-
     import pytest
 
+    from emaillib import Email, MailAdminClient
+
 
     @pytest.fixture
     def mail_admin():
@@ -738,87 +736,6 @@ does offer some nuances for when you're in a pinch.
    .                                                                    [100%]
    1 passed in 0.12s
 
-Note on finalizer order
-""""""""""""""""""""""""
-
-Finalizers are executed in a first-in-last-out order.
-For yield fixtures, the first teardown code to run is from the right-most fixture, i.e. the last test parameter.
-
-
-.. code-block:: python
-
-    # content of test_finalizers.py
-    import pytest
-
-
-    def test_bar(fix_w_yield1, fix_w_yield2):
-        print("test_bar")
-
-
-    @pytest.fixture
-    def fix_w_yield1():
-        yield
-        print("after_yield_1")
-
-
-    @pytest.fixture
-    def fix_w_yield2():
-        yield
-        print("after_yield_2")
-
-
-.. code-block:: pytest
-
-    $ pytest -s test_finalizers.py
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
-    rootdir: /home/sweet/project
-    collected 1 item
-
-    test_finalizers.py test_bar
-    .after_yield_2
-    after_yield_1
-
-
-    ============================ 1 passed in 0.12s =============================
-
-For finalizers, the first fixture to run is last call to `request.addfinalizer`.
-
-.. code-block:: python
-
-    # content of test_finalizers.py
-    from functools import partial
-    import pytest
-
-
-    @pytest.fixture
-    def fix_w_finalizers(request):
-        request.addfinalizer(partial(print, "finalizer_2"))
-        request.addfinalizer(partial(print, "finalizer_1"))
-
-
-    def test_bar(fix_w_finalizers):
-        print("test_bar")
-
-
-.. code-block:: pytest
-
-    $ pytest -s test_finalizers.py
-    =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
-    rootdir: /home/sweet/project
-    collected 1 item
-
-    test_finalizers.py test_bar
-    .finalizer_1
-    finalizer_2
-
-
-    ============================ 1 passed in 0.12s =============================
-
-This is so because yield fixtures use `addfinalizer` behind the scenes: when the fixture executes, `addfinalizer` registers a function that resumes the generator, which in turn calls the teardown code.
-
-
 .. _`safe teardowns`:
 
 Safe teardowns
@@ -835,10 +752,10 @@ above):
 .. code-block:: python
 
     # content of test_emaillib.py
-    from emaillib import Email, MailAdminClient
-
     import pytest
 
+    from emaillib import Email, MailAdminClient
+
 
     @pytest.fixture
     def setup():
@@ -1113,9 +1030,8 @@ read an optional server URL from the test module which uses our fixture:
 .. code-block:: python
 
     # content of conftest.py
-    import smtplib
-
     import pytest
+    import smtplib
 
 
     @pytest.fixture(scope="module")
@@ -1123,7 +1039,7 @@ read an optional server URL from the test module which uses our fixture:
         server = getattr(request.module, "smtpserver", "smtp.gmail.com")
         smtp_connection = smtplib.SMTP(server, 587, timeout=5)
         yield smtp_connection
-        print(f"finalizing {smtp_connection} ({server})")
+        print("finalizing {} ({})".format(smtp_connection, server))
         smtp_connection.close()
 
 We use the ``request.module`` attribute to optionally obtain an
@@ -1277,16 +1193,15 @@ through the special :py:class:`request <FixtureRequest>` object:
 .. code-block:: python
 
     # content of conftest.py
-    import smtplib
-
     import pytest
+    import smtplib
 
 
     @pytest.fixture(scope="module", params=["smtp.gmail.com", "mail.python.org"])
     def smtp_connection(request):
         smtp_connection = smtplib.SMTP(request.param, 587, timeout=5)
         yield smtp_connection
-        print(f"finalizing {smtp_connection}")
+        print("finalizing {}".format(smtp_connection))
         smtp_connection.close()
 
 The main change is the declaration of ``params`` with
@@ -1417,15 +1332,13 @@ Running the above tests results in the following test IDs being used:
    =========================== test session starts ============================
    platform linux -- Python 3.x.y, pytest-7.x.y, pluggy-1.x.y
    rootdir: /home/sweet/project
-   collected 12 items
+   collected 11 items
 
    <Module test_anothersmtp.py>
      <Function test_showhelo[smtp.gmail.com]>
      <Function test_showhelo[mail.python.org]>
    <Module test_emaillib.py>
      <Function test_email_received>
-   <Module test_finalizers.py>
-     <Function test_bar>
    <Module test_ids.py>
      <Function test_a[spam]>
      <Function test_a[ham]>
@@ -1437,7 +1350,7 @@ Running the above tests results in the following test IDs being used:
      <Function test_ehlo[mail.python.org]>
      <Function test_noop[mail.python.org]>
 
-   ======================= 12 tests collected in 0.12s ========================
+   ======================= 11 tests collected in 0.12s ========================
 
 .. _`fixture-parametrize-marks`:
 
@@ -1590,7 +1503,7 @@ to show the setup/teardown flow:
 
 
     def test_2(otherarg, modarg):
-        print(f"  RUN test2 with otherarg {otherarg} and modarg {modarg}")
+        print("  RUN test2 with otherarg {} and modarg {}".format(otherarg, modarg))
 
 
 Let's run the tests in verbose mode and with looking at the print-output:
@@ -1691,7 +1604,6 @@ and declare its use in a test module via a ``usefixtures`` marker:
 
     # content of test_setenv.py
     import os
-
     import pytest
 
 
@@ -1772,6 +1684,8 @@ Given the tests file structure is:
 ::
 
     tests/
+        __init__.py
+
         conftest.py
             # content of tests/conftest.py
             import pytest
@@ -1786,6 +1700,8 @@ Given the tests file structure is:
                 assert username == 'username'
 
         subfolder/
+            __init__.py
+
             conftest.py
                 # content of tests/subfolder/conftest.py
                 import pytest
@@ -1794,8 +1710,8 @@ Given the tests file structure is:
                 def username(username):
                     return 'overridden-' + username
 
-            test_something_else.py
-                # content of tests/subfolder/test_something_else.py
+            test_something.py
+                # content of tests/subfolder/test_something.py
                 def test_username(username):
                     assert username == 'overridden-username'
 
@@ -1811,6 +1727,8 @@ Given the tests file structure is:
 ::
 
     tests/
+        __init__.py
+
         conftest.py
             # content of tests/conftest.py
             import pytest
@@ -1852,6 +1770,8 @@ Given the tests file structure is:
 ::
 
     tests/
+        __init__.py
+
         conftest.py
             # content of tests/conftest.py
             import pytest
@@ -1888,6 +1808,8 @@ Given the tests file structure is:
 ::
 
     tests/
+        __init__.py
+
         conftest.py
             # content of tests/conftest.py
             import pytest

doc/en/how-to/logging.rst

@@ -55,13 +55,6 @@ These options can also be customized through ``pytest.ini`` file:
     log_format = %(asctime)s %(levelname)s %(message)s
     log_date_format = %Y-%m-%d %H:%M:%S
 
-Specific loggers can be disabled via ``--log-disable={logger_name}``.
-This argument can be passed multiple times:
-
-.. code-block:: bash
-
-    pytest --log-disable=main --log-disable=testing
-
 Further it is possible to disable reporting of captured content (stdout,
 stderr and logs) on failed tests completely with:
 
@@ -80,6 +73,7 @@ messages.  This is supported by the ``caplog`` fixture:
 
     def test_foo(caplog):
         caplog.set_level(logging.INFO)
+        pass
 
 By default the level is set on the root logger,
 however as a convenience it is also possible to set the log level of any
@@ -89,6 +83,7 @@ logger:
 
     def test_foo(caplog):
         caplog.set_level(logging.CRITICAL, logger="root.baz")
+        pass
 
 The log levels set are restored automatically at the end of the test.
 
@@ -166,7 +161,9 @@ the records for the ``setup`` and ``call`` stages during teardown like so:
                 x.message for x in caplog.get_records(when) if x.levelno == logging.WARNING
             ]
             if messages:
-                pytest.fail(f"warning messages encountered during testing: {messages}")
+                pytest.fail(
+                    "warning messages encountered during testing: {}".format(messages)
+                )
 
 
 
@@ -183,8 +180,8 @@ logging records as they are emitted directly into the console.
 
 You can specify the logging level for which log records with equal or higher
 level are printed to the console by passing ``--log-cli-level``. This setting
-accepts the logging level names or numeric values as seen in
-:ref:`logging's documentation <python:levels>`.
+accepts the logging level names as seen in python's documentation or an integer
+as the logging level num.
 
 Additionally, you can also specify ``--log-cli-format`` and
 ``--log-cli-date-format`` which mirror and default to ``--log-format`` and
@@ -201,12 +198,11 @@ option names are:
 If you need to record the whole test suite logging calls to a file, you can pass
 ``--log-file=/path/to/log/file``. This log file is opened in write mode which
 means that it will be overwritten at each run tests session.
-Note that relative paths for the log-file location, whether passed on the CLI or declared in a
-config file, are always resolved relative to the current working directory.
 
 You can also specify the logging level for the log file by passing
-``--log-file-level``. This setting accepts the logging level names or numeric
-values as seen in :ref:`logging's documentation <python:levels>`.
+``--log-file-level``. This setting accepts the logging level names as seen in
+python's documentation(ie, uppercased level names) or an integer as the logging
+level num.
 
 Additionally, you can also specify ``--log-file-format`` and
 ``--log-file-date-format`` which are equal to ``--log-format`` and

doc/en/how-to/monkeypatch.rst

@@ -3,7 +3,7 @@
 How to monkeypatch/mock modules and environments
 ================================================================
 
-.. currentmodule:: pytest
+.. currentmodule:: _pytest.monkeypatch
 
 Sometimes tests need to invoke functionality which depends
 on global settings or which invokes code which cannot be easily
@@ -14,16 +14,17 @@ environment variable, or to modify ``sys.path`` for importing.
 The ``monkeypatch`` fixture provides these helper methods for safely patching and mocking
 functionality in tests:
 
-* :meth:`monkeypatch.setattr(obj, name, value, raising=True) <pytest.MonkeyPatch.setattr>`
-* :meth:`monkeypatch.delattr(obj, name, raising=True) <pytest.MonkeyPatch.delattr>`
-* :meth:`monkeypatch.setitem(mapping, name, value) <pytest.MonkeyPatch.setitem>`
-* :meth:`monkeypatch.delitem(obj, name, raising=True) <pytest.MonkeyPatch.delitem>`
-* :meth:`monkeypatch.setenv(name, value, prepend=None) <pytest.MonkeyPatch.setenv>`
-* :meth:`monkeypatch.delenv(name, raising=True) <pytest.MonkeyPatch.delenv>`
-* :meth:`monkeypatch.syspath_prepend(path) <pytest.MonkeyPatch.syspath_prepend>`
-* :meth:`monkeypatch.chdir(path) <pytest.MonkeyPatch.chdir>`
-* :meth:`monkeypatch.context() <pytest.MonkeyPatch.context>`
+.. code-block:: python
 
+    monkeypatch.setattr(obj, name, value, raising=True)
+    monkeypatch.setattr("somemodule.obj.name", value, raising=True)
+    monkeypatch.delattr(obj, name, raising=True)
+    monkeypatch.setitem(mapping, name, value)
+    monkeypatch.delitem(obj, name, raising=True)
+    monkeypatch.setenv(name, value, prepend=None)
+    monkeypatch.delenv(name, raising=True)
+    monkeypatch.syspath_prepend(path)
+    monkeypatch.chdir(path)
 
 All modifications will be undone after the requesting
 test function or fixture has finished. The ``raising``
@@ -54,16 +55,13 @@ during a test.
 5. Use :py:meth:`monkeypatch.syspath_prepend <MonkeyPatch.syspath_prepend>` to modify ``sys.path`` which will also
 call ``pkg_resources.fixup_namespace_packages`` and :py:func:`importlib.invalidate_caches`.
 
-6. Use :py:meth:`monkeypatch.context <MonkeyPatch.context>` to apply patches only in a specific scope, which can help
-control teardown of complex fixtures or patches to the stdlib.
-
 See the `monkeypatch blog post`_ for some introduction material
 and a discussion of its motivation.
 
 .. _`monkeypatch blog post`: https://tetamap.wordpress.com//2009/03/03/monkeypatching-in-unit-tests-done-right/
 
-Monkeypatching functions
-------------------------
+Simple example: monkeypatching functions
+----------------------------------------
 
 Consider a scenario where you are working with user directories. In the context of
 testing, you do not want your test to depend on the running user. ``monkeypatch``
@@ -438,7 +436,7 @@ separate fixtures for each potential mock and reference them in the needed tests
             _ = app.create_connection_string()
 
 
-.. currentmodule:: pytest
+.. currentmodule:: _pytest.monkeypatch
 
 API Reference
 -------------

doc/en/how-to/nose.rst

@@ -5,9 +5,6 @@ How to run tests written for nose
 
 ``pytest`` has basic support for running tests written for nose_.
 
-.. warning::
-    This functionality has been deprecated and is likely to be removed in ``pytest 8.x``.
-
 .. _nosestyle:
 
 Usage
@@ -26,8 +23,8 @@ make use of pytest's capabilities.
 Supported nose Idioms
 ----------------------
 
-* ``setup()`` and ``teardown()`` at module/class/method level: any function or method called ``setup`` will be called during the setup phase for each test, same for ``teardown``.
-* ``SkipTest`` exceptions and markers
+* setup and teardown at module/class/method level
+* SkipTest exceptions and markers
 * setup/teardown decorators
 * ``__test__`` attribute on modules/classes/functions
 * general usage of nose utilities

doc/en/how-to/output.rst

@@ -12,9 +12,8 @@ Examples for modifying traceback printing:
 
 .. code-block:: bash
 
-    pytest --showlocals     # show local variables in tracebacks
-    pytest -l               # show local variables (shortcut)
-    pytest --no-showlocals  # hide local variables (if addopts enables them)
+    pytest --showlocals # show local variables in tracebacks
+    pytest -l           # show local variables (shortcut)
 
     pytest --tb=auto    # (default) 'long' tracebacks for the first and last
                          # entry, but 'short' style for the other entries
@@ -85,7 +84,7 @@ Executing pytest normally gives us this output (we are skipping the header to fo
     >       assert fruits1 == fruits2
     E       AssertionError: assert ['banana', 'a...elon', 'kiwi'] == ['banana', 'a...elon', 'kiwi']
     E         At index 2 diff: 'grapes' != 'orange'
-    E         Use -v to get more diff
+    E         Use -v to get the full diff
 
     test_verbosity_example.py:8: AssertionError
     ____________________________ test_numbers_fail _____________________________
@@ -100,7 +99,7 @@ Executing pytest normally gives us this output (we are skipping the header to fo
     E         {'1': 1, '2': 2, '3': 3, '4': 4}
     E         Right contains 4 more items:
     E         {'10': 10, '20': 20, '30': 30, '40': 40}
-    E         Use -v to get more diff
+    E         Use -v to get the full diff
 
     test_verbosity_example.py:14: AssertionError
     ___________________________ test_long_text_fail ____________________________
@@ -349,7 +348,8 @@ Example:
     test_example.py:14: AssertionError
     ========================= short test summary info ==========================
     SKIPPED [1] test_example.py:22: skipping this test
-    XFAIL test_example.py::test_xfail - reason: xfailing this test
+    XFAIL test_example.py::test_xfail
+      reason: xfailing this test
     XPASS test_example.py::test_xpass always xfail
     ERROR test_example.py::test_error - assert 0
     FAILED test_example.py::test_fail - assert 0

doc/en/how-to/plugins.rst

@@ -21,7 +21,7 @@ there is no need to activate it.
 Here is a little annotated list for some popular plugins:
 
 * :pypi:`pytest-django`: write tests
-  for `django <https://docs.djangoproject.com/>`_ apps, using pytest integration.
+  for :std:doc:`django <django:index>` apps, using pytest integration.
 
 * :pypi:`pytest-twisted`: write tests
   for `twisted <https://twistedmatrix.com/>`_ apps, starting a reactor and
@@ -51,8 +51,8 @@ Here is a little annotated list for some popular plugins:
 * :pypi:`pytest-flakes`:
   check source code with pyflakes.
 
-* :pypi:`allure-pytest`:
-  report test results via `allure-framework <https://github.com/allure-framework/>`_.
+* :pypi:`oejskit`:
+  a plugin to run javascript unittests in live browsers.
 
 To see a complete list of all plugins with their latest testing
 status against different pytest and Python versions, please visit

doc/en/how-to/skipping.rst

@@ -69,7 +69,6 @@ It is also possible to skip the whole module using
 .. code-block:: python
 
     import sys
-
     import pytest
 
     if not sys.platform.startswith("win"):
@@ -85,14 +84,14 @@ It is also possible to skip the whole module using
 
 If you wish to skip something conditionally then you can use ``skipif`` instead.
 Here is an example of marking a test function to be skipped
-when run on an interpreter earlier than Python3.10:
+when run on an interpreter earlier than Python3.6:
 
 .. code-block:: python
 
     import sys
 
 
-    @pytest.mark.skipif(sys.version_info < (3, 10), reason="requires python3.10 or higher")
+    @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
     def test_function():
         ...
 
@@ -370,7 +369,7 @@ Here is a simple test file with the several usages:
 
 Running it with the report-on-xfail option gives this output:
 
-.. FIXME: Use $ instead of ! again to re-enable regendoc once it's fixed:
+.. FIXME: Use $ instead of ! again to reenable regendoc once it's fixed:
    https://github.com/pytest-dev/pytest/issues/8807
 
 .. code-block:: pytest
@@ -410,7 +409,6 @@ test instances when using parametrize:
 .. code-block:: python
 
     import sys
-
     import pytest
 
 

doc/en/how-to/tmp_path.rst

@@ -104,21 +104,8 @@ The ``tmpdir`` and ``tmpdir_factory`` fixtures
 
 The ``tmpdir`` and ``tmpdir_factory`` fixtures are similar to ``tmp_path``
 and ``tmp_path_factory``, but use/return legacy `py.path.local`_ objects
-rather than standard :class:`pathlib.Path` objects.
-
-.. note::
-    These days, it is preferred to use ``tmp_path`` and ``tmp_path_factory``.
-
-    In order to help modernize old code bases, one can run pytest with the legacypath
-    plugin disabled:
-
-    .. code-block:: bash
-
-        pytest -p no:legacypath
-
-    This will trigger errors on tests using the legacy paths.
-    It can also be permanently set as part of the :confval:`addopts` parameter in the
-    config file.
+rather than standard :class:`pathlib.Path` objects. These days, prefer to
+use ``tmp_path`` and ``tmp_path_factory``.
 
 See :fixture:`tmpdir <tmpdir>` :fixture:`tmpdir_factory <tmpdir_factory>`
 API for details.
@@ -131,15 +118,8 @@ The default base temporary directory
 
 Temporary directories are by default created as sub-directories of
 the system temporary directory.  The base name will be ``pytest-NUM`` where
-``NUM`` will be incremented with each test run.
-By default, only the directories of failed tests will be kept.
-Also only the last 3 directries will remain at most.
-This behavior can be configured with :confval:`tmp_path_retention_count` and
-:confval:`tmp_path_retention_policy`.
-
-Using the ``--basetemp``
-option will remove the directory before every run, effectively meaning the temporary directories
-of only the most recent run will be kept.
+``NUM`` will be incremented with each test run.  Moreover, entries older
+than 3 temporary directories will be removed.
 
 You can override the default temporary directory setting like this:
 

doc/en/how-to/unittest.rst

@@ -27,15 +27,12 @@ Almost all ``unittest`` features are supported:
 * ``setUpClass/tearDownClass``;
 * ``setUpModule/tearDownModule``;
 
-.. _`pytest-subtests`: https://github.com/pytest-dev/pytest-subtests
 .. _`load_tests protocol`: https://docs.python.org/3/library/unittest.html#load-tests-protocol
 
-Additionally, :ref:`subtests <python:subtests>` are supported by the
-`pytest-subtests`_ plugin.
-
 Up to this point pytest does not have support for the following features:
 
 * `load_tests protocol`_;
+* :ref:`subtests <python:subtests>`;
 
 Benefits out of the box
 -----------------------
@@ -118,7 +115,6 @@ fixture definition:
     # content of test_unittest_db.py
 
     import unittest
-
     import pytest
 
 
@@ -157,7 +153,7 @@ the ``self.db`` values in the traceback:
     E       AssertionError: <conftest.db_class.<locals>.DummyDB object at 0xdeadbeef0001>
     E       assert 0
 
-    test_unittest_db.py:11: AssertionError
+    test_unittest_db.py:10: AssertionError
     ___________________________ MyTest.test_method2 ____________________________
 
     self = <test_unittest_db.MyTest testMethod=test_method2>
@@ -167,7 +163,7 @@ the ``self.db`` values in the traceback:
     E       AssertionError: <conftest.db_class.<locals>.DummyDB object at 0xdeadbeef0001>
     E       assert 0
 
-    test_unittest_db.py:14: AssertionError
+    test_unittest_db.py:13: AssertionError
     ========================= short test summary info ==========================
     FAILED test_unittest_db.py::MyTest::test_method1 - AssertionError: <conft...
     FAILED test_unittest_db.py::MyTest::test_method2 - AssertionError: <conft...
@@ -198,9 +194,9 @@ creation of a per-test temporary directory:
 .. code-block:: python
 
     # content of test_unittest_cleandir.py
-    import unittest
-
+    import os
     import pytest
+    import unittest
 
 
     class MyTest(unittest.TestCase):

doc/en/how-to/usage.rst

@@ -183,9 +183,8 @@ You can specify additional plugins to ``pytest.main``:
 .. code-block:: python
 
     # content of myinvoke.py
-    import sys
-
     import pytest
+    import sys
 
 
     class MyPlugin:

doc/en/how-to/writing_hook_functions.rst

@@ -194,7 +194,7 @@ class or module can then be passed to the ``pluginmanager`` using the ``pytest_a
 .. code-block:: python
 
     def pytest_addhooks(pluginmanager):
-        """This example assumes the hooks are grouped in the 'sample_hook' module."""
+        """ This example assumes the hooks are grouped in the 'sample_hook' module. """
         from my_app.tests import sample_hook
 
         pluginmanager.add_hookspecs(sample_hook)
@@ -253,14 +253,14 @@ and use pytest_addoption as follows:
    # default value
    @hookspec(firstresult=True)
    def pytest_config_file_default_value():
-       """Return the default value for the config file command line option."""
+       """ Return the default value for the config file command line option. """
 
 
    # contents of myplugin.py
 
 
    def pytest_addhooks(pluginmanager):
-       """This example assumes the hooks are grouped in the 'hooks' module."""
+       """ This example assumes the hooks are grouped in the 'hooks' module. """
        from . import hooks
 
        pluginmanager.add_hookspecs(hooks)
@@ -321,7 +321,7 @@ Plugins often need to store data on :class:`~pytest.Item`\s in one hook
 implementation, and access it in another. One common solution is to just
 assign some private attribute directly on the item, but type-checkers like
 mypy frown upon this, and it may also cause conflicts with other plugins.
-So pytest offers a better way to do this, :attr:`item.stash <_pytest.nodes.Node.stash>`.
+So pytest offers a better way to do this, :attr:`_pytest.nodes.Node.stash <item.stash>`.
 
 To use the "stash" in your plugins, first create "stash keys" somewhere at the
 top level of your plugin:

doc/en/how-to/writing_plugins.rst

@@ -147,37 +147,29 @@ Making your plugin installable by others
 
 If you want to make your plugin externally available, you
 may define a so-called entry point for your distribution so
-that ``pytest`` finds your plugin module. Entry points are
-a feature that is provided by :std:doc:`setuptools <setuptools:index>`.
+that ``pytest`` finds your plugin module.  Entry points are
+a feature that is provided by :std:doc:`setuptools:index`. pytest looks up
+the ``pytest11`` entrypoint to discover its
+plugins and you can thus make your plugin available by defining
+it in your setuptools-invocation:
 
-pytest looks up the ``pytest11`` entrypoint to discover its
-plugins, thus you can make your plugin available by defining
-it in your ``pyproject.toml`` file.
+.. sourcecode:: python
 
-.. sourcecode:: toml
+    # sample ./setup.py file
+    from setuptools import setup
 
-    # sample ./pyproject.toml file
-    [build-system]
-    requires = ["hatchling"]
-    build-backend = "hatchling.build"
-
-    [project]
-    name = "myproject"
-    classifiers = [
-        "Framework :: Pytest",
-    ]
-
-    [tool.setuptools]
-    packages = ["myproject"]
-
-    [project.entry_points]
-    pytest11 = [
-        "myproject = myproject.pluginmodule",
-    ]
+    setup(
+        name="myproject",
+        packages=["myproject"],
+        # the following makes a plugin available to pytest
+        entry_points={"pytest11": ["name_of_plugin = myproject.pluginmodule"]},
+        # custom PyPI classifier for pytest plugins
+        classifiers=["Framework :: Pytest"],
+    )
 
 If a package is installed this way, ``pytest`` will load
 ``myproject.pluginmodule`` as a plugin which can define
-:ref:`hooks <hook-reference>`. Confirm registration with ``pytest --trace-config``
+:ref:`hooks <hook-reference>`.
 
 .. note::
 
@@ -375,7 +367,7 @@ string value of ``Hello World!`` if we do not supply a value or ``Hello
         def _hello(name=None):
             if not name:
                 name = request.config.getoption("name")
-            return f"Hello {name}!"
+            return "Hello {name}!".format(name=name)
 
         return _hello
 

doc/en/how-to/xunit_setup.rst

@@ -32,7 +32,7 @@ which will usually be called once for all the functions:
 .. code-block:: python
 
     def setup_module(module):
-        """setup any state specific to the execution of the given module."""
+        """ setup any state specific to the execution of the given module."""
 
 
     def teardown_module(module):
@@ -63,8 +63,6 @@ and after all test methods of the class are called:
         setup_class.
         """
 
-.. _xunit-method-setup:
-
 Method and function level setup/teardown
 -----------------------------------------------
 

doc/en/index.rst

@@ -2,9 +2,9 @@
 
 .. sidebar:: Next Open Trainings
 
-   - `Professional Testing with Python <https://python-academy.com/courses/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_, March 7th to 9th 2023 (3 day in-depth training), Remote and Leipzig, Germany
+   - `Professional Testing with Python <https://www.python-academy.com/courses/specialtopics/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_, February 1st to 3rd, 2022, Leipzig (Germany) and remote.
 
-   Also see :doc:`previous talks and blogposts <talks>`.
+   Also see `previous talks and blogposts <talks.html>`_.
 
 .. _features:
 
@@ -17,10 +17,12 @@ The ``pytest`` framework makes it easy to write small, readable tests, and can
 scale to support complex functional testing for applications and libraries.
 
 
-``pytest`` requires: Python 3.7+ or PyPy3.
+**Pythons**: ``pytest`` requires: Python 3.6, 3.7, 3.8, 3.9, or PyPy3.
 
 **PyPI package name**: :pypi:`pytest`
 
+**Documentation as PDF**: `download latest <https://media.readthedocs.org/pdf/pytest/latest/pytest.pdf>`_
+
 
 A quick example
 ---------------
@@ -76,7 +78,7 @@ Features
 
 - Can run :ref:`unittest <unittest>` (including trial) and :ref:`nose <noseintegration>` test suites out of the box
 
-- Python 3.7+ or PyPy 3
+- Python 3.6+ and PyPy 3
 
 - Rich plugin architecture, with over 800+ :ref:`external plugins <plugin-list>` and thriving community
 
@@ -96,6 +98,11 @@ Bugs/Requests
 Please use the `GitHub issue tracker <https://github.com/pytest-dev/pytest/issues>`_ to submit bugs or request features.
 
 
+Changelog
+---------
+
+Consult the :ref:`Changelog <changelog>` page for fixes and enhancements of each version.
+
 Support pytest
 --------------
 
@@ -128,3 +135,13 @@ Security
 pytest has never been associated with a security vulnerability, but in any case, to report a
 security vulnerability please use the `Tidelift security contact <https://tidelift.com/security>`_.
 Tidelift will coordinate the fix and disclosure.
+
+
+License
+-------
+
+Copyright Holger Krekel and others, 2004.
+
+Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
+
+.. _`MIT`: https://github.com/pytest-dev/pytest/blob/main/LICENSE

doc/en/py27-py34-deprecation.rst

@@ -0,0 +1,99 @@
+Python 2.7 and 3.4 support
+==========================
+
+It is demanding on the maintainers of an open source project to support many Python versions, as
+there's extra cost of keeping code compatible between all versions, while holding back on
+features only made possible on newer Python versions.
+
+In case of Python 2 and 3, the difference between the languages makes it even more prominent,
+because many new Python 3 features cannot be used in a Python 2/3 compatible code base.
+
+Python 2.7 EOL has been reached :pep:`in 2020 <0373#maintenance-releases>`, with
+the last release made in April, 2020.
+
+Python 3.4 EOL has been reached :pep:`in 2019 <0429#release-schedule>`, with the last release made in March, 2019.
+
+For those reasons, in Jun 2019 it was decided that **pytest 4.6** series will be the last to support Python 2.7 and 3.4.
+
+What this means for general users
+---------------------------------
+
+Thanks to the `python_requires`_ setuptools option,
+Python 2.7 and Python 3.4 users using a modern pip version
+will install the last pytest 4.6.X version automatically even if 5.0 or later versions
+are available on PyPI.
+
+Users should ensure they are using the latest pip and setuptools versions for this to work.
+
+Maintenance of 4.6.X versions
+-----------------------------
+
+Until January 2020, the pytest core team ported many bug-fixes from the main release into the
+``4.6.x`` branch, with several 4.6.X releases being made along the year.
+
+From now on, the core team will **no longer actively backport patches**, but the ``4.6.x``
+branch will continue to exist so the community itself can contribute patches.
+
+The core team will be happy to accept those patches, and make new 4.6.X releases **until mid-2020**
+(but consider that date as a ballpark, after that date the team might still decide to make new releases
+for critical bugs).
+
+.. _`python_requires`: https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires
+
+Technical aspects
+~~~~~~~~~~~~~~~~~
+
+(This section is a transcript from :issue:`5275`).
+
+In this section we describe the technical aspects of the Python 2.7 and 3.4 support plan.
+
+.. _what goes into 4.6.x releases:
+
+What goes into 4.6.X releases
++++++++++++++++++++++++++++++
+
+New 4.6.X releases will contain bug fixes only.
+
+When will 4.6.X releases happen
++++++++++++++++++++++++++++++++
+
+New 4.6.X releases will happen after we have a few bugs in place to release, or if a few weeks have
+passed (say a single bug has been fixed a month after the latest 4.6.X release).
+
+No hard rules here, just ballpark.
+
+Who will handle applying bug fixes
+++++++++++++++++++++++++++++++++++
+
+We core maintainers expect that people still using Python 2.7/3.4 and being affected by
+bugs to step up and provide patches and/or port bug fixes from the active branches.
+
+We will be happy to guide users interested in doing so, so please don't hesitate to ask.
+
+**Backporting changes into 4.6**
+
+Please follow these instructions:
+
+#. ``git fetch --all --prune``
+
+#. ``git checkout origin/4.6.x -b backport-XXXX`` # use the PR number here
+
+#. Locate the merge commit on the PR, in the *merged* message, for example:
+
+    nicoddemus merged commit 0f8b462 into pytest-dev:features
+
+#. ``git cherry-pick -m1 REVISION`` # use the revision you found above (``0f8b462``).
+
+#. Open a PR targeting ``4.6.x``:
+
+   * Prefix the message with ``[4.6]`` so it is an obvious backport
+   * Delete the PR body, it usually contains a duplicate commit message.
+
+**Providing new PRs to 4.6**
+
+Fresh pull requests to ``4.6.x`` will be accepted provided that
+the equivalent code in the active branches does not contain that bug (for example, a bug is specific
+to Python 2 only).
+
+Bug fixes that also happen in the mainstream version should be first fixed
+there, and then backported as per instructions above.

doc/en/reference/customize.rst

@@ -20,7 +20,8 @@ Configuration file formats
 --------------------------
 
 Many :ref:`pytest settings <ini options ref>` can be set in a *configuration file*, which
-by convention resides in the root directory of your repository.
+by convention resides on the root of your repository or in your
+tests folder.
 
 A quick example of the configuration files supported by pytest:
 
@@ -29,11 +30,9 @@ pytest.ini
 
 ``pytest.ini`` files take precedence over other files, even when empty.
 
-Alternatively, the hidden version ``.pytest.ini`` can be used.
-
 .. code-block:: ini
 
-    # pytest.ini or .pytest.ini
+    # pytest.ini
     [pytest]
     minversion = 6.0
     addopts = -ra -q
@@ -90,7 +89,7 @@ and can also be used to hold pytest configuration if they have a ``[pytest]`` se
 setup.cfg
 ~~~~~~~~~
 
-``setup.cfg`` files are general purpose configuration files, used originally by :doc:`distutils <python:distutils/configfile>`, and can also be used to hold pytest configuration
+``setup.cfg`` files are general purpose configuration files, used originally by :doc:`distutils <distutils/configfile>`, and can also be used to hold pytest configuration
 if they have a ``[tool:pytest]`` section.
 
 .. code-block:: ini

doc/en/reference/fixtures.rst

@@ -208,7 +208,7 @@ the one defined in ``tests/test_top.py`` would be unavailable to it because it
 would have to step down a level (step inside a circle) to find it.
 
 The first fixture the test finds is the one that will be used, so
-:ref:`fixtures can be overridden <override fixtures>` if you need to change or
+:ref:`fixtures can be overriden <override fixtures>` if you need to change or
 extend what one does for a particular scope.
 
 You can also use the ``conftest.py`` file to implement
@@ -401,9 +401,6 @@ the graph would look like this:
 Because ``c`` can now be put above ``d`` in the graph, pytest can once again
 linearize the graph to this:
 
-.. image:: /example/fixtures/test_fixtures_order_autouse_flat.*
-    :align: center
-
 In this example, ``c`` makes ``b`` and ``a`` effectively autouse fixtures as
 well.
 

doc/en/reference/index.rst

@@ -8,8 +8,8 @@ Reference guides
 .. toctree::
    :maxdepth: 1
 
-   reference
    fixtures
-   customize
-   exit-codes
    plugin_list
+   customize
+   reference
+   exit-codes

doc/en/requirements.txt

@@ -1,11 +1,7 @@
 pallets-sphinx-themes
 pluggy>=1.0
-pygments-pytest>=2.3.0
+pygments-pytest>=2.2.0
 sphinx-removed-in>=0.2.0
-sphinx>=5,<6
+sphinx>=3.1,<4
 sphinxcontrib-trio
 sphinxcontrib-svg2pdfconverter
-# Pin packaging because it no longer handles 'latest' version, which
-# is the version that is assigned to the docs.
-# See https://github.com/pytest-dev/pytest/pull/10578#issuecomment-1348249045.
-packaging <22

doc/en/talks.rst

@@ -11,16 +11,9 @@ Books
 - `Python Testing with pytest, by Brian Okken (2017)
   <https://pragprog.com/book/bopytest/python-testing-with-pytest>`_.
 
-- `Python Testing with pytest, Second Edition, by Brian Okken (2022)
-  <https://pragprog.com/titles/bopytest2/python-testing-with-pytest-second-edition>`_.
-
 Talks and blog postings
 ---------------------------------------------
 
-- Training: `pytest - simple, rapid and fun testing with Python <https://www.youtube.com/watch?v=ofPHJrAOaTE>`_, Florian Bruhin, PyConDE 2022
-
-- `pytest: Simple, rapid and fun testing with Python, <https://youtu.be/cSJ-X3TbQ1c?t=15752>`_ (@ 4:22:32), Florian Bruhin, WeAreDevelopers World Congress 2021
-
 - Webinar: `pytest: Test Driven Development für Python (German) <https://bruhin.software/ins-pytest/>`_, Florian Bruhin, via mylearning.ch, 2020
 
 - Webinar: `Simplify Your Tests with Fixtures <https://blog.jetbrains.com/pycharm/2020/08/webinar-recording-simplify-your-tests-with-fixtures-with-oliver-bestwalter/>`_, Oliver Bestwalter, via JetBrains, 2020

extra/setup-py.test/setup.py

@@ -0,0 +1,11 @@
+import sys
+from distutils.core import setup
+
+if __name__ == "__main__":
+    if "sdist" not in sys.argv[1:]:
+        raise ValueError("please use 'pytest' pypi package instead of 'py.test'")
+    setup(
+        name="py.test",
+        version="0.0",
+        description="please use 'pytest' for installation",
+    )

pyproject.toml

@@ -3,6 +3,7 @@ requires = [
   # sync with setup.py until we discard non-pep-517/518
   "setuptools>=45.0",
   "setuptools-scm[toml]>=6.2.3",
+  "wheel",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -27,6 +28,8 @@ filterwarnings = [
     "default:the imp module is deprecated in favour of importlib:DeprecationWarning:nose.*",
     # distutils is deprecated in 3.10, scheduled for removal in 3.12
     "ignore:The distutils package is deprecated:DeprecationWarning",
+    # produced by python3.6/site.py itself (3.6.7 on Travis, could not trigger it with 3.6.8)."
+    "ignore:.*U.*mode is deprecated:DeprecationWarning:(?!(pytest|_pytest))",
     # produced by pytest-xdist
     "ignore:.*type argument to addoption.*:DeprecationWarning",
     # produced on execnet (pytest-xdist)
@@ -37,9 +40,6 @@ filterwarnings = [
     # Those are caught/handled by pyupgrade, and not easy to filter with the
     # module being the filename (with .py removed).
     "default:invalid escape sequence:DeprecationWarning",
-    # ignore not yet fixed warnings for hook markers
-    "default:.*not marked using pytest.hook.*",
-    "ignore:.*not marked using pytest.hook.*::xdist.*",
     # ignore use of unregistered marks, because we use many to test the implementation
     "ignore::_pytest.warning_types.PytestUnknownMarkWarning",
     # https://github.com/benjaminp/six/issues/341
@@ -113,4 +113,4 @@ template = "changelog/_template.rst"
   showcontent = true
 
 [tool.black]
-target-version = ['py37']
+target-version = ['py36']

scripts/prepare-release-pr.py

@@ -88,9 +88,7 @@ def prepare_release_pr(
 
     print(f"Branch {Fore.CYAN}{release_branch}{Fore.RESET} created.")
 
-    if is_major:
-        template_name = "release.major.rst"
-    elif prerelease:
+    if prerelease:
         template_name = "release.pre.rst"
     elif is_feature_release:
         template_name = "release.minor.rst"
@@ -106,7 +104,6 @@ def prepare_release_pr(
         "--",
         version,
         template_name,
-        release_branch,  # doc_version
         "--skip-check-links",
     ]
     print("Running", " ".join(cmdline))

scripts/release.major.rst

@@ -1,24 +0,0 @@
-pytest-{version}
-=======================================
-
-The pytest team is proud to announce the {version} 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:
-
-{contributors}
-
-Happy testing,
-The pytest Development Team

scripts/release.minor.rst

@@ -3,8 +3,8 @@ pytest-{version}
 
 The pytest team is proud to announce the {version} release!
 
-This release contains new features, improvements, and bug fixes,
-the full list of changes is available in the changelog:
+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
 

scripts/release.pre.rst

@@ -19,7 +19,7 @@ You can upgrade from PyPI via:
 
 Users are encouraged to take a look at the CHANGELOG carefully:
 
-    https://docs.pytest.org/en/{doc_version}/changelog.html
+    https://docs.pytest.org/en/stable/changelog.html
 
 Thanks to all the contributors to this release:
 

scripts/release.py

@@ -10,7 +10,7 @@ from colorama import Fore
 from colorama import init
 
 
-def announce(version, template_name, doc_version):
+def announce(version, template_name):
     """Generates a new release announcement entry in the docs."""
     # Get our list of authors
     stdout = check_output(["git", "describe", "--abbrev=0", "--tags"])
@@ -31,9 +31,7 @@ def announce(version, template_name, doc_version):
     )
 
     contributors_text = "\n".join(f"* {name}" for name in sorted(contributors)) + "\n"
-    text = template_text.format(
-        version=version, contributors=contributors_text, doc_version=doc_version
-    )
+    text = template_text.format(version=version, contributors=contributors_text)
 
     target = Path(__file__).parent.joinpath(f"../doc/en/announce/release-{version}.rst")
     target.write_text(text, encoding="UTF-8")
@@ -84,9 +82,9 @@ def check_links():
     check_call(["tox", "-e", "docs-checklinks"])
 
 
-def pre_release(version, template_name, doc_version, *, skip_check_links):
+def pre_release(version, template_name, *, skip_check_links):
     """Generates new docs, release announcements and creates a local tag."""
-    announce(version, template_name, doc_version)
+    announce(version, template_name)
     regen(version)
     changelog(version, write_out=True)
     fix_formatting()
@@ -114,15 +112,11 @@ def main():
     parser.add_argument(
         "template_name", help="Name of template file to use for release announcement"
     )
-    parser.add_argument(
-        "doc_version", help="For prereleases, the version to link to in the docs"
-    )
     parser.add_argument("--skip-check-links", action="store_true", default=False)
     options = parser.parse_args()
     pre_release(
         options.version,
         options.template_name,
-        options.doc_version,
         skip_check_links=options.skip_check_links,
     )
 

scripts/update-plugin-list.py

@@ -78,23 +78,11 @@ def iter_plugins():
         requires = "N/A"
         if info["requires_dist"]:
             for requirement in info["requires_dist"]:
-                if re.match(r"pytest(?![-.\w])", requirement):
+                if requirement == "pytest" or "pytest " in requirement:
                     requires = requirement
                     break
-
-        def version_sort_key(version_string):
-            """
-            Return the sort key for the given version string
-            returned by the API.
-            """
-            try:
-                return packaging.version.parse(version_string)
-            except packaging.version.InvalidVersion:
-                # Use a hard-coded pre-release version.
-                return packaging.version.Version("0.0.0alpha")
-
         releases = response.json()["releases"]
-        for release in sorted(releases, key=version_sort_key, reverse=True):
+        for release in sorted(releases, key=packaging.version.parse, reverse=True):
             if releases[release]:
                 release_date = datetime.date.fromisoformat(
                     releases[release][-1]["upload_time_iso_8601"].split("T")[0]
@@ -102,9 +90,7 @@ def iter_plugins():
                 last_release = release_date.strftime("%b %d, %Y")
                 break
         name = f':pypi:`{info["name"]}`'
-        summary = ""
-        if info["summary"]:
-            summary = escape_rst(info["summary"].replace("\n", ""))
+        summary = escape_rst(info["summary"].replace("\n", ""))
         yield {
             "name": name,
             "summary": summary.strip(),
@@ -136,7 +122,7 @@ def main():
     reference_dir = pathlib.Path("doc", "en", "reference")
 
     plugin_list = reference_dir / "plugin_list.rst"
-    with plugin_list.open("w", encoding="UTF-8") as f:
+    with plugin_list.open("w") as f:
         f.write(FILE_HEAD)
         f.write(f"This list contains {len(plugins)} plugins.\n\n")
         f.write(".. only:: not latex\n\n")

setup.cfg

@@ -17,11 +17,11 @@ classifiers =
     Operating System :: POSIX
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
-    Programming Language :: Python :: 3.11
     Topic :: Software Development :: Libraries
     Topic :: Software Development :: Testing
     Topic :: Utilities
@@ -37,22 +37,21 @@ packages =
     _pytest
     _pytest._code
     _pytest._io
-    _pytest._py
     _pytest.assertion
     _pytest.config
     _pytest.mark
     pytest
-py_modules = py
 install_requires =
     attrs>=19.2.0
     iniconfig
     packaging
     pluggy>=0.12,<2.0
+    py>=1.8.2
+    tomli>=1.0.0
+    atomicwrites>=1.0;sys_platform=="win32"
     colorama;sys_platform=="win32"
-    exceptiongroup>=1.0.0rc8;python_version<"3.11"
     importlib-metadata>=0.12;python_version<"3.8"
-    tomli>=1.0.0;python_version<"3.11"
-python_requires = >=3.7
+python_requires = >=3.6
 package_dir =
     =src
 setup_requires =
@@ -96,6 +95,7 @@ mypy_path = src
 check_untyped_defs = True
 disallow_any_generics = True
 ignore_missing_imports = True
+no_implicit_optional = True
 show_error_codes = True
 strict_equality = True
 warn_redundant_casts = True

src/_pytest/_argcomplete.py

@@ -78,15 +78,15 @@ class FastFilesCompleter:
 
     def __call__(self, prefix: str, **kwargs: Any) -> List[str]:
         # Only called on non option completions.
-        if os.sep in prefix[1:]:
-            prefix_dir = len(os.path.dirname(prefix) + os.sep)
+        if os.path.sep in prefix[1:]:
+            prefix_dir = len(os.path.dirname(prefix) + os.path.sep)
         else:
             prefix_dir = 0
         completion = []
         globbed = []
         if "*" not in prefix and "?" not in prefix:
             # We are on unix, otherwise no bash.
-            if not prefix or prefix[-1] == os.sep:
+            if not prefix or prefix[-1] == os.path.sep:
                 globbed.extend(glob(prefix + ".*"))
             prefix += "*"
         globbed.extend(glob(prefix))
@@ -108,6 +108,7 @@ if os.environ.get("_ARGCOMPLETE"):
     def try_argcomplete(parser: argparse.ArgumentParser) -> None:
         argcomplete.autocomplete(parser, always_complete_options=False)
 
+
 else:
 
     def try_argcomplete(parser: argparse.ArgumentParser) -> None:

src/_pytest/_code/code.py

@@ -1,6 +1,5 @@
 import ast
 import inspect
-import os
 import re
 import sys
 import traceback
@@ -56,9 +55,6 @@ if TYPE_CHECKING:
 
     _TracebackStyle = Literal["long", "short", "line", "no", "native", "value", "auto"]
 
-if sys.version_info[:2] < (3, 11):
-    from exceptiongroup import BaseExceptionGroup
-
 
 class Code:
     """Wrapper around Python code objects."""
@@ -347,10 +343,10 @@ class Traceback(List[TracebackEntry]):
 
     def cut(
         self,
-        path: Optional[Union["os.PathLike[str]", str]] = None,
+        path: Optional[Union[Path, str]] = None,
         lineno: Optional[int] = None,
         firstlineno: Optional[int] = None,
-        excludepath: Optional["os.PathLike[str]"] = None,
+        excludepath: Optional[Path] = None,
     ) -> "Traceback":
         """Return a Traceback instance wrapping part of this Traceback.
 
@@ -361,17 +357,15 @@ class Traceback(List[TracebackEntry]):
         for formatting reasons (removing some uninteresting bits that deal
         with handling of the exception/traceback).
         """
-        path_ = None if path is None else os.fspath(path)
-        excludepath_ = None if excludepath is None else os.fspath(excludepath)
         for x in self:
             code = x.frame.code
             codepath = code.path
-            if path is not None and str(codepath) != path_:
+            if path is not None and codepath != path:
                 continue
             if (
                 excludepath is not None
                 and isinstance(codepath, Path)
-                and excludepath_ in (str(p) for p in codepath.parents)  # type: ignore[operator]
+                and excludepath in codepath.parents
             ):
                 continue
             if lineno is not None and x.lineno != lineno:
@@ -675,11 +669,10 @@ class ExceptionInfo(Generic[E]):
         If it matches `True` is returned, otherwise an `AssertionError` is raised.
         """
         __tracebackhide__ = True
-        value = str(self.value)
-        msg = f"Regex pattern did not match.\n Regex: {regexp!r}\n Input: {value!r}"
-        if regexp == value:
-            msg += "\n Did you mean to `re.escape()` the regex?"
-        assert re.search(regexp, value), msg
+        msg = "Regex pattern {!r} does not match {!r}."
+        if regexp == str(self.value):
+            msg += " Did you mean to `re.escape()` the regex?"
+        assert re.search(regexp, str(self.value)), msg.format(regexp, str(self.value))
         # Return True to allow for "assert excinfo.match()".
         return True
 
@@ -902,7 +895,7 @@ class FormattedExcinfo:
                 max_frames=max_frames,
                 total=len(traceback),
             )
-            # Type ignored because adding two instances of a List subtype
+            # Type ignored because adding two instaces of a List subtype
             # currently incorrectly has type List instead of the subtype.
             traceback = traceback[:max_frames] + traceback[-max_frames:]  # type: ignore
         else:
@@ -927,21 +920,7 @@ class FormattedExcinfo:
         while e is not None and id(e) not in seen:
             seen.add(id(e))
             if excinfo_:
-                # Fall back to native traceback as a temporary workaround until
-                # full support for exception groups added to ExceptionInfo.
-                # See https://github.com/pytest-dev/pytest/issues/9159
-                if isinstance(e, BaseExceptionGroup):
-                    reprtraceback: Union[
-                        ReprTracebackNative, ReprTraceback
-                    ] = ReprTracebackNative(
-                        traceback.format_exception(
-                            type(excinfo_.value),
-                            excinfo_.value,
-                            excinfo_.traceback[0]._rawentry,
-                        )
-                    )
-                else:
-                    reprtraceback = self.repr_traceback(excinfo_)
+                reprtraceback = self.repr_traceback(excinfo_)
                 reprcrash: Optional[ReprFileLocation] = (
                     excinfo_._getreprcrash() if self.style != "value" else None
                 )

src/_pytest/_code/source.py

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

src/_pytest/_io/saferepr.py

@@ -41,7 +41,7 @@ class SafeRepr(reprlib.Repr):
     information on exceptions raised during the call.
     """
 
-    def __init__(self, maxsize: Optional[int], use_ascii: bool = False) -> None:
+    def __init__(self, maxsize: Optional[int]) -> None:
         """
         :param maxsize:
             If not None, will truncate the resulting repr to that specific size, using ellipsis
@@ -54,15 +54,10 @@ class SafeRepr(reprlib.Repr):
         # truncation.
         self.maxstring = maxsize if maxsize is not None else 1_000_000_000
         self.maxsize = maxsize
-        self.use_ascii = use_ascii
 
     def repr(self, x: object) -> str:
         try:
-            if self.use_ascii:
-                s = ascii(x)
-            else:
-                s = super().repr(x)
-
+            s = super().repr(x)
         except (KeyboardInterrupt, SystemExit):
             raise
         except BaseException as exc:
@@ -99,9 +94,7 @@ def safeformat(obj: object) -> str:
 DEFAULT_REPR_MAX_SIZE = 240
 
 
-def saferepr(
-    obj: object, maxsize: Optional[int] = DEFAULT_REPR_MAX_SIZE, use_ascii: bool = False
-) -> str:
+def saferepr(obj: object, maxsize: Optional[int] = DEFAULT_REPR_MAX_SIZE) -> str:
     """Return a size-limited safe repr-string for the given object.
 
     Failing __repr__ functions of user instances will be represented
@@ -111,27 +104,7 @@ def saferepr(
     This function is a wrapper around the Repr/reprlib functionality of the
     stdlib.
     """
-
-    return SafeRepr(maxsize, use_ascii).repr(obj)
-
-
-def saferepr_unlimited(obj: object, use_ascii: bool = True) -> str:
-    """Return an unlimited-size safe repr-string for the given object.
-
-    As with saferepr, failing __repr__ functions of user instances
-    will be represented with a short exception info.
-
-    This function is a wrapper around simple repr.
-
-    Note: a cleaner solution would be to alter ``saferepr``this way
-    when maxsize=None, but that might affect some other code.
-    """
-    try:
-        if use_ascii:
-            return ascii(obj)
-        return repr(obj)
-    except Exception as exc:
-        return _format_repr_exception(exc, obj)
+    return SafeRepr(maxsize).repr(obj)
 
 
 class AlwaysDispatchingPrettyPrinter(pprint.PrettyPrinter):

src/_pytest/_py/error.py

@@ -1,109 +0,0 @@
-"""create errno-specific classes for IO or os calls."""
-from __future__ import annotations
-
-import errno
-import os
-import sys
-from typing import Callable
-from typing import TYPE_CHECKING
-from typing import TypeVar
-
-if TYPE_CHECKING:
-    from typing_extensions import ParamSpec
-
-    P = ParamSpec("P")
-
-R = TypeVar("R")
-
-
-class Error(EnvironmentError):
-    def __repr__(self) -> str:
-        return "{}.{} {!r}: {} ".format(
-            self.__class__.__module__,
-            self.__class__.__name__,
-            self.__class__.__doc__,
-            " ".join(map(str, self.args)),
-            # repr(self.args)
-        )
-
-    def __str__(self) -> str:
-        s = "[{}]: {}".format(
-            self.__class__.__doc__,
-            " ".join(map(str, self.args)),
-        )
-        return s
-
-
-_winerrnomap = {
-    2: errno.ENOENT,
-    3: errno.ENOENT,
-    17: errno.EEXIST,
-    18: errno.EXDEV,
-    13: errno.EBUSY,  # empty cd drive, but ENOMEDIUM seems unavailiable
-    22: errno.ENOTDIR,
-    20: errno.ENOTDIR,
-    267: errno.ENOTDIR,
-    5: errno.EACCES,  # anything better?
-}
-
-
-class ErrorMaker:
-    """lazily provides Exception classes for each possible POSIX errno
-    (as defined per the 'errno' module).  All such instances
-    subclass EnvironmentError.
-    """
-
-    _errno2class: dict[int, type[Error]] = {}
-
-    def __getattr__(self, name: str) -> type[Error]:
-        if name[0] == "_":
-            raise AttributeError(name)
-        eno = getattr(errno, name)
-        cls = self._geterrnoclass(eno)
-        setattr(self, name, cls)
-        return cls
-
-    def _geterrnoclass(self, eno: int) -> type[Error]:
-        try:
-            return self._errno2class[eno]
-        except KeyError:
-            clsname = errno.errorcode.get(eno, "UnknownErrno%d" % (eno,))
-            errorcls = type(
-                clsname,
-                (Error,),
-                {"__module__": "py.error", "__doc__": os.strerror(eno)},
-            )
-            self._errno2class[eno] = errorcls
-            return errorcls
-
-    def checked_call(
-        self, func: Callable[P, R], *args: P.args, **kwargs: P.kwargs
-    ) -> R:
-        """Call a function and raise an errno-exception if applicable."""
-        __tracebackhide__ = True
-        try:
-            return func(*args, **kwargs)
-        except Error:
-            raise
-        except OSError as value:
-            if not hasattr(value, "errno"):
-                raise
-            errno = value.errno
-            if sys.platform == "win32":
-                try:
-                    cls = self._geterrnoclass(_winerrnomap[errno])
-                except KeyError:
-                    raise value
-            else:
-                # we are not on Windows, or we got a proper OSError
-                cls = self._geterrnoclass(errno)
-
-            raise cls(f"{func.__name__}{args!r}")
-
-
-_error_maker = ErrorMaker()
-checked_call = _error_maker.checked_call
-
-
-def __getattr__(attr: str) -> type[Error]:
-    return getattr(_error_maker, attr)  # type: ignore[no-any-return]

src/_pytest/assertion/__init__.py

@@ -39,7 +39,7 @@ def pytest_addoption(parser: Parser) -> None:
         "enable_assertion_pass_hook",
         type="bool",
         default=False,
-        help="Enables the pytest_assertion_pass hook. "
+        help="Enables the pytest_assertion_pass hook."
         "Make sure to delete any previously generated pyc cache files.",
     )
 
@@ -53,7 +53,7 @@ def register_assert_rewrite(*names: str) -> None:
     actually imported, usually in your __init__.py if you are a plugin
     using a package.
 
-    :param names: The module names to register.
+    :raises TypeError: If the given module names are not strings.
     """
     for name in names:
         if not isinstance(name, str):

src/_pytest/assertion/rewrite.py

@@ -100,6 +100,9 @@ class AssertionRewritingHook(importlib.abc.MetaPathFinder, importlib.abc.Loader)
             spec is None
             # this is a namespace package (without `__init__.py`)
             # there's nothing to rewrite there
+            # python3.6: `namespace`
+            # python3.7+: `None`
+            or spec.origin == "namespace"
             or spec.origin is None
             # we can only rewrite source files
             or not isinstance(spec.loader, importlib.machinery.SourceFileLoader)
@@ -180,7 +183,7 @@ class AssertionRewritingHook(importlib.abc.MetaPathFinder, importlib.abc.Loader)
             for initial_path in self.session._initialpaths:
                 # Make something as c:/projects/my_project/path.py ->
                 #     ['c:', 'projects', 'my_project', 'path.py']
-                parts = str(initial_path).split(os.sep)
+                parts = str(initial_path).split(os.path.sep)
                 # add 'path' to basenames to be checked.
                 self._basenames_to_check_rewrite.add(os.path.splitext(parts[-1])[0])
 
@@ -190,7 +193,7 @@ class AssertionRewritingHook(importlib.abc.MetaPathFinder, importlib.abc.Loader)
             return False
 
         # For matching the name it must be as if it was a filename.
-        path = PurePath(*parts).with_suffix(".py")
+        path = PurePath(os.path.sep.join(parts) + ".py")
 
         for pat in self.fnpats:
             # if the pattern contains subdirectories ("tests/**.py" for example) we can't bail out based
@@ -273,22 +276,13 @@ class AssertionRewritingHook(importlib.abc.MetaPathFinder, importlib.abc.Loader)
         with open(pathname, "rb") as f:
             return f.read()
 
-    if sys.version_info >= (3, 10):
+    if sys.version_info >= (3, 9):
 
-        if sys.version_info >= (3, 12):
-            from importlib.resources.abc import TraversableResources
-        else:
-            from importlib.abc import TraversableResources
+        def get_resource_reader(self, name: str) -> importlib.abc.TraversableResources:  # type: ignore
+            from types import SimpleNamespace
+            from importlib.readers import FileReader
 
-        def get_resource_reader(self, name: str) -> TraversableResources:  # type: ignore
-            if sys.version_info < (3, 11):
-                from importlib.readers import FileReader
-            else:
-                from importlib.resources.readers import FileReader
-
-            return FileReader(  # type:ignore[no-any-return]
-                types.SimpleNamespace(path=self._rewritten_names[name])
-            )
+            return FileReader(SimpleNamespace(path=self._rewritten_names[name]))
 
 
 def _write_pyc_fp(
@@ -299,8 +293,9 @@ def _write_pyc_fp(
     # import. However, there's little reason to deviate.
     fp.write(importlib.util.MAGIC_NUMBER)
     # https://www.python.org/dev/peps/pep-0552/
-    flags = b"\x00\x00\x00\x00"
-    fp.write(flags)
+    if sys.version_info >= (3, 7):
+        flags = b"\x00\x00\x00\x00"
+        fp.write(flags)
     # as of now, bytecode header expects 32-bit numbers for size and mtime (#4903)
     mtime = int(source_stat.st_mtime) & 0xFFFFFFFF
     size = source_stat.st_size & 0xFFFFFFFF
@@ -309,29 +304,54 @@ def _write_pyc_fp(
     fp.write(marshal.dumps(co))
 
 
-def _write_pyc(
-    state: "AssertionState",
-    co: types.CodeType,
-    source_stat: os.stat_result,
-    pyc: Path,
-) -> bool:
-    proc_pyc = f"{pyc}.{os.getpid()}"
-    try:
-        with open(proc_pyc, "wb") as fp:
-            _write_pyc_fp(fp, source_stat, co)
-    except OSError as e:
-        state.trace(f"error writing pyc file at {proc_pyc}: errno={e.errno}")
-        return False
+if sys.platform == "win32":
+    from atomicwrites import atomic_write
 
-    try:
-        os.replace(proc_pyc, pyc)
-    except OSError as e:
-        state.trace(f"error writing pyc file at {pyc}: {e}")
-        # we ignore any failure to write the cache file
-        # there are many reasons, permission-denied, pycache dir being a
-        # file etc.
-        return False
-    return True
+    def _write_pyc(
+        state: "AssertionState",
+        co: types.CodeType,
+        source_stat: os.stat_result,
+        pyc: Path,
+    ) -> bool:
+        try:
+            with atomic_write(os.fspath(pyc), mode="wb", overwrite=True) as fp:
+                _write_pyc_fp(fp, source_stat, co)
+        except OSError as e:
+            state.trace(f"error writing pyc file at {pyc}: {e}")
+            # we ignore any failure to write the cache file
+            # there are many reasons, permission-denied, pycache dir being a
+            # file etc.
+            return False
+        return True
+
+
+else:
+
+    def _write_pyc(
+        state: "AssertionState",
+        co: types.CodeType,
+        source_stat: os.stat_result,
+        pyc: Path,
+    ) -> bool:
+        proc_pyc = f"{pyc}.{os.getpid()}"
+        try:
+            fp = open(proc_pyc, "wb")
+        except OSError as e:
+            state.trace(f"error writing pyc file at {proc_pyc}: errno={e.errno}")
+            return False
+
+        try:
+            _write_pyc_fp(fp, source_stat, co)
+            os.rename(proc_pyc, pyc)
+        except OSError as e:
+            state.trace(f"error writing pyc file at {pyc}: {e}")
+            # we ignore any failure to write the cache file
+            # there are many reasons, permission-denied, pycache dir being a
+            # file etc.
+            return False
+        finally:
+            fp.close()
+        return True
 
 
 def _rewrite_test(fn: Path, config: Config) -> Tuple[os.stat_result, types.CodeType]:
@@ -357,29 +377,31 @@ def _read_pyc(
     except OSError:
         return None
     with fp:
+        # https://www.python.org/dev/peps/pep-0552/
+        has_flags = sys.version_info >= (3, 7)
         try:
             stat_result = os.stat(source)
             mtime = int(stat_result.st_mtime)
             size = stat_result.st_size
-            data = fp.read(16)
+            data = fp.read(16 if has_flags else 12)
         except OSError as e:
             trace(f"_read_pyc({source}): OSError {e}")
             return None
         # Check for invalid or out of date pyc file.
-        if len(data) != (16):
+        if len(data) != (16 if has_flags else 12):
             trace("_read_pyc(%s): invalid pyc (too short)" % source)
             return None
         if data[:4] != importlib.util.MAGIC_NUMBER:
             trace("_read_pyc(%s): invalid pyc (bad magic number)" % source)
             return None
-        if data[4:8] != b"\x00\x00\x00\x00":
+        if has_flags and data[4:8] != b"\x00\x00\x00\x00":
             trace("_read_pyc(%s): invalid pyc (unsupported flags)" % source)
             return None
-        mtime_data = data[8:12]
+        mtime_data = data[8 if has_flags else 4 : 12 if has_flags else 8]
         if int.from_bytes(mtime_data, "little") != mtime & 0xFFFFFFFF:
             trace("_read_pyc(%s): out of date" % source)
             return None
-        size_data = data[12:16]
+        size_data = data[12 if has_flags else 8 : 16 if has_flags else 12]
         if int.from_bytes(size_data, "little") != size & 0xFFFFFFFF:
             trace("_read_pyc(%s): invalid pyc (incorrect size)" % source)
             return None
@@ -492,7 +514,7 @@ def _call_assertion_pass(lineno: int, orig: str, expl: str) -> None:
 
 def _check_if_assertion_pass_impl() -> bool:
     """Check if any plugins implement the pytest_assertion_pass hook
-    in order not to generate explanation unnecessarily (might be expensive)."""
+    in order not to generate explanation unecessarily (might be expensive)."""
     return True if util._assertion_pass else False
 
 

src/_pytest/assertion/truncate.py

@@ -38,9 +38,9 @@ def _truncate_explanation(
     """Truncate given list of strings that makes up the assertion explanation.
 
     Truncates to either 8 lines, or 640 characters - whichever the input reaches
-    first, taking the truncation explanation into account. The remaining lines
-    will be replaced by a usage message.
+    first. The remaining lines will be replaced by a usage message.
     """
+
     if max_lines is None:
         max_lines = DEFAULT_MAX_LINES
     if max_chars is None:
@@ -48,56 +48,35 @@ def _truncate_explanation(
 
     # Check if truncation required
     input_char_count = len("".join(input_lines))
-    # The length of the truncation explanation depends on the number of lines
-    # removed but is at least 68 characters:
-    # The real value is
-    # 64 (for the base message:
-    # '...\n...Full output truncated (1 line hidden), use '-vv' to show")'
-    # )
-    # + 1 (for plural)
-    # + int(math.log10(len(input_lines) - max_lines)) (number of hidden line, at least 1)
-    # + 3 for the '...' added to the truncated line
-    # But if there's more than 100 lines it's very likely that we're going to
-    # truncate, so we don't need the exact value using log10.
-    tolerable_max_chars = (
-        max_chars + 70  # 64 + 1 (for plural) + 2 (for '99') + 3 for '...'
-    )
-    # The truncation explanation add two lines to the output
-    tolerable_max_lines = max_lines + 2
-    if (
-        len(input_lines) <= tolerable_max_lines
-        and input_char_count <= tolerable_max_chars
-    ):
+    if len(input_lines) <= max_lines and input_char_count <= max_chars:
         return input_lines
-    # Truncate first to max_lines, and then truncate to max_chars if necessary
-    truncated_explanation = input_lines[:max_lines]
-    truncated_char = True
-    # We reevaluate the need to truncate chars following removal of some lines
-    if len("".join(truncated_explanation)) > tolerable_max_chars:
-        truncated_explanation = _truncate_by_char_count(
-            truncated_explanation, max_chars
-        )
-    else:
-        truncated_char = False
 
+    # Truncate first to max_lines, and then truncate to max_chars if max_chars
+    # is exceeded.
+    truncated_explanation = input_lines[:max_lines]
+    truncated_explanation = _truncate_by_char_count(truncated_explanation, max_chars)
+
+    # Add ellipsis to final line
+    truncated_explanation[-1] = truncated_explanation[-1] + "..."
+
+    # Append useful message to explanation
     truncated_line_count = len(input_lines) - len(truncated_explanation)
-    if truncated_explanation[-1]:
-        # Add ellipsis and take into account part-truncated final line
-        truncated_explanation[-1] = truncated_explanation[-1] + "..."
-        if truncated_char:
-            # It's possible that we did not remove any char from this line
-            truncated_line_count += 1
+    truncated_line_count += 1  # Account for the part-truncated final line
+    msg = "...Full output truncated"
+    if truncated_line_count == 1:
+        msg += f" ({truncated_line_count} line hidden)"
     else:
-        # Add proper ellipsis when we were able to fit a full line exactly
-        truncated_explanation[-1] = "..."
-    return truncated_explanation + [
-        "",
-        f"...Full output truncated ({truncated_line_count} line"
-        f"{'' if truncated_line_count == 1 else 's'} hidden), {USAGE_MSG}",
-    ]
+        msg += f" ({truncated_line_count} lines hidden)"
+    msg += f", {USAGE_MSG}"
+    truncated_explanation.extend(["", str(msg)])
+    return truncated_explanation
 
 
 def _truncate_by_char_count(input_lines: List[str], max_chars: int) -> List[str]:
+    # Check if truncation required
+    if len("".join(input_lines)) <= max_chars:
+        return input_lines
+
     # Find point at which input length exceeds total allowed length
     iterated_char_count = 0
     for iterated_index, input_line in enumerate(input_lines):

src/_pytest/assertion/util.py

@@ -10,13 +10,12 @@ from typing import List
 from typing import Mapping
 from typing import Optional
 from typing import Sequence
-from unicodedata import normalize
 
 import _pytest._code
 from _pytest import outcomes
 from _pytest._io.saferepr import _pformat_dispatch
+from _pytest._io.saferepr import safeformat
 from _pytest._io.saferepr import saferepr
-from _pytest._io.saferepr import saferepr_unlimited
 from _pytest.config import Config
 
 # The _reprcompare attribute on the util module is used by the new assertion
@@ -136,53 +135,20 @@ def isiterable(obj: Any) -> bool:
         return False
 
 
-def has_default_eq(
-    obj: object,
-) -> bool:
-    """Check if an instance of an object contains the default eq
-
-    First, we check if the object's __eq__ attribute has __code__,
-    if so, we check the equally of the method code filename (__code__.co_filename)
-    to the default one generated by the dataclass and attr module
-    for dataclasses the default co_filename is <string>, for attrs class, the __eq__ should contain "attrs eq generated"
-    """
-    # inspired from https://github.com/willmcgugan/rich/blob/07d51ffc1aee6f16bd2e5a25b4e82850fb9ed778/rich/pretty.py#L68
-    if hasattr(obj.__eq__, "__code__") and hasattr(obj.__eq__.__code__, "co_filename"):
-        code_filename = obj.__eq__.__code__.co_filename
-
-        if isattrs(obj):
-            return "attrs generated eq" in code_filename
-
-        return code_filename == "<string>"  # data class
-    return True
-
-
-def assertrepr_compare(
-    config, op: str, left: Any, right: Any, use_ascii: bool = False
-) -> Optional[List[str]]:
+def assertrepr_compare(config, op: str, left: Any, right: Any) -> Optional[List[str]]:
     """Return specialised explanations for some operators/operands."""
     verbose = config.getoption("verbose")
-
-    # Strings which normalize equal are often hard to distinguish when printed; use ascii() to make this easier.
-    # See issue #3246.
-    use_ascii = (
-        isinstance(left, str)
-        and isinstance(right, str)
-        and normalize("NFD", left) == normalize("NFD", right)
-    )
-
     if verbose > 1:
-        left_repr = saferepr_unlimited(left, use_ascii=use_ascii)
-        right_repr = saferepr_unlimited(right, use_ascii=use_ascii)
+        left_repr = safeformat(left)
+        right_repr = safeformat(right)
     else:
         # XXX: "15 chars indentation" is wrong
         #      ("E       AssertionError: assert "); should use term width.
         maxsize = (
             80 - 15 - len(op) - 2
         ) // 2  # 15 chars indentation, 1 space around op
-
-        left_repr = saferepr(left, maxsize=maxsize, use_ascii=use_ascii)
-        right_repr = saferepr(right, maxsize=maxsize, use_ascii=use_ascii)
+        left_repr = saferepr(left, maxsize=maxsize)
+        right_repr = saferepr(right, maxsize=maxsize)
 
     summary = f"{left_repr} {op} {right_repr}"
 
@@ -236,6 +202,8 @@ def _compare_eq_any(left: Any, right: Any, verbose: int = 0) -> List[str]:
             explanation = _compare_eq_set(left, right, verbose)
         elif isdict(left) and isdict(right):
             explanation = _compare_eq_dict(left, right, verbose)
+        elif verbose > 0:
+            explanation = _compare_eq_verbose(left, right)
 
         if isiterable(left) and isiterable(right):
             expl = _compare_eq_iterable(left, right, verbose)
@@ -292,6 +260,18 @@ def _diff_text(left: str, right: str, verbose: int = 0) -> List[str]:
     return explanation
 
 
+def _compare_eq_verbose(left: Any, right: Any) -> List[str]:
+    keepends = True
+    left_lines = repr(left).splitlines(keepends)
+    right_lines = repr(right).splitlines(keepends)
+
+    explanation: List[str] = []
+    explanation += ["+" + line for line in left_lines]
+    explanation += ["-" + line for line in right_lines]
+
+    return explanation
+
+
 def _surrounding_parens_on_own_lines(lines: List[str]) -> None:
     """Move opening/closing parenthesis/bracket to own lines."""
     opening = lines[0][:1]
@@ -307,8 +287,8 @@ def _surrounding_parens_on_own_lines(lines: List[str]) -> None:
 def _compare_eq_iterable(
     left: Iterable[Any], right: Iterable[Any], verbose: int = 0
 ) -> List[str]:
-    if verbose <= 0 and not running_on_ci():
-        return ["Use -v to get more diff"]
+    if not verbose and not running_on_ci():
+        return ["Use -v to get the full diff"]
     # dynamic import to speedup pytest
     import difflib
 
@@ -447,13 +427,9 @@ def _compare_eq_dict(
 
 
 def _compare_eq_cls(left: Any, right: Any, verbose: int) -> List[str]:
-    if not has_default_eq(left):
-        return []
     if isdatacls(left):
-        import dataclasses
-
-        all_fields = dataclasses.fields(left)
-        fields_to_check = [info.name for info in all_fields if info.compare]
+        all_fields = left.__dataclass_fields__
+        fields_to_check = [field for field, info in all_fields.items() if info.compare]
     elif isattrs(left):
         all_fields = left.__attrs_attrs__
         fields_to_check = [field.name for field in all_fields if getattr(field, "eq")]

src/_pytest/cacheprovider.py

@@ -157,7 +157,7 @@ class Cache:
         """
         path = self._getvaluepath(key)
         try:
-            with path.open("r", encoding="UTF-8") as f:
+            with path.open("r") as f:
                 return json.load(f)
         except (ValueError, OSError):
             return default
@@ -184,9 +184,9 @@ class Cache:
             return
         if not cache_dir_exists_already:
             self._ensure_supporting_files()
-        data = json.dumps(value, ensure_ascii=False, indent=2)
+        data = json.dumps(value, indent=2)
         try:
-            f = path.open("w", encoding="UTF-8")
+            f = path.open("w")
         except OSError:
             self.warn("cache could not write path {path}", path=path, _ispytest=True)
         else:
@@ -196,7 +196,7 @@ class Cache:
     def _ensure_supporting_files(self) -> None:
         """Create supporting files in the cache dir that are not really part of the cache."""
         readme_path = self._cachedir / "README.md"
-        readme_path.write_text(README_CONTENT, encoding="UTF-8")
+        readme_path.write_text(README_CONTENT)
 
         gitignore_path = self._cachedir.joinpath(".gitignore")
         msg = "# Created by pytest automatically.\n*\n"
@@ -440,7 +440,7 @@ def pytest_addoption(parser: Parser) -> None:
         "--last-failed",
         action="store_true",
         dest="lf",
-        help="Rerun only the tests that failed "
+        help="rerun only the tests that failed "
         "at the last run (or all if none failed)",
     )
     group.addoption(
@@ -448,7 +448,7 @@ def pytest_addoption(parser: Parser) -> None:
         "--failed-first",
         action="store_true",
         dest="failedfirst",
-        help="Run all tests, but run the last failures first. "
+        help="run all tests, but run the last failures first.\n"
         "This may re-order tests and thus lead to "
         "repeated fixture setup/teardown.",
     )
@@ -457,7 +457,7 @@ def pytest_addoption(parser: Parser) -> None:
         "--new-first",
         action="store_true",
         dest="newfirst",
-        help="Run tests from new files first, then the rest of the tests "
+        help="run tests from new files first, then the rest of the tests "
         "sorted by file mtime",
     )
     group.addoption(
@@ -466,7 +466,7 @@ def pytest_addoption(parser: Parser) -> None:
         nargs="?",
         dest="cacheshow",
         help=(
-            "Show cache contents, don't perform collection or tests. "
+            "show cache contents, don't perform collection or tests. "
             "Optional argument: glob (default: '*')."
         ),
     )
@@ -474,12 +474,12 @@ def pytest_addoption(parser: Parser) -> None:
         "--cache-clear",
         action="store_true",
         dest="cacheclear",
-        help="Remove all cache contents at start of test run",
+        help="remove all cache contents at start of test run.",
     )
     cache_dir_default = ".pytest_cache"
     if "TOX_ENV_DIR" in os.environ:
         cache_dir_default = os.path.join(os.environ["TOX_ENV_DIR"], cache_dir_default)
-    parser.addini("cache_dir", default=cache_dir_default, help="Cache directory path")
+    parser.addini("cache_dir", default=cache_dir_default, help="cache directory path.")
     group.addoption(
         "--lfnf",
         "--last-failed-no-failures",
@@ -487,7 +487,7 @@ def pytest_addoption(parser: Parser) -> None:
         dest="last_failed_no_failures",
         choices=("all", "none"),
         default="all",
-        help="Which tests to run with no previously (known) failures",
+        help="which tests to run with no previously (known) failures.",
     )
 
 

src/_pytest/capture.py

@@ -42,14 +42,14 @@ def pytest_addoption(parser: Parser) -> None:
         default="fd",
         metavar="method",
         choices=["fd", "sys", "no", "tee-sys"],
-        help="Per-test capturing method: one of fd|sys|no|tee-sys",
+        help="per-test capturing method: one of fd|sys|no|tee-sys.",
     )
     group._addoption(
         "-s",
         action="store_const",
         const="no",
         dest="capture",
-        help="Shortcut for --capture=no",
+        help="shortcut for --capture=no.",
     )
 
 
@@ -68,8 +68,8 @@ def _colorama_workaround() -> None:
             pass
 
 
-def _windowsconsoleio_workaround(stream: TextIO) -> None:
-    """Workaround for Windows Unicode console handling.
+def _py36_windowsconsoleio_workaround(stream: TextIO) -> None:
+    """Workaround for Windows Unicode console handling on Python>=3.6.
 
     Python 3.6 implemented Unicode console handling for Windows. This works
     by reading/writing to the raw console handle using
@@ -112,7 +112,7 @@ def _windowsconsoleio_workaround(stream: TextIO) -> None:
             buffering = -1
 
         return io.TextIOWrapper(
-            open(os.dup(f.fileno()), mode, buffering),
+            open(os.dup(f.fileno()), mode, buffering),  # type: ignore[arg-type]
             f.encoding,
             f.errors,
             f.newlines,
@@ -128,7 +128,7 @@ def _windowsconsoleio_workaround(stream: TextIO) -> None:
 def pytest_load_initial_conftests(early_config: Config):
     ns = early_config.known_args_namespace
     if ns.capture == "fd":
-        _windowsconsoleio_workaround(sys.stdout)
+        _py36_windowsconsoleio_workaround(sys.stdout)
     _colorama_workaround()
     pluginmanager = early_config.pluginmanager
     capman = CaptureManager(ns.capture)
@@ -203,39 +203,12 @@ class DontReadFromInput:
     def fileno(self) -> int:
         raise UnsupportedOperation("redirected stdin is pseudofile, has no fileno()")
 
-    def flush(self) -> None:
-        raise UnsupportedOperation("redirected stdin is pseudofile, has no flush()")
-
     def isatty(self) -> bool:
         return False
 
     def close(self) -> None:
         pass
 
-    def readable(self) -> bool:
-        return False
-
-    def seek(self, offset: int) -> int:
-        raise UnsupportedOperation("redirected stdin is pseudofile, has no seek(int)")
-
-    def seekable(self) -> bool:
-        return False
-
-    def tell(self) -> int:
-        raise UnsupportedOperation("redirected stdin is pseudofile, has no tell()")
-
-    def truncate(self, size: int) -> None:
-        raise UnsupportedOperation("cannont truncate stdin")
-
-    def write(self, *args) -> None:
-        raise UnsupportedOperation("cannot write to stdin")
-
-    def writelines(self, *args) -> None:
-        raise UnsupportedOperation("Cannot write to stdin")
-
-    def writable(self) -> bool:
-        return False
-
     @property
     def buffer(self):
         return self
@@ -381,7 +354,7 @@ class FDCaptureBinary:
         self.targetfd_save = os.dup(targetfd)
 
         if targetfd == 0:
-            self.tmpfile = open(os.devnull, encoding="utf-8")
+            self.tmpfile = open(os.devnull)
             self.syscapture = SysCapture(targetfd)
         else:
             self.tmpfile = EncodedFile(
@@ -903,22 +876,11 @@ class CaptureFixture(Generic[AnyStr]):
 
 @fixture
 def capsys(request: SubRequest) -> Generator[CaptureFixture[str], None, None]:
-    r"""Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.
+    """Enable text capturing of writes to ``sys.stdout`` and ``sys.stderr``.
 
     The captured output is made available via ``capsys.readouterr()`` method
     calls, which return a ``(out, err)`` namedtuple.
     ``out`` and ``err`` will be ``text`` objects.
-
-    Returns an instance of :class:`CaptureFixture[str] <pytest.CaptureFixture>`.
-
-    Example:
-
-    .. code-block:: python
-
-        def test_output(capsys):
-            print("hello")
-            captured = capsys.readouterr()
-            assert captured.out == "hello\n"
     """
     capman = request.config.pluginmanager.getplugin("capturemanager")
     capture_fixture = CaptureFixture[str](SysCapture, request, _ispytest=True)
@@ -931,22 +893,11 @@ def capsys(request: SubRequest) -> Generator[CaptureFixture[str], None, None]:
 
 @fixture
 def capsysbinary(request: SubRequest) -> Generator[CaptureFixture[bytes], None, None]:
-    r"""Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.
+    """Enable bytes capturing of writes to ``sys.stdout`` and ``sys.stderr``.
 
     The captured output is made available via ``capsysbinary.readouterr()``
     method calls, which return a ``(out, err)`` namedtuple.
     ``out`` and ``err`` will be ``bytes`` objects.
-
-    Returns an instance of :class:`CaptureFixture[bytes] <pytest.CaptureFixture>`.
-
-    Example:
-
-    .. code-block:: python
-
-        def test_output(capsysbinary):
-            print("hello")
-            captured = capsysbinary.readouterr()
-            assert captured.out == b"hello\n"
     """
     capman = request.config.pluginmanager.getplugin("capturemanager")
     capture_fixture = CaptureFixture[bytes](SysCaptureBinary, request, _ispytest=True)
@@ -959,22 +910,11 @@ def capsysbinary(request: SubRequest) -> Generator[CaptureFixture[bytes], None,
 
 @fixture
 def capfd(request: SubRequest) -> Generator[CaptureFixture[str], None, None]:
-    r"""Enable text capturing of writes to file descriptors ``1`` and ``2``.
+    """Enable text capturing of writes to file descriptors ``1`` and ``2``.
 
     The captured output is made available via ``capfd.readouterr()`` method
     calls, which return a ``(out, err)`` namedtuple.
     ``out`` and ``err`` will be ``text`` objects.
-
-    Returns an instance of :class:`CaptureFixture[str] <pytest.CaptureFixture>`.
-
-    Example:
-
-    .. code-block:: python
-
-        def test_system_echo(capfd):
-            os.system('echo "hello"')
-            captured = capfd.readouterr()
-            assert captured.out == "hello\n"
     """
     capman = request.config.pluginmanager.getplugin("capturemanager")
     capture_fixture = CaptureFixture[str](FDCapture, request, _ispytest=True)
@@ -987,23 +927,11 @@ def capfd(request: SubRequest) -> Generator[CaptureFixture[str], None, None]:
 
 @fixture
 def capfdbinary(request: SubRequest) -> Generator[CaptureFixture[bytes], None, None]:
-    r"""Enable bytes capturing of writes to file descriptors ``1`` and ``2``.
+    """Enable bytes capturing of writes to file descriptors ``1`` and ``2``.
 
     The captured output is made available via ``capfd.readouterr()`` method
     calls, which return a ``(out, err)`` namedtuple.
     ``out`` and ``err`` will be ``byte`` objects.
-
-    Returns an instance of :class:`CaptureFixture[bytes] <pytest.CaptureFixture>`.
-
-    Example:
-
-    .. code-block:: python
-
-        def test_system_echo(capfdbinary):
-            os.system('echo "hello"')
-            captured = capfdbinary.readouterr()
-            assert captured.out == b"hello\n"
-
     """
     capman = request.config.pluginmanager.getplugin("capturemanager")
     capture_fixture = CaptureFixture[bytes](FDCaptureBinary, request, _ispytest=True)