Prepare release version 7.2.2

[7.2.x] Normalize how changelog entries are written (#10790 )
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
2023-03-03 17:05:52 +00:00 · 2023-03-03 16:26:35 +00:00 · 2023-03-03 15:52:49 +00:00 · 2023-02-28 16:08:54 +00:00 · 2023-02-28 16:03:47 +00:00 · 2023-02-18 18:57:56 -03:00
273 changed files with 12541 additions and 4827 deletions
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -0,0 +1,51 @@
+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@v2
+      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 }}
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,60 @@
+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@v2
+      with:
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: Build and Check Package
+      uses: hynek/build-and-inspect-python-package@v1.5
+
+    - name: Download Package
+      uses: actions/download-artifact@v3
+      with:
+        name: Packages
+        path: dist
+
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        password: ${{ secrets.pypi_token }}
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.7"
+
+    - name: Install tox
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade tox
+
+    - name: Publish GitHub release notes
+      env:
+        GH_RELEASE_NOTES_TOKEN: ${{ github.token }}
+      run: |
+        sudo apt-get install pandoc
+        tox -e publish-gh-release-notes
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,10 +1,11 @@
-name: main
+name: test

 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]+"
@@ -17,13 +18,18 @@ on:
 env:
  PYTEST_ADDOPTS: "--color=yes"

+# Cancel running jobs for the same workflow and branch.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # Set permissions at the job level.
 permissions: {}

 jobs:
  build:
    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
+    timeout-minutes: 45
    permissions:
      contents: read

@@ -31,24 +37,26 @@ 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",
@@ -56,10 +64,6 @@ jobs:
        ]

        include:
-          - name: "windows-py36"
-            python: "3.6"
-            os: windows-latest
-            tox_env: "py36-xdist"
          - name: "windows-py37"
            python: "3.7"
            os: windows-latest
@@ -67,7 +71,7 @@ jobs:
          - name: "windows-py37-pluggy"
            python: "3.7"
            os: windows-latest
-            tox_env: "py37-pluggymain-xdist"
+            tox_env: "py37-pluggymain-pylib-xdist"
          - name: "windows-py38"
            python: "3.8"
            os: windows-latest
@@ -78,14 +82,14 @@ jobs:
            os: windows-latest
            tox_env: "py39-xdist"
          - name: "windows-py310"
-            python: "3.10-dev"
+            python: "3.10"
            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
@@ -94,7 +98,7 @@ jobs:
          - name: "ubuntu-py37-pluggy"
            python: "3.7"
            os: ubuntu-latest
-            tox_env: "py37-pluggymain-xdist"
+            tox_env: "py37-pluggymain-pylib-xdist"
          - name: "ubuntu-py37-freeze"
            python: "3.7"
            os: ubuntu-latest
@@ -108,9 +112,14 @@ jobs:
            os: ubuntu-latest
            tox_env: "py39-xdist"
          - name: "ubuntu-py310"
-            python: "3.10-dev"
+            python: "3.10"
            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
@@ -125,9 +134,17 @@ 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.7"
+            python: "3.9"
            os: ubuntu-latest
            tox_env: "plugins"

@@ -142,13 +159,13 @@ jobs:
            use_coverage: true

    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
      with:
        fetch-depth: 0
        persist-credentials: false

    - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
      with:
        python-version: ${{ matrix.python }}

@@ -171,51 +188,16 @@ jobs:

    - name: Upload coverage to Codecov
      if: "matrix.use_coverage"
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
+      continue-on-error: true
      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'
-
+  check-package:
    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
+    - uses: actions/checkout@v3
+    - name: Build and Check Package
+      uses: hynek/build-and-inspect-python-package@v1.5
--- a/.github/workflows/update-plugin-list.yml
+++ b/.github/workflows/update-plugin-list.yml
@@ -12,6 +12,7 @@ permissions: {}

 jobs:
  createPullRequest:
+    if: github.repository_owner == 'pytest-dev'
    runs-on: ubuntu-latest
    permissions:
      contents: write
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ coverage.xml
 .project
 .settings
 .vscode
+__pycache__/

 # generated by pip
 pip-wheel-metadata/
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,16 +1,18 @@
+default_language_version:
+    python: "3.10"
 repos:
 -   repo: https://github.com/psf/black
-    rev: 21.11b1
+    rev: 22.12.0
    hooks:
    -   id: black
        args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.0
+    rev: v1.12.1
    hooks:
    -   id: blacken-docs
        additional_dependencies: [black==20.8b1]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
    hooks:
    -   id: trailing-whitespace
    -   id: end-of-file-fixer
@@ -20,47 +22,56 @@ repos:
    -   id: debug-statements
        exclude: _pytest/(debugging|hookspec).py
        language_version: python3
+-   repo: https://github.com/PyCQA/autoflake
+    rev: v1.7.6
+    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: 4.0.1
+    rev: 5.0.4
    hooks:
    -   id: flake8
        language_version: python3
        additional_dependencies:
-          - flake8-typing-imports==1.9.0
+          - flake8-typing-imports==1.12.0
          - flake8-docstrings==1.5.0
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.6.0
+    rev: v3.8.5
    hooks:
    -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py36-plus]
+        args: ['--application-directories=.:src', --py37-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.1
+    rev: v3.3.1
    hooks:
    -   id: pyupgrade
-        args: [--py36-plus]
+        args: [--py37-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.0
+    rev: v2.1.0
    hooks:
    -   id: setup-cfg-fmt
-        args: [--max-py-version=3.10]
+        args: ["--max-py-version=3.11", "--include-version-classifiers"]
 -   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.910-1
+    rev: v0.982
    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
@@ -93,7 +104,7 @@ repos:
        types: [python]
    -   id: py-path-deprecated
        name: py.path usage is deprecated
-        exclude: docs|src/_pytest/deprecated.py|testing/deprecated_test.py
+        exclude: docs|src/_pytest/deprecated.py|testing/deprecated_test.py|src/_pytest/legacypath.py
        language: pygrep
        entry: \bpy\.path\.local
        types: [python]
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -2,9 +2,12 @@ version: 2

 python:
   install:
-      - requirements: doc/en/requirements.txt
-      - method: pip
-        path: .
+     # 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

 build:
  os: ubuntu-20.04
--- a/33
+++ b/33
@@ -15,6 +15,7 @@ Alan Velasco
 Alexander Johnson
 Alexander King
 Alexei Kozlenok
+Alice Purcell
 Allan Feldman
 Aly Sivji
 Amir Elkess
@@ -44,6 +45,7 @@ Aron Coyle
 Aron Curzon
 Aviral Verma
 Aviv Palivoda
+Babak Keyvani
 Barney Gale
 Ben Gartner
 Ben Webb
@@ -62,9 +64,11 @@ 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
@@ -83,6 +87,8 @@ Damian Skrzypczak
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
+Daniel Sánchez Castelló
+Daniel Valenzuela Zenteno
 Daniel Wandschneider
 Daniele Procida
 Danielle Jenkins
@@ -124,6 +130,7 @@ Feng Ma
 Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
+Gabriel Landau
 Gabriel Reis
 Garvit Shubham
 Gene Wood
@@ -149,6 +156,7 @@ Ian Bicking
 Ian Lesperance
 Ilya Konstantinov
 Ionuț Turturică
+Itxaso Aizpurua
 Iwan Briquemont
 Jaap Broekhuizen
 Jakob van Santen
@@ -163,7 +171,9 @@ Jeff Rackauckas
 Jeff Widman
 Jenni Rinker
 John Eddie Ayson
+John Litborn
 John Towler
+Jon Parise
 Jon Sonesen
 Jonas Obrist
 Jordan Guymon
@@ -183,9 +193,14 @@ 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
@@ -243,6 +258,7 @@ Nicholas Murphy
 Niclas Olofsson
 Nicolas Delaby
 Nikolay Kondratyev
+Nipunn Koorapati
 Olga Matoula
 Oleg Pidsadnyi
 Oleg Sushchenko
@@ -253,6 +269,8 @@ Ondřej Súkup
 Oscar Benjamin
 Parth Patel
 Patrick Hayes
+Paul Müller
+Paul Reece
 Pauli Virtanen
 Pavel Karateev
 Paweł Adamczak
@@ -268,6 +286,7 @@ Prashant Sharma
 Pulkit Goyal
 Punyashloka Biswal
 Quentin Pradet
+q0w
 Ralf Schmitt
 Ram Rachum
 Ralph Giles
@@ -287,17 +306,20 @@ Ruaridh Williamson
 Russel Winder
 Ryan Wooden
 Saiprasad Kale
+Samuel Colvin
 Samuel Dion-Girardeau
 Samuel Searles-Bryant
 Samuele Pedroni
 Sanket Duthade
 Sankt Petersbug
+Saravanan Padmanaban
 Segev Finer
 Serhii Mozghovyi
 Seth Junot
 Shantanu Jain
 Shubham Adep
 Simon Gomizelj
+Simon Holesch
 Simon Kerr
 Skylar Downes
 Srinivas Reddy Thatiparthy
@@ -315,26 +337,32 @@ Taneli Hukkinen
 Tanvi Mehta
 Tarcisio Fischer
 Tareq Alayan
+Tatiana Ovary
 Ted Xiao
 Terje Runde
 Thomas Grainger
 Thomas Hisch
 Tim Hoffmann
 Tim Strazny
+TJ Bruno
+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
@@ -348,7 +376,12 @@ Xixi Zhao
 Xuan Luong
 Xuecong Liao
 Yoav Caspi
+Yuliang Shao
+Yusuke Kadowaki
+Yuval Shimon
 Zac Hatfield-Dodds
 Zachary Kneupper
+Zachary OBrien
+Zhouxin Qiu
 Zoltán Máté
 Zsolt Cserna
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -50,6 +50,8 @@ 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.
@@ -221,7 +223,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://help.github.com/articles/using-pull-requests/>`_.
+`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>`_.

 Here is a simple overview, with pytest-specific bits:

@@ -242,6 +244,11 @@ 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

@@ -378,7 +385,7 @@ them.
 Backporting bug fixes for the next patch release
 ------------------------------------------------

-Pytest makes feature release every few weeks or months. In between, patch releases
+Pytest makes a 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.
@@ -387,10 +394,17 @@ 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 the ``main`` branch, with a regular pull
+#. First, make sure the bug is fixed in 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:
--- a/README.rst
+++ b/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/main/badge.svg
-    :target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Amain
+.. image:: https://github.com/pytest-dev/pytest/workflows/test/badge.svg
+    :target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Atest

 .. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
   :target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/main
@@ -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.6+ and PyPy3
+- Python 3.7+ or PyPy3

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

--- a/RELEASING.rst
+++ b/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 --all
+     git fetch upstream
     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 --all
+        git fetch upstream
        git branch 8.0.x upstream/main
        git push upstream 8.0.x

@@ -136,29 +136,31 @@ 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 --all
+     git fetch upstream
     git tag MAJOR.MINOR.PATCH upstream/release-MAJOR.MINOR.PATCH
-     git push git@github.com:pytest-dev/pytest.git MAJOR.MINOR.PATCH
+     git push upstream MAJOR.MINOR.PATCH

   Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.

-#. Merge the PR.
+#. Merge the PR. **Make sure it's not squash-merged**, so that the tagged commit ends up in the main branch.

 #. Cherry-pick the CHANGELOG / announce files to the ``main`` branch::

-       git fetch --all --prune
+       git fetch upstream
       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, tag the release cherry-pick merge commit in main with
+#. For major and minor releases (or the first prerelease of it), 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 git@github.com:pytest-dev/pytest.git 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.

 #. Send an email announcement with the contents from::

--- a/changelog/4320.doc.rst
+++ b/changelog/4320.doc.rst
@@ -1 +0,0 @@
-Improved docs for `pytester.copy_example`.
--- a/changelog/5105.doc.rst
+++ b/changelog/5105.doc.rst
@@ -1 +0,0 @@
-Add automatically generated :ref:`plugin-list`. The list is updated on a periodic schedule.
--- a/changelog/5196.feature.rst
+++ b/changelog/5196.feature.rst
@@ -1,3 +0,0 @@
-Tests are now ordered by definition order in more cases.
-
-In a class hierarchy, tests from base classes are now consistently ordered before tests defined on their subclasses (reverse MRO order).
--- a/changelog/7124.bugfix.rst
+++ b/changelog/7124.bugfix.rst
@@ -1 +0,0 @@
-Fixed an issue where ``__main__.py`` would raise an ``ImportError`` when ``--doctest-modules`` was provided.
--- a/changelog/7132.feature.rst
+++ b/changelog/7132.feature.rst
@@ -1 +0,0 @@
-Added two environment variables :envvar:`PYTEST_THEME` and :envvar:`PYTEST_THEME_MODE` to let the users customize the pygments theme used.
--- a/changelog/7259.breaking.rst
+++ b/changelog/7259.breaking.rst
@@ -1,9 +0,0 @@
-The :ref:`Node.reportinfo() <non-python tests>` function first return value type has been expanded from `py.path.local | str` to `os.PathLike[str] | str`.
-
-Most plugins which refer to `reportinfo()` only define it as part of a custom :class:`pytest.Item` implementation.
-Since `py.path.local` is a `os.PathLike[str]`, these plugins are unaffacted.
-
-Plugins and users which call `reportinfo()`, use the first return value and interact with it as a `py.path.local`, would need to adjust by calling `py.path.local(fspath)`.
-Although preferably, avoid the legacy `py.path.local` and use `pathlib.Path`, or use `item.location` or `item.path`, instead.
-
-Note: pytest was not able to provide a deprecation period for this change.
--- a/changelog/7259.deprecation.rst
+++ b/changelog/7259.deprecation.rst
@@ -1,12 +0,0 @@
-``py.path.local`` arguments for hooks have been deprecated. See :ref:`the deprecation note <legacy-path-hooks-deprecated>` for full details.
-
-``py.path.local`` arguments to Node constructors have been deprecated. See :ref:`the deprecation note <node-ctor-fspath-deprecation>` for full details.
-
-.. note::
-    The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
-    new attribute being ``path``) is **the opposite** of the situation for hooks
-    (the old argument being ``path``).
-
-    This is an unfortunate artifact due to historical reasons, which should be
-    resolved in future versions as we slowly get rid of the :pypi:`py`
-    dependency (see :issue:`9283` for a longer discussion).
--- a/changelog/7259.feature.rst
+++ b/changelog/7259.feature.rst
@@ -1,7 +0,0 @@
-Added :meth:`cache.mkdir() <pytest.Cache.mkdir>`, which is similar to the existing :meth:`cache.makedir() <pytest.Cache.makedir>`,
-but returns a :class:`pathlib.Path` instead of a legacy ``py.path.local``.
-
-Added a ``paths`` type to :meth:`parser.addini() <pytest.Parser.addini>`,
-as in ``parser.addini("mypaths", "my paths", type="paths")``,
-which is similar to the existing ``pathlist``,
-but returns a list of :class:`pathlib.Path` instead of legacy ``py.path.local``.
--- a/changelog/7469.deprecation.rst
+++ b/changelog/7469.deprecation.rst
@@ -1,13 +0,0 @@
-Directly constructing the following classes is now deprecated:
-
- ``_pytest.mark.structures.Mark``
- ``_pytest.mark.structures.MarkDecorator``
- ``_pytest.mark.structures.MarkGenerator``
- ``_pytest.python.Metafunc``
- ``_pytest.runner.CallInfo``
- ``_pytest._code.ExceptionInfo``
- ``_pytest.config.argparsing.Parser``
- ``_pytest.config.argparsing.OptionGroup``
- ``_pytest.pytester.HookRecorder``
-
-These constructors have always been considered private, but now issue a deprecation warning, which may become a hard error in pytest 8.
--- a/changelog/7469.feature.rst
+++ b/changelog/7469.feature.rst
@@ -1,25 +0,0 @@
-The types of objects used in pytest's API are now exported so they may be used in type annotations.
-
-The newly-exported types are:
-
- ``pytest.Config`` for :class:`Config <pytest.Config>`.
- ``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 :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 :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`.
- ``pytest.RunResult`` for the :class:`RunResult <pytest.RunResult>` type returned from :class:`~pytest.Pytester`.
- ``pytest.LineMatcher`` for the :class:`LineMatcher <pytest.RunResult>` type used in :class:`~pytest.RunResult` and others.
- ``pytest.TestReport`` for the :class:`TestReport <pytest.TestReport>` type used in various hooks.
- ``pytest.CollectReport`` for the :class:`CollectReport <pytest.CollectReport>` type used in various hooks.
-
-Constructing most of them directly is not supported; they are only meant for use in type annotations.
-Doing so will emit a deprecation warning, and may become a hard-error in pytest 8.0.
-
-Subclassing them is also not supported. This is not currently enforced at runtime, but is detected by type-checkers such as mypy.
--- a/changelog/7480.improvement.rst
+++ b/changelog/7480.improvement.rst
@@ -1,5 +0,0 @@
-A deprecation scheduled to be removed in a major version X (e.g. pytest 7, 8, 9, ...) now uses warning category `PytestRemovedInXWarning`,
-a subclass of :class:`~pytest.PytestDeprecationWarning`,
-instead of :class:`PytestDeprecationWarning` directly.
-
-See :ref:`backwards-compatibility` for more details.
--- a/changelog/7856.feature.rst
+++ b/changelog/7856.feature.rst
@@ -1,2 +0,0 @@
-:ref:`--import-mode=importlib <import-modes>` now works with features that
-depend on modules being on :py:data:`sys.modules`, such as :mod:`pickle` and :mod:`dataclasses`.
--- a/changelog/7864.improvement.rst
+++ b/changelog/7864.improvement.rst
@@ -1,4 +0,0 @@
-Improved error messages when parsing warning filters.
-
-Previously pytest would show an internal traceback, which besides being ugly sometimes would hide the cause
-of the problem (for example an ``ImportError`` while importing a specific warning type).
--- a/changelog/8061.bugfix.rst
+++ b/changelog/8061.bugfix.rst
@@ -1 +0,0 @@
-Fixed failing ``staticmethod`` test cases if they are inherited from a parent test class.
--- a/changelog/8133.trivial.rst
+++ b/changelog/8133.trivial.rst
@@ -1 +0,0 @@
-Migrate to ``setuptools_scm`` 6.x to use ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST`` for more robust release tooling.
--- a/changelog/8144.feature.rst
+++ b/changelog/8144.feature.rst
@@ -1,16 +0,0 @@
-The following hooks now receive an additional ``pathlib.Path`` argument, equivalent to an existing ``py.path.local`` argument:
-
- :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
-    new attribute being ``path``) is **the opposite** of the situation for hooks
-    (the old argument being ``path``).
-
-    This is an unfortunate artifact due to historical reasons, which should be
-    resolved in future versions as we slowly get rid of the :pypi:`py`
-    dependency (see :issue:`9283` for a longer discussion).
--- a/changelog/8174.trivial.rst
+++ b/changelog/8174.trivial.rst
@@ -1,6 +0,0 @@
-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``.
--- a/changelog/8192.bugfix.rst
+++ b/changelog/8192.bugfix.rst
@@ -1,3 +0,0 @@
-``testdir.makefile`` now silently accepts values which don't start with ``.`` to maintain backward compatibility with older pytest versions.
-
-``pytester.makefile`` now issues a clearer error if the ``.`` is missing in the ``ext`` argument.
--- a/changelog/8242.deprecation.rst
+++ b/changelog/8242.deprecation.rst
@@ -1,7 +0,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 :class:`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.
--- a/changelog/8246.breaking.rst
+++ b/changelog/8246.breaking.rst
@@ -1 +0,0 @@
-``--version`` now writes version information to ``stdout`` rather than ``stderr``.
--- a/changelog/8248.trivial.rst
+++ b/changelog/8248.trivial.rst
@@ -1 +0,0 @@
-Internal Restructure: let ``python.PyObjMixin`` inherit from ``nodes.Node`` to carry over typing information.
--- a/changelog/8251.feature.rst
+++ b/changelog/8251.feature.rst
@@ -1,11 +0,0 @@
-Implement ``Node.path`` as a ``pathlib.Path``. Both the old ``fspath`` and this new attribute gets set no matter whether ``path`` or ``fspath`` (deprecated) is passed to the constructor. It is a replacement for the ``fspath`` attribute (which represents the same path as ``py.path.local``). While ``fspath`` is not deprecated yet
-due to the ongoing migration of methods like :meth:`~_pytest.Item.reportinfo`, we expect to deprecate it in a future release.
-
-.. note::
-    The name of the :class:`~_pytest.nodes.Node` arguments and attributes (the
-    new attribute being ``path``) is **the opposite** of the situation for hooks
-    (the old argument being ``path``).
-
-    This is an unfortunate artifact due to historical reasons, which should be
-    resolved in future versions as we slowly get rid of the :pypi:`py`
-    dependency (see :issue:`9283` for a longer discussion).
--- a/changelog/8258.bugfix.rst
+++ b/changelog/8258.bugfix.rst
@@ -1,3 +0,0 @@
-Fixed issue where pytest's ``faulthandler`` support would not dump traceback on crashes
-if the :mod:`faulthandler` module was already enabled during pytest startup (using
-``python -X dev -m pytest`` for example).
--- a/changelog/8315.deprecation.rst
+++ b/changelog/8315.deprecation.rst
@@ -1,5 +0,0 @@
-Several behaviors of :meth:`Parser.addoption <pytest.Parser.addoption>` are now
-scheduled for removal in pytest 8 (deprecated since pytest 2.4.0):
-
- ``parser.addoption(..., help=".. %default ..")`` - use ``%(default)s`` instead.
- ``parser.addoption(..., type="int/string/float/complex")`` - use ``type=int`` etc. instead.
--- a/changelog/8317.bugfix.rst
+++ b/changelog/8317.bugfix.rst
@@ -1 +0,0 @@
-Fixed an issue where illegal directory characters derived from ``getpass.getuser()`` raised an ``OSError``.
--- a/changelog/8335.improvement.rst
+++ b/changelog/8335.improvement.rst
@@ -1,10 +0,0 @@
-Improved :func:`pytest.approx` assertion messages for sequences of numbers.
-
-The assertion messages now dumps a table with the index and the error of each diff.
-Example::
-
-    >       assert [1, 2, 3, 4] == pytest.approx([1, 3, 3, 5])
-    E       assert comparison failed for 2 values:
-    E         Index | Obtained | Expected
-    E         1     | 2        | 3 +- 3.0e-06
-    E         3     | 4        | 5 +- 5.0e-06
--- a/changelog/8337.doc.rst
+++ b/changelog/8337.doc.rst
@@ -1 +0,0 @@
-Recommend `numpy.testing <https://numpy.org/doc/stable/reference/routines.testing.html>`__ module on :func:`pytest.approx` documentation.
--- a/changelog/8367.bugfix.rst
+++ b/changelog/8367.bugfix.rst
@@ -1 +0,0 @@
-Fix ``Class.from_parent`` so it forwards extra keyword arguments to the constructor.
--- a/changelog/8377.bugfix.rst
+++ b/changelog/8377.bugfix.rst
@@ -1,2 +0,0 @@
-The test selection options ``pytest -k`` and ``pytest -m`` now support matching
-names containing forward slash (``/``) characters.
--- a/changelog/8384.bugfix.rst
+++ b/changelog/8384.bugfix.rst
@@ -1 +0,0 @@
-The ``@pytest.mark.skip`` decorator now correctly handles its arguments. When the ``reason`` argument is accidentally given both positional and as a keyword (e.g. because it was confused with ``skipif``), a ``TypeError`` now occurs. Before, such tests were silently skipped, and the positional argument ignored. Additionally, ``reason`` is now documented correctly as positional or keyword (rather than keyword-only).
--- a/changelog/8394.bugfix.rst
+++ b/changelog/8394.bugfix.rst
@@ -1 +0,0 @@
-Use private names for internal fixtures that handle classic setup/teardown so that they don't show up with the default ``--fixtures`` invocation (but they still show up with ``--fixtures -v``).
--- a/changelog/8403.improvement.rst
+++ b/changelog/8403.improvement.rst
@@ -1,5 +0,0 @@
-By default, pytest will truncate long strings in assert errors so they don't clutter the output too much,
-currently at ``240`` characters by default.
-
-However, in some cases the longer output helps, or is even crucial, to diagnose a failure. Using ``-v`` will
-now increase the truncation threshold to ``2400`` characters, and ``-vv`` or higher will disable truncation entirely.
--- a/changelog/8421.feature.rst
+++ b/changelog/8421.feature.rst
@@ -1 +0,0 @@
-:func:`pytest.approx` now works on :class:`~decimal.Decimal` within mappings/dicts and sequences/lists.
--- a/changelog/8432.trivial.rst
+++ b/changelog/8432.trivial.rst
@@ -1 +0,0 @@
-Improve error message when :func:`pytest.skip` is used at module level without passing `allow_module_level=True`.
--- a/changelog/8447.deprecation.rst
+++ b/changelog/8447.deprecation.rst
@@ -1,4 +0,0 @@
-Defining a custom pytest node type which is both an :class:`pytest.Item <Item>` and a :class:`pytest.Collector <Collector>` (e.g. :class:`pytest.File <File>`) now issues a warning.
-It was never sanely supported and triggers hard to debug errors.
-
-See :ref:`the deprecation note <diamond-inheritance-deprecated>` for full details.
--- a/changelog/8456.bugfix.rst
+++ b/changelog/8456.bugfix.rst
@@ -1 +0,0 @@
-The :confval:`required_plugins` config option now works correctly when pre-releases of plugins are installed, rather than falsely claiming that those plugins aren't installed at all.
--- a/changelog/8464.bugfix.rst
+++ b/changelog/8464.bugfix.rst
@@ -1 +0,0 @@
-``-c <config file>`` now also properly defines ``rootdir`` as the directory that contains ``<config file>``.
--- a/changelog/8503.bugfix.rst
+++ b/changelog/8503.bugfix.rst
@@ -1,4 +0,0 @@
-:meth:`pytest.MonkeyPatch.syspath_prepend` no longer fails when
-``setuptools`` is not installed.
-It now only calls :func:`pkg_resources.fixup_namespace_packages` if
-``pkg_resources`` was previously imported, because it is not needed otherwise.
--- a/changelog/8509.improvement.rst
+++ b/changelog/8509.improvement.rst
@@ -1,5 +0,0 @@
-Fixed issue where :meth:`unittest.TestCase.setUpClass` is not called when a test has `/` in its name since pytest 6.2.0.
-
-This refers to the path part in pytest node IDs, e.g. ``TestClass::test_it`` in the node ID ``tests/test_file.py::TestClass::test_it``.
-
-Now, instead of assuming that the test name does not contain ``/``, it is assumed that test path does not contain ``::``. We plan to hopefully make both of these work in the future.
--- a/changelog/8548.bugfix.rst
+++ b/changelog/8548.bugfix.rst
@@ -1 +0,0 @@
-Introduce fix to handle precision width in ``log-cli-format`` in turn to fix output coloring for certain formats.
--- a/changelog/8592.deprecation.rst
+++ b/changelog/8592.deprecation.rst
@@ -1,3 +0,0 @@
-: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.
--- a/changelog/8606.feature.rst
+++ b/changelog/8606.feature.rst
@@ -1,5 +0,0 @@
-pytest invocations with ``--fixtures-per-test`` and ``--fixtures`` have been enriched with:
-
- Fixture location path printed with the fixture name.
- First section of the fixture's docstring printed under the fixture name.
- Whole of fixture's docstring printed under the fixture name using ``--verbose`` option.
--- a/changelog/8645.deprecation.rst
+++ b/changelog/8645.deprecation.rst
@@ -1,4 +0,0 @@
-: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)``.
--- a/changelog/8655.doc.rst
+++ b/changelog/8655.doc.rst
@@ -1 +0,0 @@
-Help text for ``--pdbcls`` more accurately reflects the option's behavior.
--- a/changelog/8733.breaking.rst
+++ b/changelog/8733.breaking.rst
@@ -1,5 +0,0 @@
-Drop a workaround for `pyreadline <https://github.com/pyreadline/pyreadline>`__ that made it work with ``--pdb``.
-
-The workaround was introduced in `#1281 <https://github.com/pytest-dev/pytest/pull/1281>`__ in 2015, however since then
-`pyreadline seems to have gone unmaintained <https://github.com/pyreadline/pyreadline/issues/58>`__, is `generating
-warnings <https://github.com/pytest-dev/pytest/issues/8847>`__, and will stop working on Python 3.10.
--- a/changelog/8761.feature.rst
+++ b/changelog/8761.feature.rst
@@ -1 +0,0 @@
-New :ref:`version-tuple` attribute, which makes it simpler for users to do something depending on the pytest version (such as declaring hooks which are introduced in later versions).
--- a/changelog/8789.feature.rst
+++ b/changelog/8789.feature.rst
@@ -1 +0,0 @@
-Switch TOML parser from ``toml`` to ``tomli`` for TOML v1.0.0 support in ``pyproject.toml``.
--- a/changelog/8796.bugfix.rst
+++ b/changelog/8796.bugfix.rst
@@ -1 +0,0 @@
-Fixed internal error when skipping doctests.
--- a/changelog/8803.improvement.rst
+++ b/changelog/8803.improvement.rst
@@ -1,9 +0,0 @@
-It is now possible to add colors to custom log levels on cli log.
-
-By using :func:`add_color_level <_pytest.logging.add_color_level>` from a ``pytest_configure`` hook, colors can be added::
-
-    logging_plugin = config.pluginmanager.get_plugin('logging-plugin')
-    logging_plugin.log_cli_handler.formatter.add_color_level(logging.INFO, 'cyan')
-    logging_plugin.log_cli_handler.formatter.add_color_level(logging.SPAM, 'blue')
-
-See :ref:`log_colors` for more information.
--- a/changelog/8818.trivial.rst
+++ b/changelog/8818.trivial.rst
@@ -1 +0,0 @@
-Ensure ``regendoc`` opts out of ``TOX_ENV`` cachedir selection to ensure independent example test runs.
--- a/changelog/8822.improvement.rst
+++ b/changelog/8822.improvement.rst
@@ -1 +0,0 @@
-When showing fixture paths in `--fixtures` or `--fixtures-by-test`, fixtures coming from pytest itself now display an elided path, rather than the full path to the file in the `site-packages` directory.
--- a/changelog/8898.improvement.rst
+++ b/changelog/8898.improvement.rst
@@ -1 +0,0 @@
-Complex numbers are now treated like floats and integers when generating parameterization IDs.
--- a/changelog/8913.trivial.rst
+++ b/changelog/8913.trivial.rst
@@ -1 +0,0 @@
-The private ``CallSpec2._arg2scopenum`` attribute has been removed after an internal refactoring.
--- a/changelog/8920.feature.rst
+++ b/changelog/8920.feature.rst
@@ -1,2 +0,0 @@
-Added :class:`pytest.Stash`, a facility for plugins to store their data on :class:`~pytest.Config` and :class:`~_pytest.nodes.Node`\s in a type-safe and conflict-free manner.
-See :ref:`plugin-stash` for details.
--- a/changelog/8948.deprecation.rst
+++ b/changelog/8948.deprecation.rst
@@ -1,5 +0,0 @@
-:func:`pytest.skip(msg=...) <pytest.skip>`, :func:`pytest.fail(msg=...) <pytest.fail>` and :func:`pytest.exit(msg=...) <pytest.exit>`
-signatures now accept a ``reason`` argument instead of ``msg``.  Using ``msg`` still works, but is deprecated and will be removed in a future release.
-
-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.
--- a/changelog/8953.feature.rst
+++ b/changelog/8953.feature.rst
@@ -1,2 +0,0 @@
-:class:`RunResult <_pytest.pytester.RunResult>` method :meth:`assert_outcomes <_pytest.pytester.RunResult.assert_outcomes>` now accepts a
-``warnings`` argument to assert the total number of warnings captured.
--- a/changelog/8954.feature.rst
+++ b/changelog/8954.feature.rst
@@ -1 +0,0 @@
-``--debug`` flag now accepts a :class:`str` file to route debug logs into, remains defaulted to `pytestdebug.log`.
--- a/changelog/8967.trivial.rst
+++ b/changelog/8967.trivial.rst
@@ -1,2 +0,0 @@
-:func:`pytest_assertion_pass <_pytest.hookspec.pytest_assertion_pass>` is no longer considered experimental and
-future changes to it will be considered more carefully.
--- a/changelog/8983.bugfix.rst
+++ b/changelog/8983.bugfix.rst
@@ -1,2 +0,0 @@
-The test selection options ``pytest -k`` and ``pytest -m`` now support matching names containing backslash (`\\`) characters.
-Backslashes are treated literally, not as escape characters (the values being matched against are already escaped).
--- a/changelog/8990.bugfix.rst
+++ b/changelog/8990.bugfix.rst
@@ -1 +0,0 @@
-Fix `pytest -vv` crashing with an internal exception `AttributeError: 'str' object has no attribute 'relative_to'` in some cases.
--- a/changelog/9023.feature.rst
+++ b/changelog/9023.feature.rst
@@ -1,4 +0,0 @@
-
-Full diffs are now always shown for equality assertions of iterables when
-`CI` or ``BUILD_NUMBER`` is found in the environment, even when ``-v`` isn't
-used.
--- a/changelog/9061.breaking.rst
+++ b/changelog/9061.breaking.rst
@@ -1,15 +0,0 @@
-Using :func:`pytest.approx` in a boolean context now raises an error hinting at the proper usage.
-
-It is apparently common for users to mistakenly use ``pytest.approx`` like this:
-
-.. code-block:: python
-
-    assert pytest.approx(actual, expected)
-
-While the correct usage is:
-
-.. code-block:: python
-
-    assert actual == pytest.approx(expected)
-
-The new error message helps catch those mistakes.
--- a/changelog/9062.improvement.rst
+++ b/changelog/9062.improvement.rst
@@ -1 +0,0 @@
-``--stepwise-skip`` now implicitly enables ``--stepwise`` and can be used on its own.
--- a/changelog/9077.bugfix.rst
+++ b/changelog/9077.bugfix.rst
@@ -1 +0,0 @@
-Fixed confusing error message when ``request.fspath`` / ``request.path`` was accessed from a session-scoped fixture.
--- a/changelog/9113.feature.rst
+++ b/changelog/9113.feature.rst
@@ -1,2 +0,0 @@
-:class:`RunResult <_pytest.pytester.RunResult>` method :meth:`assert_outcomes <_pytest.pytester.RunResult.assert_outcomes>` now accepts a
-``deselected`` argument to assert the total number of deselected tests.
--- a/changelog/9114.feature.rst
+++ b/changelog/9114.feature.rst
@@ -1 +0,0 @@
-Added :confval:`pythonpath` setting that adds listed paths to :data:`sys.path` for the duration of the test session. If you currently use the pytest-pythonpath or pytest-srcpaths plugins, you should be able to replace them with built-in `pythonpath` setting.
--- a/changelog/9131.bugfix.rst
+++ b/changelog/9131.bugfix.rst
@@ -1 +0,0 @@
-Fixed the URL used by ``--pastebin`` to use `bpa.st <http://bpa.st>`__.
--- a/changelog/9163.bugfix.rst
+++ b/changelog/9163.bugfix.rst
@@ -1 +0,0 @@
-The end line number and end column offset are now properly set for rewritten assert statements.
--- a/changelog/9169.bugfix.rst
+++ b/changelog/9169.bugfix.rst
@@ -1 +0,0 @@
-Support for the ``files`` API from ``importlib.resources`` within rewritten files.
--- a/changelog/9202.trivial.rst
+++ b/changelog/9202.trivial.rst
@@ -1 +0,0 @@
-Add github action to upload coverage report to codecov instead of bash uploader.
--- a/changelog/9205.improvement.rst
+++ b/changelog/9205.improvement.rst
@@ -1 +0,0 @@
-:meth:`pytest.Cache.set` now preserves key order when saving dicts.
--- a/changelog/9210.doc.rst
+++ b/changelog/9210.doc.rst
@@ -1 +0,0 @@
-Remove incorrect docs about ``confcutdir`` being a configuration option: it can only be set through the ``--confcutdir`` command-line option.
--- a/changelog/9225.trivial.rst
+++ b/changelog/9225.trivial.rst
@@ -1 +0,0 @@
-Changed the command used to create sdist and wheel artifacts: using the build package instead of setup.py.
--- a/changelog/9242.doc.rst
+++ b/changelog/9242.doc.rst
@@ -1 +0,0 @@
-Upgrade readthedocs configuration to use a `newer Ubuntu version <https://blog.readthedocs.com/new-build-specification/>`__` with better unicode support for PDF docs.
--- a/changelog/9272.bugfix.rst
+++ b/changelog/9272.bugfix.rst
@@ -1,2 +0,0 @@
-The nose compatibility module-level fixtures `setup()` and `teardown()` are now only called once per module, instead of for each test function.
-They are now called even if object-level `setup`/`teardown` is defined.
--- a/changelog/9277.breaking.rst
+++ b/changelog/9277.breaking.rst
@@ -1,3 +0,0 @@
-The ``pytest.Instance`` collector type has been removed.
-Importing ``pytest.Instance`` or ``_pytest.python.Instance`` returns a dummy type and emits a deprecation warning.
-See :ref:`instance-collector-deprecation` for details.
--- a/changelog/9308.breaking.rst
+++ b/changelog/9308.breaking.rst
@@ -1,22 +0,0 @@
-**PytestRemovedIn7Warning deprecation warnings are now errors by default.**
-
-Following our plan to remove deprecated features with as little disruption as
-possible, all warnings of type ``PytestRemovedIn7Warning`` now generate errors
-instead of warning messages by default.
-
-**The affected features will be effectively removed in pytest 7.1**, so please consult the
-:ref:`deprecations` section in the docs for directions on how to update existing code.
-
-In the pytest ``7.0.X`` series, it is possible to change the errors back into warnings as a
-stopgap measure by adding this to your ``pytest.ini`` file:
-
-.. code-block:: ini
-
-    [pytest]
-    filterwarnings =
-        ignore::pytest.PytestRemovedIn7Warning
-
-But this will stop working when pytest ``7.1`` is released.
-
-**If you have concerns** about the removal of a specific feature, please add a
-comment to :issue:`9308`.
--- a/changelog/9341.doc.rst
+++ b/changelog/9341.doc.rst
@@ -1 +0,0 @@
-Various methods commonly used for :ref:`non-python tests` are now correctly documented in the reference docs. They were undocumented previously.
--- a/changelog/9351.trivial.rst
+++ b/changelog/9351.trivial.rst
@@ -1 +0,0 @@
-Correct minor typos in doc/en/example/special.rst.
--- a/doc/en/_templates/globaltoc.html
+++ b/doc/en/_templates/globaltoc.html
@@ -17,7 +17,6 @@
  <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>
@@ -30,5 +29,3 @@
 {%- endif %}

 <hr>
-<a href="{{ pathto('genindex') }}">Index</a>
-<hr>
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,16 @@ Release announcements
   :maxdepth: 2


+   release-7.2.2
+   release-7.2.1
+   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
   release-6.2.3
--- a/doc/en/announce/release-2.5.0.rst
+++ b/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
-"enhacement" issues which we'll hopefully can tackle in 2014 with your
+"enhancement" 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
--- a/doc/en/announce/release-7.0.0.rst
+++ b/doc/en/announce/release-7.0.0.rst
@@ -0,0 +1,74 @@
+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
--- a/doc/en/announce/release-7.0.0rc1.rst
+++ b/doc/en/announce/release-7.0.0rc1.rst
@@ -0,0 +1,74 @@
+pytest-7.0.0rc1
+=======================================
+
+The pytest team is proud to announce the 7.0.0rc1 prerelease!
+
+This is a prerelease, not intended for production use, but to test the upcoming features and improvements
+in order to catch any major problems before the final version is released to the major public.
+
+We appreciate your help testing this out before the final release, making sure to report any
+regressions to our issue tracker:
+
+https://github.com/pytest-dev/pytest/issues
+
+When doing so, please include the string ``[prerelease]`` in the title.
+
+You can upgrade from PyPI via:
+
+    pip install pytest==7.0.0rc1
+
+Users are encouraged to take a look at the CHANGELOG carefully:
+
+    https://docs.pytest.org/en/7.0.x/changelog.html
+
+Thanks to all 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
+* 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
+* Miro Hrončok
+* Naveen-Pratap
+* Oleg Höfling
+* Ran Benita
+* Ronny Pfannschmidt
+* Simon K
+* Srip
+* Sören Wegener
+* Taneli Hukkinen
+* Terje Runde
+* Thomas Grainger
+* Thomas Hisch
+* William Jamir Silva
+* Zac Hatfield-Dodds
+* andrewdotn
+* denivyruck
+* ericluoliu
+* oleg.hoefling
+* symonk
+* ziebam
+* Éloi Rivard
+
+
+Happy testing,
+The pytest Development Team
--- a/doc/en/announce/release-7.0.1.rst
+++ b/doc/en/announce/release-7.0.1.rst
@@ -0,0 +1,20 @@
+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
--- a/doc/en/announce/release-7.1.0.rst
+++ b/doc/en/announce/release-7.1.0.rst
@@ -0,0 +1,48 @@
+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
--- a/doc/en/announce/release-7.1.1.rst
+++ b/doc/en/announce/release-7.1.1.rst
@@ -0,0 +1,18 @@
+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
--- a/doc/en/announce/release-7.1.2.rst
+++ b/doc/en/announce/release-7.1.2.rst
@@ -0,0 +1,23 @@
+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
--- a/doc/en/announce/release-7.1.3.rst
+++ b/doc/en/announce/release-7.1.3.rst
@@ -0,0 +1,28 @@
+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
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				Add automatically generated :ref:`plugin-list`. The list is updated on a periodic schedule.
				`@@ -1 +0,0 @@`
				Fixed an issue where ``__main__.py`` would raise an ``ImportError`` when ``--doctest-modules`` was provided.
				`@@ -1 +0,0 @@`
				Added two environment variables :envvar:`PYTEST_THEME` and :envvar:`PYTEST_THEME_MODE` to let the users customize the pygments theme used.
				`@@ -1 +0,0 @@`
				Fixed failing ``staticmethod`` test cases if they are inherited from a parent test class.
				`@@ -1 +0,0 @@`
				Migrate to ``setuptools_scm`` 6.x to use ``SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST`` for more robust release tooling.
				`@@ -1 +0,0 @@`
				``--version`` now writes version information to ``stdout`` rather than ``stderr``.
				`@@ -1 +0,0 @@`
				Internal Restructure: let ``python.PyObjMixin`` inherit from ``nodes.Node`` to carry over typing information.
				`@@ -1 +0,0 @@`
				Fixed an issue where illegal directory characters derived from ``getpass.getuser()`` raised an ``OSError``.
				`@@ -1 +0,0 @@`
				Recommend `numpy.testing <https://numpy.org/doc/stable/reference/routines.testing.html>`__ module on :func:`pytest.approx` documentation.
				`@@ -1 +0,0 @@`
				Fix ``Class.from_parent`` so it forwards extra keyword arguments to the constructor.