Preparing release version 5.4.1

Revert "[parametrize] enforce explicit argnames declaration (#6330)"

.coveragerc

@@ -25,7 +25,5 @@ exclude_lines =
     ^\s*raise NotImplementedError\b
     ^\s*return NotImplemented\b
     ^\s*assert False(,|$)
-    ^\s*assert_never\(
 
     ^\s*if TYPE_CHECKING:
-    ^\s*@overload( |$)

.github/ISSUE_TEMPLATE.md

@@ -1,16 +1,10 @@
----
-name: 🐛 Bug Report
-about: Report errors and problems
-
----
-
 <!--
 Thanks for submitting an issue!
 
-Quick check-list while reporting bugs:
+Here's a quick checklist for what to provide:
 -->
 
-- [ ] a detailed description of the bug or problem you are having
+- [ ] a detailed description of the bug or suggestion
 - [ ] output of `pip list` from the virtual environment you are using
 - [ ] pytest and operating system versions
 - [ ] minimal example if possible

.github/ISSUE_TEMPLATE/2_feature_request.md

@@ -1,25 +0,0 @@
----
-name: 🚀 Feature Request
-about: Ideas for new features and improvements
-
----
-
-<!--
-Thanks for suggesting a feature!
-
-Quick check-list while suggesting features:
--->
-
-#### What's the problem this feature will solve?
-<!-- What are you trying to do, that you are unable to achieve with pytest as it currently stands? -->
-
-#### Describe the solution you'd like
-<!-- A clear and concise description of what you want to happen. -->
-
-<!-- Provide examples of real-world use cases that this would enable and how it solves the problem described above. -->
-
-#### Alternative Solutions
-<!-- Have you tried to workaround the problem using a pytest plugin or other tools? Or a different approach to solving this issue? Please elaborate here. -->
-
-#### Additional context
-<!-- Add any other context, links, etc. about the feature here. -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: ❓ Support Question
-    url: https://github.com/pytest-dev/pytest/discussions
-    about: Use GitHub's new Discussions feature for questions

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,13 +7,9 @@ Here is a quick checklist that should be present in PRs.
 - [ ] Include new tests or update existing tests when applicable.
 - [X] Allow maintainers to push and squash when merging my commits. Please uncheck this if you prefer to squash the commits yourself.
 
-If this change fixes an issue, please:
-
-- [ ] Add text like ``closes #XYZW`` to the PR description and/or commits (where ``XYZW`` is the issue number). See the [github docs](https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) for more information.
-
 Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please:
 
-- [ ] Create a new changelog file in the `changelog` folder, with a name like `<ISSUE NUMBER>.<TYPE>.rst`. See [changelog/README.rst](https://github.com/pytest-dev/pytest/blob/main/changelog/README.rst) for details.
+- [ ] Create a new changelog file in the `changelog` folder, with a name like `<ISSUE NUMBER>.<TYPE>.rst`. See [changelog/README.rst](https://github.com/pytest-dev/pytest/blob/master/changelog/README.rst) for details.
 
   Write sentences in the **past or present tense**, examples:
 

.github/dependabot.yml

@@ -1,17 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: pip
-  directory: "/testing/plugins_integration"
-  schedule:
-    interval: weekly
-    time: "03:00"
-  open-pull-requests-limit: 10
-  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@v4
-      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,90 +0,0 @@
-name: deploy
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Release version'
-        required: true
-        default: '1.2.3'
-
-
-# Set permissions at the job level.
-permissions: {}
-
-jobs:
-  package:
-    runs-on: ubuntu-latest
-    env:
-      SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }}
-    timeout-minutes: 10
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v1.5
-
-  deploy:
-    if: github.repository == 'pytest-dev/pytest'
-    needs: [package]
-    runs-on: ubuntu-latest
-    environment: deploy
-    timeout-minutes: 30
-    permissions:
-      id-token: write
-      contents: write
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Download Package
-      uses: actions/download-artifact@v3
-      with:
-        name: Packages
-        path: dist
-
-    - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.8.10
-
-    - name: Push tag
-      run: |
-        git config user.name "pytest bot"
-        git config user.email "pytestbot@gmail.com"
-        git tag --annotate --message=v${{ github.event.inputs.version }} v${{ github.event.inputs.version }} ${{ github.sha }}
-        git push origin v${{ github.event.inputs.version }}
-
-  release-notes:
-
-    # todo: generate the content in the build  job
-    #       the goal being of using a github action script to push the release data
-    #       after success instead of creating a complete python/tox env
-    needs: [deploy]
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    permissions:
-      contents: write
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.11"
-
-    - 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

.github/workflows/main.yml

@@ -0,0 +1,194 @@
+# evaluating GitHub actions for CI, disregard failures when evaluating PRs
+#
+# this is still missing:
+# - deploy
+# - upload github notes
+#
+name: main
+
+on:
+  push:
+    branches:
+      - master
+      - "[0-9]+.[0-9]+.x"
+    tags:
+      - "*"
+
+  pull_request:
+    branches:
+      - master
+      - "[0-9]+.[0-9]+.x"
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [
+          "windows-py35",
+          "windows-py36",
+          "windows-py37",
+          "windows-py37-pluggy",
+          "windows-py38",
+
+          "ubuntu-py35",
+          "ubuntu-py36",
+          "ubuntu-py37",
+          "ubuntu-py37-pluggy",
+          "ubuntu-py37-freeze",
+          "ubuntu-py38",
+          "ubuntu-pypy3",
+
+          "macos-py37",
+          "macos-py38",
+
+          "linting",
+          "docs",
+          "doctesting",
+        ]
+
+        include:
+          - name: "windows-py35"
+            python: "3.5"
+            os: windows-latest
+            tox_env: "py35-xdist"
+            use_coverage: true
+          - name: "windows-py36"
+            python: "3.6"
+            os: windows-latest
+            tox_env: "py36-xdist"
+          - name: "windows-py37"
+            python: "3.7"
+            os: windows-latest
+            tox_env: "py37-twisted-numpy"
+          - name: "windows-py37-pluggy"
+            python: "3.7"
+            os: windows-latest
+            tox_env: "py37-pluggymaster-xdist"
+          - name: "windows-py38"
+            python: "3.8"
+            os: windows-latest
+            tox_env: "py38"
+            use_coverage: true
+
+          - name: "ubuntu-py35"
+            python: "3.5"
+            os: ubuntu-latest
+            tox_env: "py35-xdist"
+          - name: "ubuntu-py36"
+            python: "3.6"
+            os: ubuntu-latest
+            tox_env: "py36-xdist"
+          - name: "ubuntu-py37"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-lsof-numpy-oldattrs-pexpect-twisted"
+            use_coverage: true
+          - name: "ubuntu-py37-pluggy"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-pluggymaster-xdist"
+          - name: "ubuntu-py37-freeze"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-freeze"
+          - name: "ubuntu-py38"
+            python: "3.8"
+            os: ubuntu-latest
+            tox_env: "py38-xdist"
+          - name: "ubuntu-pypy3"
+            python: "pypy3"
+            os: ubuntu-latest
+            tox_env: "pypy3-xdist"
+
+          - name: "macos-py37"
+            python: "3.7"
+            os: macos-latest
+            tox_env: "py37-xdist"
+          - name: "macos-py38"
+            python: "3.8"
+            os: macos-latest
+            tox_env: "py38-xdist"
+            use_coverage: true
+
+          - name: "linting"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "linting"
+          - name: "docs"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "docs"
+          - name: "doctesting"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "doctesting"
+            use_coverage: true
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox coverage
+
+    - name: Test without coverage
+      if: "! matrix.use_coverage"
+      run: "tox -e ${{ matrix.tox_env }}"
+
+    - name: Test with coverage
+      if: "matrix.use_coverage"
+      env:
+        _PYTEST_TOX_COVERAGE_RUN: "coverage run -m"
+        COVERAGE_PROCESS_START: ".coveragerc"
+        _PYTEST_TOX_EXTRA_DEP: "coverage-enable-subprocess"
+      run: "tox -e ${{ matrix.tox_env }}"
+
+    - name: Prepare coverage token
+      if: (matrix.use_coverage && ( github.repository == 'pytest-dev/pytest' || github.event_name == 'pull_request' ))
+      run: |
+        python scripts/append_codecov_token.py
+
+    - name: Report coverage
+      if: (matrix.use_coverage)
+      env:
+        CODECOV_NAME: ${{ matrix.name }}
+      run: bash scripts/report-coverage.sh -F GHA,${{ runner.os }}
+
+  deploy:
+    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest'
+
+    runs-on: ubuntu-latest
+
+    needs: [build]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: "3.7"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade wheel setuptools tox
+    - name: Build package
+      run: |
+        python setup.py sdist bdist_wheel
+    - 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: ${{ secrets.release_notes }}
+      run: |
+        sudo apt-get install pandoc
+        tox -e publish-gh-release-notes

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

@@ -1,52 +0,0 @@
-name: prepare release pr
-
-on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to base the release from'
-        required: true
-        default: ''
-      major:
-        description: 'Major release? (yes/no)'
-        required: true
-        default: 'no'
-      prerelease:
-        description: 'Prerelease (ex: rc1). Leave empty if not a pre-release.'
-        required: false
-        default: ''
-
-# Set permissions at the job level.
-permissions: {}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.8"
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade setuptools tox
-
-    - name: Prepare release PR (minor/patch release)
-      if: github.event.inputs.major == 'no'
-      run: |
-        tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ github.token }} --prerelease='${{ github.event.inputs.prerelease }}'
-
-    - name: Prepare release PR (major release)
-      if: github.event.inputs.major == 'yes'
-      run: |
-        tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ github.token }} --major --prerelease='${{ github.event.inputs.prerelease }}'

.github/workflows/release-on-comment.yml

@@ -0,0 +1,28 @@
+# part of our release process, see `release-on-comment.py`
+name: release on comment
+
+on:
+  issues:
+    types: [opened, edited]
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    if: (github.event.comment && startsWith(github.event.comment.body, '@pytestbot please')) || (github.event.issue && !github.event.comment && startsWith(github.event.issue.body, '@pytestbot please'))
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python
+      uses: actions/setup-python@v1
+      with:
+        python-version: "3.8"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade setuptools tox
+    - name: Prepare release
+      run: |
+        tox -e release-on-comment -- $GITHUB_EVENT_PATH ${{ secrets.chatops }}

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: close needs-information issues
-on:
-  schedule:
-    - cron: "30 1 * * *"
-  workflow_dispatch:
-
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/stale@v8
-        with:
-          debug-only: false
-          days-before-issue-stale: 14
-          days-before-issue-close: 7
-          only-labels: "status: needs information"
-          stale-issue-label: "stale"
-          stale-issue-message: "This issue is stale because it has been open for 14 days with no activity."
-          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale."
-          days-before-pr-stale: -1
-          days-before-pr-close: -1

.github/workflows/test.yml

@@ -1,213 +0,0 @@
-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]+"
-
-  pull_request:
-    branches:
-      - main
-      - "[0-9]+.[0-9]+.x"
-
-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:
-  package:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-    - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v1.5
-
-  build:
-    needs: [package]
-
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 45
-    permissions:
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        name: [
-          "windows-py38",
-          "windows-py38-pluggy",
-          "windows-py39",
-          "windows-py310",
-          "windows-py311",
-          "windows-py312",
-
-          "ubuntu-py38",
-          "ubuntu-py38-pluggy",
-          "ubuntu-py38-freeze",
-          "ubuntu-py39",
-          "ubuntu-py310",
-          "ubuntu-py311",
-          "ubuntu-py312",
-          "ubuntu-pypy3",
-
-          "macos-py38",
-          "macos-py39",
-          "macos-py310",
-          "macos-py312",
-
-          "doctesting",
-          "plugins",
-        ]
-
-        include:
-          - name: "windows-py38"
-            python: "3.8"
-            os: windows-latest
-            tox_env: "py38-unittestextras"
-            use_coverage: true
-          - name: "windows-py38-pluggy"
-            python: "3.8"
-            os: windows-latest
-            tox_env: "py38-pluggymain-pylib-xdist"
-          - name: "windows-py39"
-            python: "3.9"
-            os: windows-latest
-            tox_env: "py39-xdist"
-          - name: "windows-py310"
-            python: "3.10"
-            os: windows-latest
-            tox_env: "py310-xdist"
-          - name: "windows-py311"
-            python: "3.11"
-            os: windows-latest
-            tox_env: "py311"
-          - name: "windows-py312"
-            python: "3.12-dev"
-            os: windows-latest
-            tox_env: "py312"
-
-          - name: "ubuntu-py38"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "py38-lsof-numpy-pexpect"
-            use_coverage: true
-          - name: "ubuntu-py38-pluggy"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "py38-pluggymain-pylib-xdist"
-          - name: "ubuntu-py38-freeze"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "py38-freeze"
-          - name: "ubuntu-py39"
-            python: "3.9"
-            os: ubuntu-latest
-            tox_env: "py39-xdist"
-          - name: "ubuntu-py310"
-            python: "3.10"
-            os: ubuntu-latest
-            tox_env: "py310-xdist"
-          - name: "ubuntu-py311"
-            python: "3.11"
-            os: ubuntu-latest
-            tox_env: "py311"
-            use_coverage: true
-          - name: "ubuntu-py312"
-            python: "3.12-dev"
-            os: ubuntu-latest
-            tox_env: "py312"
-            use_coverage: true
-          - name: "ubuntu-pypy3"
-            python: "pypy-3.8"
-            os: ubuntu-latest
-            tox_env: "pypy3-xdist"
-
-          - name: "macos-py38"
-            python: "3.8"
-            os: macos-latest
-            tox_env: "py38-xdist"
-          - name: "macos-py39"
-            python: "3.9"
-            os: macos-latest
-            tox_env: "py39-xdist"
-            use_coverage: true
-          - name: "macos-py310"
-            python: "3.10"
-            os: macos-latest
-            tox_env: "py310-xdist"
-          - name: "macos-py312"
-            python: "3.12-dev"
-            os: macos-latest
-            tox_env: "py312-xdist"
-
-          - name: "plugins"
-            python: "3.9"
-            os: ubuntu-latest
-            tox_env: "plugins"
-
-          - name: "doctesting"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "doctesting"
-            use_coverage: true
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
-    - name: Download Package
-      uses: actions/download-artifact@v3
-      with:
-        name: Packages
-        path: dist
-
-    - name: Set up Python ${{ matrix.python }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python }}
-        check-latest: ${{ endsWith(matrix.python, '-dev') }}
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install tox coverage
-
-    - name: Test without coverage
-      if: "! matrix.use_coverage"
-      shell: bash
-      run: tox run -e ${{ matrix.tox_env }} --installpkg `find dist/*.tar.gz`
-
-    - name: Test with coverage
-      if: "matrix.use_coverage"
-      shell: bash
-      run: tox run -e ${{ matrix.tox_env }}-coverage --installpkg `find dist/*.tar.gz`
-
-    - name: Generate coverage report
-      if: "matrix.use_coverage"
-      run: python -m coverage xml
-
-    - name: Upload coverage to Codecov
-      if: "matrix.use_coverage"
-      uses: codecov/codecov-action@v3
-      continue-on-error: true
-      with:
-        fail_ci_if_error: true
-        files: ./coverage.xml
-        verbose: true

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

@@ -1,57 +0,0 @@
-name: Update Plugin List
-
-on:
-  schedule:
-    # At 00:00 on Sunday.
-    # https://crontab.guru
-    - cron: '0 0 * * 0'
-  workflow_dispatch:
-
-# Set permissions at the job level.
-permissions: {}
-
-jobs:
-  update-plugin-list:
-    if: github.repository_owner == 'pytest-dev'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.11"
-          cache: pip
-      - name: requests-cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/pytest-plugin-list/
-          key: plugins-http-cache-${{ github.run_id }} # Can use time based key as well
-          restore-keys: plugins-http-cache-
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install packaging requests tabulate[widechars] tqdm requests-cache platformdirs
-
-
-      - name: Update Plugin List
-        run: python scripts/update-plugin-list.py
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
-        with:
-          commit-message: '[automated] Update plugin list'
-          author: 'pytest bot <pytestbot@users.noreply.github.com>'
-          branch: update-plugin-list/patch
-          delete-branch: true
-          branch-suffix: short-commit-hash
-          title: '[automated] Update plugin list'
-          body: '[automated] Update plugin list'

.gitignore

@@ -29,12 +29,10 @@ doc/*/_changelog_towncrier_draft.rst
 build/
 dist/
 *.egg-info
-htmlcov/
 issue/
 env/
 .env/
 .venv/
-/pythonenv*/
 3rdparty/
 .tox
 .cache
@@ -50,10 +48,6 @@ coverage.xml
 .project
 .settings
 .vscode
-__pycache__/
 
 # generated by pip
 pip-wheel-metadata/
-
-# pytest debug logs generated via --debug
-pytestdebug.log

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 19.10b0
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: 1.16.0
+    rev: v1.0.0
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==23.7.0]
+        additional_dependencies: [black==19.10b0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v2.2.3
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -18,58 +18,30 @@ repos:
         args: [--remove]
     -   id: check-yaml
     -   id: debug-statements
-        exclude: _pytest/(debugging|hookspec).py
+        exclude: _pytest/debugging.py
         language_version: python3
--   repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
-    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.1.0
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.7
     hooks:
     -   id: flake8
         language_version: python3
-        additional_dependencies:
-          - flake8-typing-imports==1.12.0
-          - flake8-docstrings==1.5.0
--   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
+        additional_dependencies: [flake8-typing-imports==1.3.0]
+-   repo: https://github.com/asottile/reorder_python_imports
+    rev: v1.4.0
     hooks:
     -   id: reorder-python-imports
-        args: ['--application-directories=.:src', --py38-plus]
+        args: ['--application-directories=.:src', --py3-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v1.18.0
     hooks:
     -   id: pyupgrade
-        args: [--py38-plus]
--   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.5.0
-    hooks:
-    -   id: setup-cfg-fmt
-        args: ["--max-py-version=3.12", "--include-version-classifiers"]
--   repo: https://github.com/pre-commit/pygrep-hooks
-    rev: v1.10.0
-    hooks:
-    -   id: python-use-type-annotations
+        args: [--py3-plus]
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.5.1
+    rev: v0.761  # NOTE: keep this in sync with setup.py.
     hooks:
     -   id: mypy
         files: ^(src/|testing/)
         args: []
-        additional_dependencies:
-          - iniconfig>=1.1.0
-          - attrs>=19.2.0
-          - packaging
-          - tomli
-          - 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
@@ -92,17 +64,9 @@ repos:
                 _code\.|
                 builtin\.|
                 code\.|
-                io\.|
+                io\.(BytesIO|saferepr|TerminalWriter)|
                 path\.local\.sysfind|
                 process\.|
-                std\.|
-                error\.|
-                xml\.
+                std\.
             )
         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
-        language: pygrep
-        entry: \bpy\.path\.local
-        types: [python]

.readthedocs.yml

@@ -1,22 +0,0 @@
-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
-
-build:
-  os: ubuntu-20.04
-  tools:
-    python: "3.9"
-  apt_packages:
-    - inkscape
-
-formats:
-  - epub
-  - pdf
-  - htmlzip

.travis.yml

@@ -0,0 +1,60 @@
+language: python
+dist: trusty
+python: '3.5.1'
+cache: false
+
+env:
+  global:
+    - PYTEST_ADDOPTS=-vv
+
+# setuptools-scm needs all tags in order to obtain a proper version
+git:
+  depth: false
+
+install:
+  - python -m pip install --upgrade --pre tox
+
+jobs:
+  include:
+    # Coverage for Python 3.5.{0,1} specific code, mostly typing related.
+    - env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference"
+      before_install:
+        # Work around https://github.com/jaraco/zipp/issues/40.
+        - python -m pip install -U 'setuptools>=34.4.0' virtualenv==16.7.9
+
+before_script:
+  - |
+    # Do not (re-)upload coverage with cron runs.
+    if [[ "$TRAVIS_EVENT_TYPE" = cron ]]; then
+      PYTEST_COVERAGE=0
+    fi
+  - |
+    if [[ "$PYTEST_COVERAGE" = 1 ]]; then
+      export COVERAGE_FILE="$PWD/.coverage"
+      export COVERAGE_PROCESS_START="$PWD/.coveragerc"
+      export _PYTEST_TOX_COVERAGE_RUN="coverage run -m"
+      export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
+    fi
+
+script: tox
+
+after_success:
+  - |
+    if [[ "$PYTEST_COVERAGE" = 1 ]]; then
+      env CODECOV_NAME="$TOXENV-$TRAVIS_OS_NAME" scripts/report-coverage.sh -F Travis
+    fi
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#pytest"
+    on_success: change
+    on_failure: change
+    skip_join: true
+  email:
+    - pytest-commit@python.org
+
+branches:
+  only:
+    - master
+    - /^\d+\.\d+\.x$/

AUTHORS

@@ -5,22 +5,14 @@ Contributors include::
 
 Aaron Coleman
 Abdeali JK
-Abdelrahman Elbehery
 Abhijeet Kasurde
 Adam Johnson
-Adam Stewart
 Adam Uhlir
 Ahn Ki-Wook
-Akhilesh Ramakrishnan
 Akiomi Kamakura
 Alan Velasco
-Alessio Izzo
-Alex Jones
-Alex Lambson
 Alexander Johnson
-Alexander King
 Alexei Kozlenok
-Alice Purcell
 Allan Feldman
 Aly Sivji
 Amir Elkess
@@ -29,9 +21,7 @@ Anders Hovmöller
 Andras Mitzki
 Andras Tim
 Andrea Cimatoribus
-Andreas Motl
 Andreas Zeidler
-Andrew Shapton
 Andrey Paramonov
 Andrzej Klajnert
 Andrzej Ostrowski
@@ -39,33 +29,24 @@ Andy Freeland
 Anthon van der Neut
 Anthony Shaw
 Anthony Sottile
-Anton Grinevich
 Anton Lodder
 Antony Lee
 Arel Cordero
-Arias Emmanuel
-Ariel Pillemer
 Armin Rigo
 Aron Coyle
 Aron Curzon
-Ashish Kurmi
 Aviral Verma
 Aviv Palivoda
-Babak Keyvani
 Barney Gale
-Ben Gartner
 Ben Webb
 Benjamin Peterson
 Bernard Pratz
-Bo Wu
 Bob Ippolito
 Brian Dorsey
-Brian Larsen
 Brian Maissy
 Brian Okken
 Brianna Laugher
 Bruno Oliveira
-Cal Jacobson
 Cal Leeming
 Carl Friedrich Bolz
 Carlos Jenkins
@@ -73,34 +54,23 @@ Ceridwen
 Charles Cloud
 Charles Machalow
 Charnjit SiNGH (CCSJ)
-Cheuk Ting Ho
-Chris Mahoney
 Chris Lamb
-Chris NeJame
-Chris Rose
-Chris Wheeler
 Christian Boelsen
 Christian Fetzer
 Christian Neumüller
 Christian Theunert
 Christian Tismer
-Christine Mecklenborg
 Christoph Buelter
 Christopher Dignam
 Christopher Gilling
-Claire Cecil
 Claudio Madotto
 CrazyMerlyn
-Cristian Vera
 Cyrus Maden
 Damian Skrzypczak
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
-Daniel Sánchez Castelló
-Daniel Valenzuela Zenteno
 Daniel Wandschneider
-Daniele Procida
 Danielle Jenkins
 Daniil Galiev
 Dave Hunt
@@ -110,49 +80,31 @@ David Paul Röthlisberger
 David Szotten
 David Vierra
 Daw-Ran Liou
-Debi Mishra
 Denis Kirisov
-Denivy Braiam Rück
 Dhiren Serai
 Diego Russo
 Dmitry Dygalo
 Dmitry Pribysh
-Dominic Mortlock
 Duncan Betts
 Edison Gustavo Muenz
 Edoardo Batini
-Edson Tadeu M. Manoel
 Eduardo Schettino
 Eli Boyarski
 Elizaveta Shashkova
-Éloi Rivard
 Endre Galaczi
 Eric Hunsberger
-Eric Liu
 Eric Siegerman
-Erik Aronesty
-Erik Hasse
 Erik M. Bray
 Evan Kepner
-Evgeny Seliverstov
 Fabien Zarifian
 Fabio Zadrozny
-Felix Hofstätter
-Felix Nieuwenhuizen
 Feng Ma
 Florian Bruhin
-Florian Dahlitz
 Floris Bruynooghe
-Fraser Stark
-Gabriel Landau
 Gabriel Reis
-Garvit Shubham
 Gene Wood
 George Kussumoto
 Georgy Dyuldin
-Gergely Kalmár
-Gleb Nikonorov
-Graeme Smecher
 Graham Horler
 Greg Price
 Gregory Lee
@@ -161,7 +113,6 @@ Grigorii Eremeev (budulianin)
 Guido Wesdorp
 Guoqiang Zhang
 Harald Armin Massa
-Harshna
 Henk-Jaap Wagenaar
 Holger Kohr
 Hugo van Kemenade
@@ -170,15 +121,9 @@ Ian Bicking
 Ian Lesperance
 Ilya Konstantinov
 Ionuț Turturică
-Isaac Virshup
-Israel Fruchter
-Itxaso Aizpurua
 Iwan Briquemont
 Jaap Broekhuizen
-Jake VanderPlas
-Jakob van Santen
 Jakub Mitoraj
-James Bourbeau
 Jan Balster
 Janne Vanhala
 Jason R. Coombs
@@ -188,9 +133,7 @@ Jeff Rackauckas
 Jeff Widman
 Jenni Rinker
 John Eddie Ayson
-John Litborn
 John Towler
-Jon Parise
 Jon Sonesen
 Jonas Obrist
 Jordan Guymon
@@ -200,32 +143,20 @@ Joseph Hunkeler
 Josh Karpel
 Joshua Bronson
 Jurko Gospodnetić
-Justice Ndou
 Justyna Janczyszyn
 Kale Kundert
-Kamran Ahmad
-Kenny Y
 Karl O. Pinc
-Karthikeyan Singaravelan
 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
 Lawrence Mitchell
 Lee Kamentsky
 Lev Maximov
-Lewis Cowles
 Llandy Riveron Del Risco
 Loic Esteve
 Lukas Bednar
@@ -235,14 +166,12 @@ Maho
 Maik Figura
 Mandeep Bhutani
 Manuel Krebber
-Marc Mueller
 Marc Schlaich
 Marcelo Duarte Trevisani
 Marcin Bachry
 Marco Gorelli
 Mark Abramowitz
 Mark Dickinson
-Marko Pacak
 Markus Unterwaditzer
 Martijn Faassen
 Martin Altmayer
@@ -254,7 +183,6 @@ Matt Duck
 Matt Williams
 Matthias Hafner
 Maxim Filipenko
-Maximilian Cosmo Sitter
 mbyt
 Michael Aquilina
 Michael Birtwell
@@ -263,13 +191,9 @@ Michael Goerz
 Michael Krebs
 Michael Seifert
 Michal Wajszczuk
-Michał Zięba
-Mickey Pashov
 Mihai Capotă
-Mihail Milushev
 Mike Hoyle (hoylemd)
 Mike Lundy
-Milan Lesnek
 Miro Hrončok
 Nathaniel Compton
 Nathaniel Waisbrot
@@ -280,128 +204,79 @@ Nicholas Murphy
 Niclas Olofsson
 Nicolas Delaby
 Nikolay Kondratyev
-Nipunn Koorapati
 Oleg Pidsadnyi
 Oleg Sushchenko
-Olga Matoula
 Oliver Bestwalter
 Omar Kohl
 Omer Hadari
 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
-Prakhar Gurunani
-Prashant Anand
-Prashant Sharma
 Pulkit Goyal
 Punyashloka Biswal
 Quentin Pradet
-q0w
 Ralf Schmitt
 Ralph Giles
-Ram Rachum
 Ran Benita
 Raphael Castaneda
 Raphael Pierzina
-Rafal Semik
 Raquel Alegre
 Ravi Chandra
-Reagan Lee
 Robert Holt
-Roberto Aldera
 Roberto Polli
 Roland Puntaier
 Romain Dorgueil
 Roman Bolshakov
 Ronny Pfannschmidt
 Ross Lawley
-Ruaridh Williamson
 Russel Winder
-Ryan Puddephatt
 Ryan Wooden
-Sadra Barikbin
-Saiprasad Kale
-Samuel Colvin
 Samuel Dion-Girardeau
 Samuel Searles-Bryant
 Samuele Pedroni
-Sanket Duthade
 Sankt Petersbug
-Saravanan Padmanaban
-Sean Malloy
 Segev Finer
 Serhii Mozghovyi
 Seth Junot
-Shantanu Jain
-Sharad Nair
-Shubham Adep
-Simon Blanchard
 Simon Gomizelj
-Simon Holesch
-Simon Kerr
 Skylar Downes
 Srinivas Reddy Thatiparthy
-Stefaan Lippens
 Stefan Farmbauer
 Stefan Scherfke
 Stefan Zimmermann
-Stefanie Molin
 Stefano Taschini
 Steffen Allner
 Stephan Obermann
 Sven-Hendrik Haase
-Sylvain Marié
 Tadek Teleżyński
 Takafumi Arakaki
-Taneli Hukkinen
-Tanvi Mehta
-Tanya Agarwal
 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
-Tushar Sadhwani
 Tyler Goodlet
-Tyler Smart
 Tzu-ping Chung
 Vasily Kuznetsov
 Victor Maryama
-Victor Rodriguez
 Victor Uriarte
 Vidar T. Fauske
-Vijay Arora
 Virgil Dupras
 Vitaly Lashmanov
-Vivaan Verma
 Vlad Dragos
-Vlad Radziuk
 Vladyslav Rachek
 Volodymyr Piskun
 Wei Lin
@@ -412,14 +287,6 @@ Wouter van Ackooy
 Xixi Zhao
 Xuan Luong
 Xuecong Liao
-Yannick Péroux
 Yoav Caspi
-Yuliang Shao
-Yusuke Kadowaki
-Yuval Shimon
 Zac Hatfield-Dodds
-Zachary Kneupper
-Zachary OBrien
-Zhouxin Qiu
 Zoltán Máté
-Zsolt Cserna

CHANGELOG.rst

@@ -2,6 +2,6 @@
 Changelog
 =========
 
-The pytest CHANGELOG is located `here <https://docs.pytest.org/en/stable/changelog.html>`__.
+The pytest CHANGELOG is located `here <https://docs.pytest.org/en/latest/changelog.html>`__.
 
-The source document can be found at: https://github.com/pytest-dev/pytest/blob/main/doc/en/changelog.rst
+The source document can be found at: https://github.com/pytest-dev/pytest/blob/master/doc/en/changelog.rst

CONTRIBUTING.rst

@@ -2,7 +2,7 @@
 Contribution getting started
 ============================
 
-Contributions are highly welcomed and appreciated.  Every little bit of help counts,
+Contributions are highly welcomed and appreciated.  Every little help counts,
 so do not hesitate!
 
 .. contents::
@@ -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 `"good first issue" issues <https://github.com/pytest-dev/pytest/labels/good%20first%20issue>`_
-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.
@@ -88,40 +86,9 @@ without using a local copy.  This can be convenient for small fixes.
 
         $ tox -e docs
 
-    The built documentation should be available in ``doc/en/_build/html``,
-    where 'en' refers to the documentation language.
-
-Pytest has an API reference which in large part is
-`generated automatically <https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html>`_
-from the docstrings of the documented items. Pytest uses the
-`Sphinx docstring format <https://sphinx-rtd-tutorial.readthedocs.io/en/latest/docstrings.html>`_.
-For example:
-
-.. code-block:: python
-
-    def my_function(arg: ArgType) -> Foo:
-        """Do important stuff.
-
-        More detailed info here, in separate paragraphs from the subject line.
-        Use proper sentences -- start sentences with capital letters and end
-        with periods.
-
-        Can include annotated documentation:
-
-        :param short_arg: An argument which determines stuff.
-        :param long_arg:
-            A long explanation which spans multiple lines, overflows
-            like this.
-        :returns: The result.
-        :raises ValueError:
-            Detailed information when this can happen.
-
-        .. versionadded:: 6.0
-
-        Including types into the annotations above is not necessary when
-        type-hinting is being used (as in this example).
-        """
+    The built documentation should be available in ``doc/en/_build/html``.
 
+    Where 'en' refers to the documentation language.
 
 .. _submitplugin:
 
@@ -133,6 +100,8 @@ in repositories living under the ``pytest-dev`` organisations:
 
 - `pytest-dev on GitHub <https://github.com/pytest-dev>`_
 
+- `pytest-dev on Bitbucket <https://bitbucket.org/pytest-dev>`_
+
 All pytest-dev Contributors team members have write access to all contained
 repositories.  Pytest core and plugins are generally developed
 using `pull requests`_ to respective repositories.
@@ -148,21 +117,20 @@ You can submit your plugin by subscribing to the `pytest-dev mail list
 mail pointing to your existing pytest plugin repository which must have
 the following:
 
-- PyPI presence with packaging metadata that contains a ``pytest-``
+- PyPI presence with a ``setup.py`` that contains a license, ``pytest-``
   prefixed name, version number, authors, short and long description.
 
-- a  `tox configuration <https://tox.readthedocs.io/en/latest/config.html#configuration-discovery>`_
-  for running tests using `tox <https://tox.readthedocs.io>`_.
+- a ``tox.ini`` for running tests using `tox <https://tox.readthedocs.io>`_.
 
-- a ``README`` describing how to use the plugin and on which
+- a ``README.txt`` describing how to use the plugin and on which
   platforms it runs.
 
-- a ``LICENSE`` file containing the licensing information, with
-  matching info in its packaging metadata.
+- a ``LICENSE.txt`` file or equivalent containing the licensing
+  information, with matching info in ``setup.py``.
 
 - an issue tracker for bug reports and enhancement requests.
 
-- a `changelog <https://keepachangelog.com/>`_.
+- a `changelog <http://keepachangelog.com/>`_
 
 If no contributor strongly objects and two agree, the repository can then be
 transferred to the ``pytest-dev`` organisation.
@@ -197,20 +165,17 @@ Short version
 ~~~~~~~~~~~~~
 
 #. Fork the repository.
-#. Fetch tags from upstream if necessary (if you cloned only main `git fetch --tags https://github.com/pytest-dev/pytest`).
 #. Enable and install `pre-commit <https://pre-commit.com>`_ to ensure style-guides and code checks are followed.
 #. Follow **PEP-8** for naming and `black <https://github.com/psf/black>`_ for formatting.
 #. Tests are run using ``tox``::
 
-    tox -e linting,py39
+    tox -e linting,py37
 
    The test environments above are usually enough to cover most cases locally.
 
 #. Write a ``changelog`` entry: ``changelog/2574.bugfix.rst``, use issue id number
-   and one of ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``,
-   ``breaking``, ``vendor`` or ``trivial`` for the issue type.
-
-
+   and one of ``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or
+   ``trivial`` for the issue type.
 #. Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please
    add yourself to the ``AUTHORS`` file, in alphabetical order.
 
@@ -224,7 +189,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:
 
@@ -237,24 +202,20 @@ Here is a simple overview, with pytest-specific bits:
 
     $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git
     $ cd pytest
-    $ git fetch --tags https://github.com/pytest-dev/pytest
-    # now, create your own branch off "main":
+    # now, create your own branch off "master":
 
-        $ git checkout -b your-bugfix-branch-name main
+        $ git checkout -b your-bugfix-branch-name master
 
    Given we have "major.minor.micro" version numbers, bug fixes will usually
    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
 
-#. Install `pre-commit <https://pre-commit.com>`_ and its hook on the pytest repo::
+#. Install `pre-commit <https://pre-commit.com>`_ and its hook on the pytest repo:
+
+   **Note: pre-commit must be installed as admin, as it will not function otherwise**::
 
      $ pip install --user pre-commit
      $ pre-commit install
@@ -268,30 +229,30 @@ Here is a simple overview, with pytest-specific bits:
 
    Tox is used to run all the tests and will automatically setup virtualenvs
    to run the tests in.
-   (will implicitly use https://virtualenv.pypa.io/en/latest/)::
+   (will implicitly use http://www.virtualenv.org/en/latest/)::
 
     $ pip install tox
 
 #. Run all the tests
 
-   You need to have Python 3.8 or later available in your system.  Now
+   You need to have Python 3.7 available in your system.  Now
    running tests is as simple as issuing this command::
 
-    $ tox -e linting,py39
+    $ tox -e linting,py37
 
-   This command will run tests via the "tox" tool against Python 3.9
+   This command will run tests via the "tox" tool against Python 3.7
    and also perform "lint" coding-style checks.
 
 #. You can now edit your local working copy and run the tests again as necessary. Please follow PEP-8 for naming.
 
-   You can pass different options to ``tox``. For example, to run tests on Python 3.9 and pass options to pytest
+   You can pass different options to ``tox``. For example, to run tests on Python 3.7 and pass options to pytest
    (e.g. enter pdb on failure) to pytest you can do::
 
-    $ tox -e py39 -- --pdb
+    $ tox -e py37 -- --pdb
 
-   Or to only run tests in a particular test module on Python 3.9::
+   Or to only run tests in a particular test module on Python 3.7::
 
-    $ tox -e py39 -- testing/test_config.py
+    $ tox -e py37 -- testing/test_config.py
 
 
    When committing, ``pre-commit`` will re-format the files if necessary.
@@ -308,45 +269,45 @@ Here is a simple overview, with pytest-specific bits:
 
        $ pytest testing/test_config.py
 
-#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
-   where *issueid* is the number of the issue related to the change and *type* is one of
-   ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor``
-   or ``trivial``. You may skip creating the changelog entry if the change doesn't affect the
-   documented behaviour of pytest.
-
-#. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
 
 #. Commit and push once your tests pass and you are happy with your change(s)::
 
     $ git commit -a -m "<commit message>"
     $ git push -u
 
+#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
+   where *issueid* is the number of the issue related to the change and *type* is one of
+   ``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or ``trivial``. You may not create a
+   changelog entry if the change doesn't affect the documented behaviour of Pytest.
+
+#. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
+
 #. Finally, submit a pull request through the GitHub website using this data::
 
     head-fork: YOUR_GITHUB_USERNAME/pytest
     compare: your-branch-name
 
     base-fork: pytest-dev/pytest
-    base: main
+    base: master
 
 
 Writing Tests
-~~~~~~~~~~~~~
+----------------------------
 
-Writing tests for plugins or for pytest itself is often done using the `pytester fixture <https://docs.pytest.org/en/stable/reference/reference.html#pytester>`_, as a "black-box" test.
+Writing tests for plugins or for pytest itself is often done using the `testdir fixture <https://docs.pytest.org/en/latest/reference.html#testdir>`_, as a "black-box" test.
 
 For example, to ensure a simple test passes you can write:
 
 .. code-block:: python
 
-    def test_true_assertion(pytester):
-        pytester.makepyfile(
+    def test_true_assertion(testdir):
+        testdir.makepyfile(
             """
             def test_foo():
                 assert True
         """
         )
-        result = pytester.runpytest()
+        result = testdir.runpytest()
         result.assert_outcomes(failed=0, passed=1)
 
 
@@ -355,14 +316,14 @@ Alternatively, it is possible to make checks based on the actual output of the t
 
 .. code-block:: python
 
-    def test_true_assertion(pytester):
-        pytester.makepyfile(
+    def test_true_assertion(testdir):
+        testdir.makepyfile(
             """
             def test_foo():
                 assert False
         """
         )
-        result = pytester.runpytest()
+        result = testdir.runpytest()
         result.stdout.fnmatch_lines(["*assert False*", "*1 failed*"])
 
 When choosing a file where to write a new test, take a look at the existing files and see if there's
@@ -370,128 +331,16 @@ one file which looks like a good fit. For example, a regression test about a bug
 should go into ``test_cacheprovider.py``, given that this option is implemented in ``cacheprovider.py``.
 If in doubt, go ahead and open a PR with your best guess and we can discuss this over the code.
 
+
 Joining the Development Team
 ----------------------------
 
 Anyone who has successfully seen through a pull request which did not
 require any extra work from the development team to merge will
 themselves gain commit access if they so wish (if we forget to ask please send a friendly
-reminder).  This does not mean there is any change in your contribution workflow:
+reminder).  This does not mean your workflow to contribute changes,
 everyone goes through the same pull-request-and-review process and
 no-one merges their own pull requests unless already approved.  It does however mean you can
 participate in the development process more fully since you can merge
 pull requests from other contributors yourself after having reviewed
 them.
-
-
-Backporting bug fixes for the next patch release
-------------------------------------------------
-
-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.
-
-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
-   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:
-
-    nicoddemus merged commit 0f8b462 into pytest-dev:main
-
-#. ``git cherry-pick -x -m1 REVISION`` # use the revision you found above (``0f8b462``).
-
-#. Open a PR targeting ``1.2.x``:
-
-   * Prefix the message with ``[1.2.x]``.
-   * Delete the PR body, it usually contains a duplicate commit message.
-
-
-Who does the backporting
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-As mentioned above, bugs should first be fixed on ``main`` (except in rare occasions
-that a bug only happens in a previous release). So, who should do the backport procedure described
-above?
-
-1. If the bug was fixed by a core developer, it is the main responsibility of that core developer
-   to do the backport.
-2. However, often the merge is done by another maintainer, in which case it is nice of them to
-   do the backport procedure if they have the time.
-3. For bugs submitted by non-maintainers, it is expected that a core developer will to do
-   the backport, normally the one that merged the PR on ``main``.
-4. If a non-maintainers notices a bug which is fixed on ``main`` but has not been backported
-   (due to maintainers forgetting to apply the *needs backport* label, or just plain missing it),
-   they are also welcome to open a PR with the backport. The procedure is simple and really
-   helps with the maintenance of the project.
-
-All the above are not rules, but merely some guidelines/suggestions on what we should expect
-about backports.
-
-Handling stale issues/PRs
--------------------------
-
-Stale issues/PRs are those where pytest contributors have asked for questions/changes
-and the authors didn't get around to answer/implement them yet after a somewhat long time, or
-the discussion simply died because people seemed to lose interest.
-
-There are many reasons why people don't answer questions or implement requested changes:
-they might get busy, lose interest, or just forget about it,
-but the fact is that this is very common in open source software.
-
-The pytest team really appreciates every issue and pull request, but being a high-volume project
-with many issues and pull requests being submitted daily, we try to reduce the number of stale
-issues and PRs by regularly closing them. When an issue/pull request is closed in this manner,
-it is by no means a dismissal of the topic being tackled by the issue/pull request, but it
-is just a way for us to clear up the queue and make the maintainers' work more manageable. Submitters
-can always reopen the issue/pull request in their own time later if it makes sense.
-
-When to close
-~~~~~~~~~~~~~
-
-Here are a few general rules the maintainers use deciding when to close issues/PRs because
-of lack of inactivity:
-
-* Issues labeled ``question`` or ``needs information``: closed after 14 days inactive.
-* Issues labeled ``proposal``: closed after six months inactive.
-* Pull requests: after one month, consider pinging the author, update linked issue, or consider closing. For pull requests which are nearly finished, the team should consider finishing it up and merging it.
-
-The above are **not hard rules**, but merely **guidelines**, and can be (and often are!) reviewed on a case-by-case basis.
-
-Closing pull requests
-~~~~~~~~~~~~~~~~~~~~~
-
-When closing a Pull Request, it needs to be acknowledging the time, effort, and interest demonstrated by the person which submitted it. As mentioned previously, it is not the intent of the team to dismiss a stalled pull request entirely but to merely to clear up our queue, so a message like the one below is warranted when closing a pull request that went stale:
-
-    Hi <contributor>,
-
-    First of all, we would like to thank you for your time and effort on working on this, the pytest team deeply appreciates it.
-
-    We noticed it has been awhile since you have updated this PR, however. pytest is a high activity project, with many issues/PRs being opened daily, so it is hard for us maintainers to track which PRs are ready for merging, for review, or need more attention.
-
-    So for those reasons we, think it is best to close the PR for now, but with the only intention to clean up our queue, it is by no means a rejection of your changes. We still encourage you to re-open this PR (it is just a click of a button away) when you are ready to get back to it.
-
-    Again we appreciate your time for working on this, and hope you might get back to this at a later time!
-
-    <bye>
-
-Closing Issues
---------------
-
-When a pull request is submitted to fix an issue, add text like ``closes #XYZW`` to the PR description and/or commits (where ``XYZW`` is the issue number). See the `GitHub docs <https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword>`_ for more information.
-
-When an issue is due to user error (e.g. misunderstanding of a functionality), please politely explain to the user why the issue raised is really a non-issue and ask them to close the issue if they have no further questions. If the original requestor is unresponsive, the issue will be handled as described in the section `Handling stale issues/PRs`_ above.

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2004 Holger Krekel and others
+Copyright (c) 2004-2020 Holger Krekel and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.rst

@@ -1,7 +1,6 @@
-.. image:: https://github.com/pytest-dev/pytest/raw/main/doc/en/img/pytest_logo_curves.svg
-   :target: https://docs.pytest.org/en/stable/
+.. image:: https://docs.pytest.org/en/latest/_static/pytest1.png
+   :target: https://docs.pytest.org/en/latest/
    :align: center
-   :height: 200
    :alt: pytest
 
 
@@ -16,16 +15,15 @@
 .. image:: https://img.shields.io/pypi/pyversions/pytest.svg
     :target: https://pypi.org/project/pytest/
 
-.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/main/graph/badge.svg
+.. image:: https://codecov.io/gh/pytest-dev/pytest/branch/master/graph/badge.svg
     :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://travis-ci.org/pytest-dev/pytest.svg?branch=master
+    :target: https://travis-ci.org/pytest-dev/pytest
 
-.. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
-   :target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/main
-   :alt: pre-commit.ci status
+.. image:: https://dev.azure.com/pytest-dev/pytest/_apis/build/status/pytest-CI?branchName=master
+    :target: https://dev.azure.com/pytest-dev/pytest
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :target: https://github.com/psf/black
@@ -37,15 +35,6 @@
     :target: https://pytest.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
 
-.. image:: https://img.shields.io/badge/Discord-pytest--dev-blue
-    :target: https://discord.com/invite/pytest-dev
-    :alt: Discord
-
-.. image:: https://img.shields.io/badge/Libera%20chat-%23pytest-orange
-    :target: https://web.libera.chat/#pytest
-    :alt: Libera chat
-
-
 The ``pytest`` framework makes it easy to write small tests, yet
 scales to support complex functional testing for applications and libraries.
 
@@ -82,33 +71,33 @@ To execute it::
     ========================== 1 failed in 0.04 seconds ===========================
 
 
-Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <https://docs.pytest.org/en/stable/getting-started.html#our-first-test-run>`_ for more examples.
+Due to ``pytest``'s detailed assertion introspection, only plain ``assert`` statements are used. See `getting-started <https://docs.pytest.org/en/latest/getting-started.html#our-first-test-run>`_ for more examples.
 
 
 Features
 --------
 
-- Detailed info on failing `assert statements <https://docs.pytest.org/en/stable/how-to/assert.html>`_ (no need to remember ``self.assert*`` names)
+- Detailed info on failing `assert statements <https://docs.pytest.org/en/latest/assert.html>`_ (no need to remember ``self.assert*`` names);
 
 - `Auto-discovery
-  <https://docs.pytest.org/en/stable/explanation/goodpractices.html#python-test-discovery>`_
-  of test modules and functions
+  <https://docs.pytest.org/en/latest/goodpractices.html#python-test-discovery>`_
+  of test modules and functions;
 
-- `Modular fixtures <https://docs.pytest.org/en/stable/explanation/fixtures.html>`_ for
-  managing small or parametrized long-lived test resources
+- `Modular fixtures <https://docs.pytest.org/en/latest/fixture.html>`_ for
+  managing small or parametrized long-lived test resources;
 
-- Can run `unittest <https://docs.pytest.org/en/stable/how-to/unittest.html>`_ (or trial),
-  `nose <https://docs.pytest.org/en/stable/how-to/nose.html>`_ test suites out of the box
+- Can run `unittest <https://docs.pytest.org/en/latest/unittest.html>`_ (or trial),
+  `nose <https://docs.pytest.org/en/latest/nose.html>`_ test suites out of the box;
 
-- Python 3.8+ or PyPy3
+- Python 3.5+ and PyPy3;
 
-- Rich plugin architecture, with over 850+ `external plugins <https://docs.pytest.org/en/latest/reference/plugin_list.html>`_ and thriving community
+- Rich plugin architecture, with over 315+ `external plugins <http://plugincompat.herokuapp.com>`_ and thriving community;
 
 
 Documentation
 -------------
 
-For full documentation, including installation, tutorials and PDF documents, please see https://docs.pytest.org/en/stable/.
+For full documentation, including installation, tutorials and PDF documents, please see https://docs.pytest.org/en/latest/.
 
 
 Bugs/Requests
@@ -120,7 +109,7 @@ Please use the `GitHub issue tracker <https://github.com/pytest-dev/pytest/issue
 Changelog
 ---------
 
-Consult the `Changelog <https://docs.pytest.org/en/stable/changelog.html>`__ page for fixes and enhancements of each version.
+Consult the `Changelog <https://docs.pytest.org/en/latest/changelog.html>`__ page for fixes and enhancements of each version.
 
 
 Support pytest
@@ -160,8 +149,8 @@ Tidelift will coordinate the fix and disclosure.
 License
 -------
 
-Copyright Holger Krekel and others, 2004.
+Copyright Holger Krekel and others, 2004-2020.
 
 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
+.. _`MIT`: https://github.com/pytest-dev/pytest/blob/master/LICENSE

RELEASING.rst

@@ -5,115 +5,33 @@ Our current policy for releasing is to aim for a bug-fix release every few weeks
 is to get fixes and new features out instead of trying to cram a ton of features into a release and by consequence
 taking a lot of time to make a new one.
 
-The git commands assume the following remotes are setup:
-
-* ``origin``: your own fork of the repository.
-* ``upstream``: the ``pytest-dev/pytest`` official repository.
-
 Preparing: Automatic Method
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 We have developed an automated workflow for releases, that uses GitHub workflows and is triggered
-by `manually running <https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow>`__
-the `prepare-release-pr workflow <https://github.com/pytest-dev/pytest/actions/workflows/prepare-release-pr.yml>`__
-on GitHub Actions.
+by opening an issue or issuing a comment one.
 
-The automation will decide the new version number based on the following criteria:
+The comment must be in the form::
 
-- If the "major release" input is set to "yes", release a new major release
-  (e.g. 7.0.0 -> 8.0.0)
-- If there are any ``.feature.rst`` or ``.breaking.rst`` files in the
-  ``changelog`` directory, release a new minor release (e.g. 7.0.0 -> 7.1.0)
-- Otherwise, release a bugfix release (e.g. 7.0.0 -> 7.0.1)
-- If the "prerelease" input is set, append the string to the version number
-  (e.g. 7.0.0 -> 8.0.0rc1), if "major" is set, and "prerelease" is set to `rc1`)
+    @pytestbot please prepare release from BRANCH
 
-Bug-fix and minor releases
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+Where ``BRANCH`` is ``master`` or one of the maintenance branches.
 
-Bug-fix and minor releases are always done from a maintenance branch. First,
-consider double-checking the ``changelog`` directory to see if there are any
-breaking changes or new features.
-
-For a new minor release, first create a new maintenance branch from ``main``::
-
-     git fetch upstream
-     git branch 7.1.x upstream/main
-     git push upstream 7.1.x
-
-Then, trigger the workflow with the following inputs:
-
-- branch: **7.1.x**
-- major release: **no**
-- prerelease: empty
-
-Or via the commandline using `GitHub's cli <https://github.com/cli/cli>`__::
-
-    gh workflow run prepare-release-pr.yml -f branch=7.1.x -f major=no -f prerelease=
-
-Where ``7.1.x`` is the maintenance branch for the ``7.1`` series. The automated
-workflow will publish a PR for a branch ``release-7.1.0``.
-
-Similarly, for a bug-fix release, use the existing maintenance branch and
-trigger the workflow with e.g. ``branch: 7.0.x`` to get a new ``release-7.0.1``
-PR.
-
-Major releases
-^^^^^^^^^^^^^^
-
-1. Create a new maintenance branch from ``main``::
-
-        git fetch upstream
-        git branch 8.0.x upstream/main
-        git push upstream 8.0.x
-
-2. Trigger the workflow with the following inputs:
-
-   - branch: **8.0.x**
-   - major release: **yes**
-   - prerelease: empty
-
-Or via the commandline::
-
-    gh workflow run prepare-release-pr.yml -f branch=8.0.x -f major=yes -f prerelease=
-
-The automated workflow will publish a PR for a branch ``release-8.0.0``.
-
-At this point on, this follows the same workflow as other maintenance branches: bug-fixes are merged
-into ``main`` and ported back to the maintenance branch, even for release candidates.
-
-Release candidates
-^^^^^^^^^^^^^^^^^^
-
-To release a release candidate, set the "prerelease" input to the version number
-suffix to use. To release a ``8.0.0rc1``, proceed like under "major releases", but set:
-
-- branch: 8.0.x
-- major release: yes
-- prerelease: **rc1**
-
-Or via the commandline::
-
-    gh workflow run prepare-release-pr.yml -f branch=8.0.x -f major=yes -f prerelease=rc1
-
-The automated workflow will publish a PR for a branch ``release-8.0.0rc1``.
-
-**A note about release candidates**
-
-During release candidates we can merge small improvements into
-the maintenance branch before releasing the final major version, however we must take care
-to avoid introducing big changes at this stage.
+After that, the workflow should publish a PR and notify that it has done so as a comment
+in the original issue.
 
 Preparing: Manual Method
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-**Important**: pytest releases must be prepared on **Linux** because the docs and examples expect
-to be executed on that platform.
+.. important::
+
+    pytest releases must be prepared on **Linux** because the docs and examples expect
+    to be executed on that platform.
 
 To release a version ``MAJOR.MINOR.PATCH``, follow these steps:
 
-#. For major and minor releases, create a new branch ``MAJOR.MINOR.x`` from
-   ``upstream/main`` and push it to ``upstream``.
+#. For major and minor releases, create a new branch ``MAJOR.MINOR.x`` from the
+   latest ``master`` and push it to the ``pytest-dev/pytest`` repo.
 
 #. Create a branch ``release-MAJOR.MINOR.PATCH`` from the ``MAJOR.MINOR.x`` branch.
 
@@ -133,32 +51,23 @@ Releasing
 
 Both automatic and manual processes described above follow the same steps from this point onward.
 
-#. After all tests pass and the PR has been approved, trigger the ``deploy`` job
-   in https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml, using the ``release-MAJOR.MINOR.PATCH`` branch
-   as source.
+#. After all tests pass and the PR has been approved, tag the release commit
+   in the ``MAJOR.MINOR.x`` branch and push it. This will publish to PyPI::
 
-   This job will require approval from ``pytest-dev/core``, after which it will publish to PyPI
-   and tag the repository.
+     git tag MAJOR.MINOR.PATCH
+     git push git@github.com:pytest-dev/pytest.git MAJOR.MINOR.PATCH
 
-#. Merge the PR. **Make sure it's not squash-merged**, so that the tagged commit ends up in the main branch.
+   Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
 
-#. Cherry-pick the CHANGELOG / announce files to the ``main`` branch::
+#. Merge the PR.
 
-       git fetch upstream
-       git checkout upstream/main -b cherry-pick-release
-       git cherry-pick -x -m1 upstream/MAJOR.MINOR.x
+#. Cherry-pick the CHANGELOG / announce files to the ``master`` branch::
 
-#. 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
-   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 fetch --all --prune
+       git checkout origin/master -b cherry-pick-release
+       git cherry-pick --no-commit -m1 origin/MAJOR.MINOR.x
+       git checkout origin/master -- changelog
+       git commit  # no arguments
 
 #. Send an email announcement with the contents from::
 

TIDELIFT.rst

@@ -24,8 +24,8 @@ members of the `contributors team`_ interested in receiving funding.
 The current list of contributors receiving funding are:
 
 * `@asottile`_
+* `@blueyed`_
 * `@nicoddemus`_
-* `@The-Compiler`_
 
 Contributors interested in receiving a part of the funds just need to submit a PR adding their
 name to the list. Contributors that want to stop receiving the funds should also submit a PR
@@ -56,5 +56,5 @@ funds. Just drop a line to one of the `@pytest-dev/tidelift-admins`_ or use the
 .. _`agreement`: https://tidelift.com/docs/lifting/agreement
 
 .. _`@asottile`: https://github.com/asottile
+.. _`@blueyed`: https://github.com/blueyed
 .. _`@nicoddemus`: https://github.com/nicoddemus
-.. _`@The-Compiler`: https://github.com/The-Compiler

bench/unit_test.py

@@ -1,13 +0,0 @@
-from unittest import TestCase  # noqa: F401
-
-for i in range(15000):
-    exec(
-        f"""
-class Test{i}(TestCase):
-    @classmethod
-    def setUpClass(cls): pass
-    def test_1(self): pass
-    def test_2(self): pass
-    def test_3(self): pass
-"""
-    )

bench/xunit.py

@@ -1,11 +0,0 @@
-for i in range(5000):
-    exec(
-        f"""
-class Test{i}:
-    @classmethod
-    def setup_class(cls): pass
-    def test_1(self): pass
-    def test_2(self): pass
-    def test_3(self): pass
-"""
-    )

changelog/10441.feature.rst

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

changelog/10447.bugfix.rst

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

changelog/10465.deprecation.rst

@@ -1 +0,0 @@
-Test functions returning a value other than None will now issue a :class:`pytest.PytestWarning` instead of :class:`pytest.PytestRemovedIn8Warning`, meaning this will stay a warning instead of becoming an error in the future.

changelog/10617.feature.rst

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

changelog/10701.bugfix.rst

@@ -1,2 +0,0 @@
-:meth:`pytest.WarningsRecorder.pop` will return the most-closely-matched warning in the list,
-rather than the first warning which is an instance of the requested type.

changelog/11011.doc.rst

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

changelog/11091.doc.rst

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

changelog/11122.improvement.rst

@@ -1,6 +0,0 @@
-``pluggy>=1.2.0`` is now required.
-
-pytest now uses "new-style" hook wrappers internally, available since pluggy 1.2.0.
-See `pluggy's 1.2.0 changelog <https://pluggy.readthedocs.io/en/latest/changelog.html#pluggy-1-2-0-2023-06-21>`_ and the :ref:`updated docs <hookwrapper>` for details.
-
-Plugins which want to use new-style wrappers can do so if they require this version of pytest or later.

changelog/11137.breaking.rst

@@ -1,11 +0,0 @@
-:class:`pytest.Package` is no longer a :class:`pytest.Module` or :class:`pytest.File`.
-
-The ``Package`` collector node designates a Python package, that is, a directory with an `__init__.py` file.
-Previously ``Package`` was a subtype of ``pytest.Module`` (which represents a single Python module),
-the module being the `__init__.py` file.
-This has been deemed a design mistake (see :issue:`11137` and :issue:`7777` for details).
-
-The ``path`` property of ``Package`` nodes now points to the package directory instead of the ``__init__.py`` file.
-
-Note that a ``Module`` node for ``__init__.py`` (which is not a ``Package``) may still exist,
-if it is picked up during collection (e.g. if you configured :confval:`python_files` to include ``__init__.py`` files).

changelog/11146.bugfix.rst

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

changelog/11151.breaking.rst

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

changelog/11208.trivial.rst

@@ -1,2 +0,0 @@
-The (internal) ``FixtureDef.cached_result`` type has changed.
-Now the third item ``cached_result[2]``, when set, is an exception instance instead of an exception triplet.

changelog/11216.improvement.rst

@@ -1 +0,0 @@
-If a test is skipped from inside an :ref:`xunit setup fixture <classic xunit>`, the test summary now shows the test location instead of the fixture location.

changelog/11218.trivial.rst

@@ -1,5 +0,0 @@
-(This entry is meant to assist plugins which access private pytest internals to instantiate ``FixtureRequest`` objects.)
-
-:class:`~pytest.FixtureRequest` is now an abstract class which can't be instantiated directly.
-A new concrete ``TopRequest`` subclass of ``FixtureRequest`` has been added for the ``request`` fixture in test functions,
-as counterpart to the existing ``SubRequest`` subclass for the ``request`` fixture in fixture functions.

changelog/11227.improvement.rst

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

changelog/11239.bugfix.rst

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

changelog/11255.bugfix.rst

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

changelog/11277.bugfix.rst

@@ -1,2 +0,0 @@
-Fixed a bug that when there are multiple fixtures for an indirect parameter,
-the scope of the highest-scope fixture is picked for the parameter set, instead of that of the one with the narrowest scope.

changelog/11314.improvement.rst

@@ -1,2 +0,0 @@
-Logging to a file using the ``--log-file`` option will use ``--log-level``, ``--log-format`` and ``--log-date-format`` as fallback
-if ``--log-file-level``, ``--log-file-format`` and ``--log-file-date-format`` are not provided respectively.

changelog/11315.trivial.rst

@@ -1,3 +0,0 @@
-The :fixture:`pytester` fixture now uses the :fixture:`monkeypatch` fixture to manage the current working directory.
-If you use ``pytester`` in combination with :func:`monkeypatch.undo() <pytest.MonkeyPatch.undo>`, the CWD might get restored.
-Use :func:`monkeypatch.context() <pytest.MonkeyPatch.context>` instead.

changelog/11333.trivial.rst

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

changelog/11353.trivial.rst

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

changelog/11439.bugfix.rst

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

changelog/11447.improvement.rst

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

changelog/11456.bugfix.rst

@@ -1,4 +0,0 @@
-Parametrized tests now *really do* ensure that the ids given to each input are unique - for
-example, ``a, a, a0`` now results in ``a1, a2, a0`` instead of the previous (buggy) ``a0, a1, a0``.
-This necessarily means changing nodeids where these were previously colliding, and for
-readability adds an underscore when non-unique ids end in a number.

changelog/3664.deprecation.rst

@@ -1,3 +0,0 @@
-Applying a mark to a fixture function now issues a warning: marks in fixtures never had any effect, but it is a common user error to apply a mark to a fixture (for example ``usefixtures``) and expect it to work.
-
-This will become an error in the future.

changelog/7363.breaking.rst

@@ -1,22 +0,0 @@
-**PytestRemovedIn8Warning deprecation warnings are now errors by default.**
-
-Following our plan to remove deprecated features with as little disruption as
-possible, all warnings of type ``PytestRemovedIn8Warning`` now generate errors
-instead of warning messages by default.
-
-**The affected features will be effectively removed in pytest 8.1**, so please consult the
-:ref:`deprecations` section in the docs for directions on how to update existing code.
-
-In the pytest ``8.0.X`` series, it is possible to change the errors back into warnings as a
-stopgap measure by adding this to your ``pytest.ini`` file:
-
-.. code-block:: ini
-
-    [pytest]
-    filterwarnings =
-        ignore::pytest.PytestRemovedIn8Warning
-
-But this will stop working when pytest ``8.1`` is released.
-
-**If you have concerns** about the removal of a specific feature, please add a
-comment to :issue:`7363`.

changelog/7469.feature.rst

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

changelog/7966.bugfix.rst

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

changelog/8976.breaking.rst

@@ -1,5 +0,0 @@
-Running `pytest pkg/__init__.py` now collects the `pkg/__init__.py` file (module) only.
-Previously, it collected the entire `pkg` package, including other test files in the directory, but excluding tests in the `__init__.py` file itself
-(unless :confval:`python_files` was changed to allow `__init__.py` file).
-
-To collect the entire package, specify just the directory: `pytest pkg`.

changelog/9036.bugfix.rst

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

changelog/9288.breaking.rst

@@ -1,7 +0,0 @@
-:func:`pytest.warns <warns>` now re-emits unmatched warnings when the context
-closes -- previously it would consume all warnings, hiding those that were not
-matched by the function.
-
-While this is a new feature, we decided to announce this as a breaking change
-because many test suites are configured to error-out on warnings, and will
-therefore fail on the newly-re-emitted warnings.

changelog/README.rst

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

codecov.yml

@@ -1,6 +1 @@
-# reference: https://docs.codecov.io/docs/codecovyml-reference
-coverage:
-  status:
-    patch: true
-    project: false
-comment: false
+comment: off

doc/en/Makefile

@@ -27,6 +27,7 @@ REGENDOC_ARGS := \
 	--normalize "/in \d.\d\ds/in 0.12s/" \
 	--normalize "@/tmp/pytest-of-.*/pytest-\d+@PYTEST_TMPDIR@" \
 	--normalize "@pytest-(\d+)\\.[^ ,]+@pytest-\1.x.y@" \
+	--normalize "@(This is pytest version )(\d+)\\.[^ ,]+@\1\2.x.y@" \
 	--normalize "@py-(\d+)\\.[^ ,]+@py-\1.x.y@" \
 	--normalize "@pluggy-(\d+)\\.[.\d,]+@pluggy-\1.x.y@" \
 	--normalize "@hypothesis-(\d+)\\.[.\d,]+@hypothesis-\1.x.y@" \
@@ -34,10 +35,6 @@ REGENDOC_ARGS := \
 
 regen: REGENDOC_FILES:=*.rst */*.rst
 regen:
-# need to reset cachedir to the non-tox default
-	PYTHONDONTWRITEBYTECODE=1 \
-	PYTEST_ADDOPTS="-pno:hypothesis -p no:hypothesispytest -Wignore::pytest.PytestUnknownMarkWarning -o cache_dir=.pytest_cache" \
-	COLUMNS=76 \
-	regendoc --update ${REGENDOC_FILES} ${REGENDOC_ARGS}
+	PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS="-pno:hypothesis -Wignore::pytest.PytestUnknownMarkWarning" COLUMNS=76 regendoc --update ${REGENDOC_FILES} ${REGENDOC_ARGS}
 
 .PHONY: regen

doc/en/_templates/globaltoc.html

@@ -1,22 +1,16 @@
-<h3>Contents</h3>
+<h3><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
 
 <ul>
   <li><a href="{{ pathto('index') }}">Home</a></li>
-
-  <li><a href="{{ pathto('getting-started') }}">Get started</a></li>
-  <li><a href="{{ pathto('how-to/index') }}">How-to guides</a></li>
-  <li><a href="{{ pathto('reference/index') }}">Reference guides</a></li>
-  <li><a href="{{ pathto('explanation/index') }}">Explanation</a></li>
-  <li><a href="{{ pathto('contents') }}">Complete table of contents</a></li>
-  <li><a href="{{ pathto('example/index') }}">Library of examples</a></li>
-</ul>
-
-<h3>About the project</h3>
-
-<ul>
+  <li><a href="{{ pathto('getting-started') }}">Install</a></li>
+  <li><a href="{{ pathto('contents') }}">Contents</a></li>
+  <li><a href="{{ pathto('reference') }}">API Reference</a></li>
+  <li><a href="{{ pathto('example/index') }}">Examples</a></li>
+  <li><a href="{{ pathto('customize') }}">Customize</a></li>
   <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 +23,5 @@
 {%- endif %}
 
 <hr>
+<a href="{{ pathto('genindex') }}">Index</a>
+<hr>

doc/en/_templates/layout.html

@@ -1,52 +0,0 @@
-{#
-
-    Copied from:
-
-     https://raw.githubusercontent.com/pallets/pallets-sphinx-themes/b0c6c41849b4e15cbf62cc1d95c05ef2b3e155c8/src/pallets_sphinx_themes/themes/pocoo/layout.html
-
-    And removed the warning version (see #7331).
-
-#}
-
-{% extends "basic/layout.html" %}
-
-{% set metatags %}
-  {{- metatags }}
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-{%- endset %}
-
-{% block extrahead %}
-  {%- if page_canonical_url %}
-    <link rel="canonical" href="{{ page_canonical_url }}">
-  {%- endif %}
-  <script>DOCUMENTATION_OPTIONS.URL_ROOT = '{{ url_root }}';</script>
-  {{ super() }}
-{%- endblock %}
-
-{% block sidebarlogo %}
-  {% if pagename != "index" or theme_index_sidebar_logo %}
-    {{ super() }}
-  {% endif %}
-{% endblock %}
-
-{% block relbar2 %}{% endblock %}
-
-{% block sidebar2 %}
-  <span id="sidebar-top"></span>
-  {{- super() }}
-{%- endblock %}
-
-{% block footer %}
-  {{ super() }}
-  {%- if READTHEDOCS and not readthedocs_docsearch %}
-    <script>
-      if (typeof READTHEDOCS_DATA !== 'undefined') {
-        if (!READTHEDOCS_DATA.features) {
-          READTHEDOCS_DATA.features = {};
-        }
-        READTHEDOCS_DATA.features.docsearch_disabled = true;
-      }
-    </script>
-  {%- endif %}
-  {{ js_tag("_static/version_warning_offset.js") }}
-{% endblock %}

doc/en/_templates/links.html

@@ -2,6 +2,7 @@
 <ul>
   <li><a href="https://pypi.org/project/pytest/">pytest @ PyPI</a></li>
   <li><a href="https://github.com/pytest-dev/pytest/">pytest @ GitHub</a></li>
+  <li><a href="http://plugincompat.herokuapp.com/">3rd party plugins</a></li>
   <li><a href="https://github.com/pytest-dev/pytest/issues">Issue Tracker</a></li>
   <li><a href="https://media.readthedocs.org/pdf/pytest/latest/pytest.pdf">PDF Documentation</a>
 </ul>

doc/en/_themes/.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+*.pyo
+.DS_Store

doc/en/_themes/LICENSE

@@ -0,0 +1,37 @@
+Copyright (c) 2010 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms of the theme, with or
+without modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+* The names of the contributors may not be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
+
+We kindly ask you to only use these themes in an unmodified manner just
+for Flask and Flask-related products, not for unrelated projects.  If you
+like the visual style and want to use it for your own projects, please
+consider making some larger changes to the themes (such as changing
+font faces, sizes, colors or margins).
+
+THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

doc/en/_themes/README

@@ -0,0 +1,31 @@
+Flask Sphinx Styles
+===================
+
+This repository contains sphinx styles for Flask and Flask related
+projects.  To use this style in your Sphinx documentation, follow
+this guide:
+
+1. put this folder as _themes into your docs folder.  Alternatively
+   you can also use git submodules to check out the contents there.
+2. add this to your conf.py:
+
+   sys.path.append(os.path.abspath('_themes'))
+   html_theme_path = ['_themes']
+   html_theme = 'flask'
+
+The following themes exist:
+
+- 'flask' - the standard flask documentation theme for large
+  projects
+- 'flask_small' - small one-page theme.  Intended to be used by
+  very small addon libraries for flask.
+
+The following options exist for the flask_small theme:
+
+   [options]
+   index_logo = ''              filename of a picture in _static
+                                to be used as replacement for the
+                                h1 in the index.rst file.
+   index_logo_height = 120px    height of the index logo
+   github_fork = ''             repository name on github for the
+                                "fork me" badge

doc/en/_themes/flask/layout.html

@@ -0,0 +1,24 @@
+{%- extends "basic/layout.html" %}
+{%- block extrahead %}
+  {{ super() }}
+  {% if theme_touch_icon %}
+  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
+  {% endif %}
+  <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9">
+{% endblock %}
+{%- block relbar2 %}{% endblock %}
+{% block header %}
+  {{ super() }}
+  {% if pagename == 'index' %}
+  <div class=indexwrapper>
+  {% endif %}
+{% endblock %}
+{%- block footer %}
+  <div class="footer">
+    &copy; Copyright {{ copyright }}.
+    Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.
+  </div>
+  {% if pagename == 'index' %}
+  </div>
+  {% endif %}
+{%- endblock %}

doc/en/_themes/flask/static/flasky.css_t

@@ -0,0 +1,623 @@
+/*
+ * flasky.css_t
+ * ~~~~~~~~~~~~
+ *
+ * :copyright: Copyright 2010 by Armin Ronacher.
+ * :license: Flask Design License, see LICENSE for details.
+ */
+
+{% set page_width = '1020px' %}
+{% set sidebar_width = '220px' %}
+/* muted version of green logo color #C9D22A */
+{% set link_color = '#606413' %}
+/* blue logo color */
+{% set link_hover_color = '#009de0' %}
+{% set base_font = 'sans-serif' %}
+{% set header_font = 'sans-serif' %}
+
+@import url("basic.css");
+
+/* -- page layout ----------------------------------------------------------- */
+
+body {
+    font-family: {{ base_font }};
+    font-size: 16px;
+    background-color: white;
+    color: #000;
+    margin: 0;
+    padding: 0;
+}
+
+div.document {
+    width: {{ page_width }};
+    margin: 30px auto 0 auto;
+}
+
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 {{ sidebar_width }};
+}
+
+div.sphinxsidebar {
+    width: {{ sidebar_width }};
+}
+
+hr {
+    border: 0;
+    border-top: 1px solid #B1B4B6;
+}
+
+div.body {
+    background-color: #ffffff;
+    color: #3E4349;
+    padding: 0 30px 0 30px;
+}
+
+img.floatingflask {
+    padding: 0 0 10px 10px;
+    float: right;
+}
+
+div.footer {
+    width: {{ page_width }};
+    margin: 20px auto 30px auto;
+    font-size: 14px;
+    color: #888;
+    text-align: right;
+}
+
+div.footer a {
+    color: #888;
+}
+
+div.related {
+    display: none;
+}
+
+div.sphinxsidebar a {
+    text-decoration: none;
+    border-bottom: none;
+}
+
+div.sphinxsidebar a:hover {
+    color: {{ link_hover_color }};
+    border-bottom: 1px solid {{ link_hover_color }};
+}
+
+div.sphinxsidebar {
+    font-size: 14px;
+    line-height: 1.5;
+}
+
+div.sphinxsidebarwrapper {
+    padding: 18px 10px;
+}
+
+div.sphinxsidebarwrapper p.logo {
+    padding: 0 0 20px 0;
+    margin: 0;
+    text-align: center;
+}
+
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+    font-family: {{ header_font }};
+    color: #444;
+    font-size: 21px;
+    font-weight: normal;
+    margin: 16px 0 0 0;
+    padding: 0;
+}
+
+div.sphinxsidebar h4 {
+    font-size: 18px;
+}
+
+div.sphinxsidebar h3 a {
+    color: #444;
+}
+
+div.sphinxsidebar p.logo a,
+div.sphinxsidebar h3 a,
+div.sphinxsidebar p.logo a:hover,
+div.sphinxsidebar h3 a:hover {
+    border: none;
+}
+
+div.sphinxsidebar p {
+    color: #555;
+    margin: 10px 0;
+}
+
+div.sphinxsidebar ul {
+    margin: 10px 0;
+    padding: 0;
+    color: #000;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #ccc;
+    font-family: {{ base_font }};
+    font-size: 1em;
+}
+
+/* -- body styles ----------------------------------------------------------- */
+
+a {
+    color: {{ link_color }};
+    text-decoration: underline;
+}
+
+a:hover {
+    color: {{ link_hover_color }};
+    text-decoration: underline;
+}
+
+a.reference.internal em {
+    font-style: normal;
+}
+
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: {{ header_font }};
+    font-weight: normal;
+    margin: 30px 0px 10px 0px;
+    padding: 0;
+}
+
+{% if theme_index_logo %}
+div.indexwrapper h1 {
+    text-indent: -999999px;
+    background: url({{ theme_index_logo }}) no-repeat center center;
+    height: {{ theme_index_logo_height }};
+}
+{% else %}
+div.indexwrapper div.body h1 {
+    font-size: 200%;
+}
+{% endif %}
+div.body h1 { margin-top: 0; padding-top: 0; font-size: 240%; }
+div.body h2 { font-size: 180%; }
+div.body h3 { font-size: 150%; }
+div.body h4 { font-size: 130%; }
+div.body h5 { font-size: 100%; }
+div.body h6 { font-size: 100%; }
+
+a.headerlink {
+    color: #ddd;
+    padding: 0 4px;
+    text-decoration: none;
+}
+
+a.headerlink:hover {
+    color: #444;
+    background: #eaeaea;
+}
+
+div.body p, div.body dd, div.body li {
+    line-height: 1.4em;
+}
+
+ul.simple li {
+    margin-bottom: 0.5em;
+}
+
+div.topic ul.simple li {
+    margin-bottom: 0;
+}
+
+div.topic li > p:first-child {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+div.admonition {
+    background: #fafafa;
+    padding: 10px 20px;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+}
+
+div.admonition tt.xref, div.admonition a tt {
+    border-bottom: 1px solid #fafafa;
+}
+
+div.admonition p.admonition-title {
+    font-family: {{ header_font }};
+    font-weight: normal;
+    font-size: 24px;
+    margin: 0 0 10px 0;
+    padding: 0;
+    line-height: 1;
+}
+
+div.admonition :last-child {
+    margin-bottom: 0;
+}
+
+div.highlight {
+    background-color: white;
+}
+
+dt:target, .highlight {
+    background: #FAF3E8;
+}
+
+div.note, div.warning {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+
+div.topic {
+    background-color: #eee;
+}
+
+div.topic a {
+    text-decoration: none;
+    border-bottom: none;
+}
+
+p.admonition-title {
+    display: inline;
+}
+
+p.admonition-title:after {
+    content: ":";
+}
+
+pre, tt, code {
+    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+    font-size: 0.9em;
+    background: #eee;
+}
+
+img.screenshot {
+}
+
+tt.descname, tt.descclassname {
+    font-size: 0.95em;
+}
+
+tt.descname {
+    padding-right: 0.08em;
+}
+
+img.screenshot {
+    -moz-box-shadow: 2px 2px 4px #eee;
+    -webkit-box-shadow: 2px 2px 4px #eee;
+    box-shadow: 2px 2px 4px #eee;
+}
+
+table.docutils {
+    border: 1px solid #888;
+    -moz-box-shadow: 2px 2px 4px #eee;
+    -webkit-box-shadow: 2px 2px 4px #eee;
+    box-shadow: 2px 2px 4px #eee;
+}
+
+table.docutils td, table.docutils th {
+    border: 1px solid #888;
+    padding: 0.25em 0.7em;
+}
+
+table.field-list, table.footnote {
+    border: none;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+table.footnote {
+    margin: 15px 0;
+    width: 100%;
+    border: 1px solid #eee;
+    background: #fdfdfd;
+    font-size: 0.9em;
+}
+
+table.footnote + table.footnote {
+    margin-top: -15px;
+    border-top: none;
+}
+
+table.field-list th {
+    padding: 0 0.8em 0 0;
+}
+
+table.field-list td {
+    padding: 0;
+}
+
+table.footnote td.label {
+    width: 0px;
+    padding: 0.3em 0 0.3em 0.5em;
+}
+
+table.footnote td {
+    padding: 0.3em 0.5em;
+}
+
+dl {
+    margin: 0;
+    padding: 0;
+}
+
+dl dd {
+    margin-left: 30px;
+}
+
+blockquote {
+    margin: 0 0 0 30px;
+    padding: 0;
+}
+
+ul, ol {
+    margin: 10px 0 10px 30px;
+    padding: 0;
+}
+
+pre {
+    background: #eee;
+    padding: 7px 12px;
+    line-height: 1.3em;
+}
+
+tt {
+    background-color: #ecf0f3;
+    color: #222;
+    /* padding: 1px 2px; */
+}
+
+tt.xref, a tt {
+    background-color: #FBFBFB;
+    border-bottom: 1px solid white;
+}
+
+a.reference {
+    text-decoration: none;
+    border-bottom: 1px dotted {{ link_color }};
+}
+
+a.reference:hover {
+    border-bottom: 1px solid {{ link_hover_color }};
+}
+
+li.toctree-l1 a.reference,
+li.toctree-l2 a.reference,
+li.toctree-l3 a.reference,
+li.toctree-l4 a.reference {
+    border-bottom: none;
+}
+
+li.toctree-l1 a.reference:hover,
+li.toctree-l2 a.reference:hover,
+li.toctree-l3 a.reference:hover,
+li.toctree-l4 a.reference:hover {
+    border-bottom: 1px solid {{ link_hover_color }};
+}
+
+a.footnote-reference {
+    text-decoration: none;
+    font-size: 0.7em;
+    vertical-align: top;
+    border-bottom: 1px dotted {{ link_color }};
+}
+
+a.footnote-reference:hover {
+    border-bottom: 1px solid {{ link_hover_color }};
+}
+
+a:hover tt {
+    background: #EEE;
+}
+
+#reference div.section h2 {
+    /* separate code elements in the reference section */
+    border-top: 2px solid #ccc;
+    padding-top: 0.5em;
+}
+
+#reference div.section h3 {
+    /* separate code elements in the reference section */
+    border-top: 1px solid #ccc;
+    padding-top: 0.5em;
+}
+
+dl.class, dl.function {
+    margin-top: 1em;
+    margin-bottom: 1em;
+}
+
+dl.class > dd {
+    border-left: 3px solid #ccc;
+    margin-left: 0px;
+    padding-left: 30px;
+}
+
+dl.field-list {
+    flex-direction: column;
+}
+
+dl.field-list dd {
+    padding-left: 4em;
+    border-left: 3px solid #ccc;
+    margin-bottom: 0.5em;
+}
+
+dl.field-list dd > ul {
+    list-style: none;
+    padding-left: 0px;
+}
+
+dl.field-list dd > ul > li li :first-child {
+    text-indent: 0;
+}
+
+dl.field-list dd > ul > li :first-child {
+    text-indent: -2em;
+    padding-left: 0px;
+}
+
+dl.field-list dd > p:first-child {
+    text-indent: -2em;
+}
+
+@media screen and (max-width: 870px) {
+
+    div.sphinxsidebar {
+        display: none;
+    }
+
+    div.document {
+       width: 100%;
+
+    }
+
+    div.documentwrapper {
+        margin-left: 0;
+        margin-top: 0;
+        margin-right: 0;
+        margin-bottom: 0;
+    }
+
+    div.bodywrapper {
+        margin-top: 0;
+        margin-right: 0;
+        margin-bottom: 0;
+        margin-left: 0;
+    }
+
+    ul {
+        margin-left: 0;
+    }
+
+    .document {
+        width: auto;
+    }
+
+    .footer {
+        width: auto;
+    }
+
+    .bodywrapper {
+        margin: 0;
+    }
+
+    .footer {
+        width: auto;
+    }
+
+    .github {
+        display: none;
+    }
+
+
+
+}
+
+
+
+@media screen and (max-width: 875px) {
+
+    body {
+        margin: 0;
+        padding: 20px 30px;
+    }
+
+    div.documentwrapper {
+        float: none;
+        background: white;
+    }
+
+    div.sphinxsidebar {
+        display: block;
+        float: none;
+        width: 102.5%;
+        margin: 50px -30px -20px -30px;
+        padding: 10px 20px;
+        background: #333;
+        color: white;
+    }
+
+    div.sphinxsidebar h3, div.sphinxsidebar h4, div.sphinxsidebar p,
+    div.sphinxsidebar h3 a, div.sphinxsidebar ul {
+        color: white;
+    }
+
+    div.sphinxsidebar a {
+        color: #aaa;
+    }
+
+    div.sphinxsidebar p.logo {
+        display: none;
+    }
+
+    div.document {
+        width: 100%;
+        margin: 0;
+    }
+
+    div.related {
+        display: block;
+        margin: 0;
+        padding: 10px 0 20px 0;
+    }
+
+    div.related ul,
+    div.related ul li {
+        margin: 0;
+        padding: 0;
+    }
+
+    div.footer {
+        display: none;
+    }
+
+    div.bodywrapper {
+        margin: 0;
+    }
+
+    div.body {
+        min-height: 0;
+        padding: 0;
+    }
+
+    .rtd_doc_footer {
+        display: none;
+    }
+
+    .document {
+        width: auto;
+    }
+
+    .footer {
+        width: auto;
+    }
+
+    .footer {
+        width: auto;
+    }
+
+    .github {
+        display: none;
+    }
+}
+
+/* misc. */
+
+.revsys-inline {
+    display: none!important;
+}

doc/en/_themes/flask/theme.conf

@@ -0,0 +1,9 @@
+[theme]
+inherit = basic
+stylesheet = flasky.css
+pygments_style = flask_theme_support.FlaskyStyle
+
+[options]
+index_logo = ''
+index_logo_height = 120px
+touch_icon =

doc/en/_themes/flask_theme_support.py

@@ -0,0 +1,87 @@
+# flasky extensions.  flasky pygments style based on tango style
+from pygments.style import Style
+from pygments.token import Comment
+from pygments.token import Error
+from pygments.token import Generic
+from pygments.token import Keyword
+from pygments.token import Literal
+from pygments.token import Name
+from pygments.token import Number
+from pygments.token import Operator
+from pygments.token import Other
+from pygments.token import Punctuation
+from pygments.token import String
+from pygments.token import Whitespace
+
+
+class FlaskyStyle(Style):
+    background_color = "#f8f8f8"
+    default_style = ""
+
+    styles = {
+        # No corresponding class for the following:
+        # Text:                     "", # class:  ''
+        Whitespace: "underline #f8f8f8",  # class: 'w'
+        Error: "#a40000 border:#ef2929",  # class: 'err'
+        Other: "#000000",  # class 'x'
+        Comment: "italic #8f5902",  # class: 'c'
+        Comment.Preproc: "noitalic",  # class: 'cp'
+        Keyword: "bold #004461",  # class: 'k'
+        Keyword.Constant: "bold #004461",  # class: 'kc'
+        Keyword.Declaration: "bold #004461",  # class: 'kd'
+        Keyword.Namespace: "bold #004461",  # class: 'kn'
+        Keyword.Pseudo: "bold #004461",  # class: 'kp'
+        Keyword.Reserved: "bold #004461",  # class: 'kr'
+        Keyword.Type: "bold #004461",  # class: 'kt'
+        Operator: "#582800",  # class: 'o'
+        Operator.Word: "bold #004461",  # class: 'ow' - like keywords
+        Punctuation: "bold #000000",  # class: 'p'
+        # because special names such as Name.Class, Name.Function, etc.
+        # are not recognized as such later in the parsing, we choose them
+        # to look the same as ordinary variables.
+        Name: "#000000",  # class: 'n'
+        Name.Attribute: "#c4a000",  # class: 'na' - to be revised
+        Name.Builtin: "#004461",  # class: 'nb'
+        Name.Builtin.Pseudo: "#3465a4",  # class: 'bp'
+        Name.Class: "#000000",  # class: 'nc' - to be revised
+        Name.Constant: "#000000",  # class: 'no' - to be revised
+        Name.Decorator: "#888",  # class: 'nd' - to be revised
+        Name.Entity: "#ce5c00",  # class: 'ni'
+        Name.Exception: "bold #cc0000",  # class: 'ne'
+        Name.Function: "#000000",  # class: 'nf'
+        Name.Property: "#000000",  # class: 'py'
+        Name.Label: "#f57900",  # class: 'nl'
+        Name.Namespace: "#000000",  # class: 'nn' - to be revised
+        Name.Other: "#000000",  # class: 'nx'
+        Name.Tag: "bold #004461",  # class: 'nt' - like a keyword
+        Name.Variable: "#000000",  # class: 'nv' - to be revised
+        Name.Variable.Class: "#000000",  # class: 'vc' - to be revised
+        Name.Variable.Global: "#000000",  # class: 'vg' - to be revised
+        Name.Variable.Instance: "#000000",  # class: 'vi' - to be revised
+        Number: "#990000",  # class: 'm'
+        Literal: "#000000",  # class: 'l'
+        Literal.Date: "#000000",  # class: 'ld'
+        String: "#4e9a06",  # class: 's'
+        String.Backtick: "#4e9a06",  # class: 'sb'
+        String.Char: "#4e9a06",  # class: 'sc'
+        String.Doc: "italic #8f5902",  # class: 'sd' - like a comment
+        String.Double: "#4e9a06",  # class: 's2'
+        String.Escape: "#4e9a06",  # class: 'se'
+        String.Heredoc: "#4e9a06",  # class: 'sh'
+        String.Interpol: "#4e9a06",  # class: 'si'
+        String.Other: "#4e9a06",  # class: 'sx'
+        String.Regex: "#4e9a06",  # class: 'sr'
+        String.Single: "#4e9a06",  # class: 's1'
+        String.Symbol: "#4e9a06",  # class: 'ss'
+        Generic: "#000000",  # class: 'g'
+        Generic.Deleted: "#a40000",  # class: 'gd'
+        Generic.Emph: "italic #000000",  # class: 'ge'
+        Generic.Error: "#ef2929",  # class: 'gr'
+        Generic.Heading: "bold #000080",  # class: 'gh'
+        Generic.Inserted: "#00A000",  # class: 'gi'
+        Generic.Output: "#888",  # class: 'go'
+        Generic.Prompt: "#745334",  # class: 'gp'
+        Generic.Strong: "bold #000000",  # class: 'gs'
+        Generic.Subheading: "bold #800080",  # class: 'gu'
+        Generic.Traceback: "bold #a40000",  # class: 'gt'
+    }

doc/en/adopt.rst

@@ -10,9 +10,10 @@ Are you an enthusiastic pytest user, the local testing guru in your workplace? O
 
 We will pair experienced pytest users with open source projects, for a month's effort of getting new development teams started with pytest.
 
-In 2015 we are trying this for the first time. In February and March 2015 we will gather volunteers on both sides, in April we will do the work, and in May we will evaluate how it went. This effort is being coordinated by Brianna Laugher. If you have any questions or comments, you can raise them on the `@pytestdotorg twitter account <https://twitter.com/pytestdotorg>`_\, the :issue:`issue tracker <676>` or the `pytest-dev mailing list`_.
+In 2015 we are trying this for the first time. In February and March 2015 we will gather volunteers on both sides, in April we will do the work, and in May we will evaluate how it went. This effort is being coordinated by Brianna Laugher. If you have any questions or comments, you can raise them on the `@pytestdotorg twitter account <https://twitter.com/pytestdotorg>`_ the `issue tracker`_ or the `pytest-dev mailing list`_.
 
 
+.. _`issue tracker`: https://github.com/pytest-dev/pytest/issues/676
 .. _`pytest-dev mailing list`: https://mail.python.org/mailman/listinfo/pytest-dev
 
 
@@ -44,7 +45,7 @@ Partner projects, sign up here! (by 22 March)
 What does it mean to "adopt pytest"?
 -----------------------------------------
 
-There can be many different definitions of "success". Pytest can run many nose_ and unittest_ tests by default, so using pytest as your testrunner may be possible from day 1. Job done, right?
+There can be many different definitions of "success". Pytest can run many `nose and unittest`_ tests by default, so using pytest as your testrunner may be possible from day 1. Job done, right?
 
 Progressive success might look like:
 
@@ -62,8 +63,7 @@ Progressive success might look like:
 
 It may be after the month is up, the partner project decides that pytest is not right for it. That's okay - hopefully the pytest team will also learn something about its weaknesses or deficiencies.
 
-.. _nose: nose.html
-.. _unittest: unittest.html
+.. _`nose and unittest`: faq.html#how-does-pytest-relate-to-nose-and-unittest
 .. _assert: assert.html
 .. _pycmd: https://bitbucket.org/hpk42/pycmd/overview
 .. _`setUp/tearDown methods`: xunit_setup.html

doc/en/announce/index.rst

@@ -6,37 +6,6 @@ Release announcements
    :maxdepth: 2
 
 
-   release-7.4.2
-   release-7.4.1
-   release-7.4.0
-   release-7.3.2
-   release-7.3.1
-   release-7.3.0
-   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
-   release-6.2.2
-   release-6.2.1
-   release-6.2.0
-   release-6.1.2
-   release-6.1.1
-   release-6.1.0
-   release-6.0.2
-   release-6.0.1
-   release-6.0.0
-   release-6.0.0rc1
-   release-5.4.3
-   release-5.4.2
    release-5.4.1
    release-5.4.0
    release-5.3.5

doc/en/announce/release-2.0.0.rst

@@ -7,7 +7,7 @@ see below for summary and detailed lists.  A lot of long-deprecated code
 has been removed, resulting in a much smaller and cleaner
 implementation.  See the new docs with examples here:
 
-    http://pytest.org/en/stable/index.html
+    http://pytest.org/en/latest/index.html
 
 A note on packaging: pytest used to part of the "py" distribution up
 until version py-1.3.4 but this has changed now:  pytest-2.0.0 only
@@ -36,12 +36,12 @@ New Features
 
     import pytest ; pytest.main(arglist, pluginlist)
 
-  see http://pytest.org/en/stable/how-to/usage.html for details.
+  see http://pytest.org/en/latest/usage.html for details.
 
 - new and better reporting information in assert expressions
   if comparing lists, sequences or strings.
 
-  see http://pytest.org/en/stable/how-to/assert.html#newreport
+  see http://pytest.org/en/latest/assert.html#newreport
 
 - new configuration through ini-files (setup.cfg or tox.ini recognized),
   for example::
@@ -50,7 +50,7 @@ New Features
     norecursedirs = .hg data*  # don't ever recurse in such dirs
     addopts = -x --pyargs      # add these command line options by default
 
-  see http://pytest.org/en/stable/reference/customize.html
+  see http://pytest.org/en/latest/customize.html
 
 - improved standard unittest support.  In general py.test should now
   better be able to run custom unittest.TestCases like twisted trial

doc/en/announce/release-2.0.1.rst

@@ -57,7 +57,7 @@ Changes between 2.0.0 and 2.0.1
 - refinements to "collecting" output on non-ttys
 - refine internal plugin registration and --traceconfig output
 - introduce a mechanism to prevent/unregister plugins from the
-  command line, see http://pytest.org/en/stable/how-to/plugins.html#cmdunregister
+  command line, see http://pytest.org/en/latest/plugins.html#cmdunregister
 - activate resultlog plugin by default
 - fix regression wrt yielded tests which due to the
   collection-before-running semantics were not

doc/en/announce/release-2.1.0.rst

@@ -12,7 +12,7 @@ courtesy of Benjamin Peterson.  You can now safely use ``assert``
 statements in test modules without having to worry about side effects
 or python optimization ("-OO") options.  This is achieved by rewriting
 assert statements in test modules upon import, using a PEP302 hook.
-See https://docs.pytest.org/en/stable/how-to/assert.html for
+See https://docs.pytest.org/en/latest/assert.html for
 detailed information.  The work has been partly sponsored by my company,
 merlinux GmbH.
 
@@ -24,7 +24,7 @@ If you want to install or upgrade pytest, just type one of::
     easy_install -U pytest
 
 best,
-holger krekel / https://merlinux.eu/
+holger krekel / http://merlinux.eu
 
 Changes between 2.0.3 and 2.1.0
 ----------------------------------------------

doc/en/announce/release-2.1.1.rst

@@ -20,7 +20,7 @@ If you want to install or upgrade pytest, just type one of::
     easy_install -U pytest
 
 best,
-holger krekel / https://merlinux.eu/
+holger krekel / http://merlinux.eu
 
 Changes between 2.1.0 and 2.1.1
 ----------------------------------------------

doc/en/announce/release-2.1.2.rst

@@ -19,7 +19,7 @@ If you want to install or upgrade pytest, just type one of::
     easy_install -U pytest
 
 best,
-holger krekel / https://merlinux.eu/
+holger krekel / http://merlinux.eu
 
 Changes between 2.1.1 and 2.1.2
 ----------------------------------------

doc/en/announce/release-2.2.0.rst

@@ -9,7 +9,7 @@ with these improvements:
 
   - new @pytest.mark.parametrize decorator to run tests with different arguments
   - new metafunc.parametrize() API for parametrizing arguments independently
-  - see examples at http://pytest.org/en/stable/example/how-to/parametrize.html
+  - see examples at http://pytest.org/en/latest/example/parametrize.html
   - NOTE that parametrize() related APIs are still a bit experimental
     and might change in future releases.
 
@@ -18,7 +18,7 @@ with these improvements:
   - "-m markexpr" option for selecting tests according to their mark
   - a new "markers" ini-variable for registering test markers for your project
   - the new "--strict" bails out with an error if using unregistered markers.
-  - see examples at http://pytest.org/en/stable/example/markers.html
+  - see examples at http://pytest.org/en/latest/example/markers.html
 
 * duration profiling: new "--duration=N" option showing the N slowest test
   execution or setup/teardown calls. This is most useful if you want to
@@ -78,7 +78,7 @@ Changes between 2.1.3 and 2.2.0
   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 examples at http://pytest.org/en/latest/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"

doc/en/announce/release-2.3.0.rst

@@ -13,12 +13,12 @@ re-usable fixture design.
 
 For detailed info and tutorial-style examples, see:
 
-    http://pytest.org/en/stable/explanation/fixtures.html
+    http://pytest.org/en/latest/fixture.html
 
 Moreover, there is now support for using pytest fixtures/funcargs with
 unittest-style suites, see here for examples:
 
-    http://pytest.org/en/stable/how-to/unittest.html
+    http://pytest.org/en/latest/unittest.html
 
 Besides, more unittest-test suites are now expected to "simply work"
 with pytest.
@@ -29,11 +29,11 @@ pytest-2.2.4.
 
 If you are interested in the precise reasoning (including examples) of the
 pytest-2.3 fixture evolution, please consult
-http://pytest.org/en/stable/funcarg_compare.html
+http://pytest.org/en/latest/funcarg_compare.html
 
 For general info on installation and getting started:
 
-    http://pytest.org/en/stable/getting-started.html
+    http://pytest.org/en/latest/getting-started.html
 
 Docs and PDF access as usual at:
 
@@ -94,7 +94,7 @@ Changes between 2.2.4 and 2.3.0
 - pluginmanager.register(...) now raises ValueError if the
   plugin has been already registered or the name is taken
 
-- fix issue159: improve https://docs.pytest.org/en/6.0.1/faq.html
+- fix issue159: improve http://pytest.org/en/latest/faq.html
   especially with respect to the "magic" history, also mention
   pytest-django, trial and unittest integration.
 

doc/en/announce/release-2.3.4.rst

@@ -16,7 +16,7 @@ comes with the following fixes and features:
 - yielded test functions will now have autouse-fixtures active but
   cannot accept fixtures as funcargs - it's anyway recommended to
   rather use the post-2.0 parametrize features instead of yield, see:
-  http://pytest.org/en/stable/example/how-to/parametrize.html
+  http://pytest.org/en/latest/example/parametrize.html
 - fix autouse-issue where autouse-fixtures would not be discovered
   if defined in an a/conftest.py file and tests in a/tests/test_some.py
 - fix issue226 - LIFO ordering for fixture teardowns

doc/en/announce/release-2.3.5.rst

@@ -46,7 +46,7 @@ Changes between 2.3.4 and 2.3.5
 - Issue 265 - integrate nose setup/teardown with setupstate
   so it doesn't try to teardown if it did not setup
 
-- issue 271 - don't write junitxml on worker nodes
+- issue 271 - don't write junitxml on slave nodes
 
 - Issue 274 - don't try to show full doctest example
   when doctest does not know the example location

doc/en/announce/release-2.4.0.rst

@@ -7,7 +7,7 @@ from a few supposedly very minor incompatibilities.  See below for
 a full list of details.  A few feature highlights:
 
 - new yield-style fixtures `pytest.yield_fixture
-  <http://pytest.org/en/stable/yieldfixture.html>`_, allowing to use
+  <http://pytest.org/en/latest/yieldfixture.html>`_, allowing to use
   existing with-style context managers in fixture functions.
 
 - improved pdb support: ``import pdb ; pdb.set_trace()`` now works
@@ -23,13 +23,14 @@ a full list of details.  A few feature highlights:
   called if the corresponding setup method succeeded.
 
 - integrate tab-completion on command line options if you
-  have :pypi:`argcomplete` configured.
+  have `argcomplete <https://pypi.org/project/argcomplete/>`_
+  configured.
 
 - allow boolean expression directly with skipif/xfail
   if a "reason" is also specified.
 
 - a new hook ``pytest_load_initial_conftests`` allows plugins like
-  :pypi:`pytest-django` to
+  `pytest-django <https://pypi.org/project/pytest-django/>`_ to
   influence the environment before conftest files import ``django``.
 
 - reporting: color the last line red or green depending if

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-2.5.1.rst

@@ -1,7 +1,7 @@
 pytest-2.5.1: fixes and new home page styling
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1000 tests
+pytest is a mature Python testing tool with more than a 1000 tests
 against itself, passing on many different interpreters and platforms.
 
 The 2.5.1 release maintains the "zero-reported-bugs" promise by fixing

doc/en/announce/release-2.5.2.rst

@@ -1,7 +1,7 @@
 pytest-2.5.2: fixes
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1000 tests
+pytest is a mature Python testing tool with more than a 1000 tests
 against itself, passing on many different interpreters and platforms.
 
 The 2.5.2 release fixes a few bugs with two maybe-bugs remaining and

doc/en/announce/release-2.6.0.rst

@@ -1,7 +1,7 @@
 pytest-2.6.0: shorter tracebacks, new warning system, test runner compat
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1000 tests
+pytest is a mature Python testing tool with more than a 1000 tests
 against itself, passing on many different interpreters and platforms.
 
 The 2.6.0 release should be drop-in backward compatible to 2.5.2 and

doc/en/announce/release-2.6.1.rst

@@ -1,7 +1,7 @@
 pytest-2.6.1: fixes and new xfail feature
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 The 2.6.1 release is drop-in compatible to 2.5.2 and actually fixes some
 regressions introduced with 2.6.0.  It also brings a little feature
@@ -32,7 +32,7 @@ Changes 2.6.1
   purely the nodeid.  The line number is still shown in failure reports.
   Thanks Floris Bruynooghe.
 
-- fix issue437 where assertion rewriting could cause pytest-xdist worker nodes
+- fix issue437 where assertion rewriting could cause pytest-xdist slaves
   to collect different tests. Thanks Bruno Oliveira.
 
 - fix issue555: add "errors" attribute to capture-streams to satisfy

doc/en/announce/release-2.6.2.rst

@@ -1,7 +1,7 @@
 pytest-2.6.2: few fixes and cx_freeze support
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is drop-in compatible to 2.5.2 and 2.6.X.  It also
 brings support for including pytest with cx_freeze or similar

doc/en/announce/release-2.6.3.rst

@@ -1,7 +1,7 @@
 pytest-2.6.3: fixes and little improvements
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is drop-in compatible to 2.5.2 and 2.6.X.
 See below for the changes and see docs at:

doc/en/announce/release-2.7.0.rst

@@ -1,7 +1,7 @@
 pytest-2.7.0: fixes, features, speed improvements
 ===========================================================================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.6.X.
 
@@ -52,7 +52,7 @@ holger krekel
 - add ability to set command line options by environment variable PYTEST_ADDOPTS.
 
 - added documentation on the new pytest-dev teams on bitbucket and
-  github.  See https://pytest.org/en/stable/contributing.html .
+  github.  See https://pytest.org/en/latest/contributing.html .
   Thanks to Anatoly for pushing and initial work on this.
 
 - fix issue650: new option ``--docttest-ignore-import-errors`` which

doc/en/announce/release-2.7.1.rst

@@ -1,7 +1,7 @@
 pytest-2.7.1: bug fixes
 =======================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.7.0.
 

doc/en/announce/release-2.7.2.rst

@@ -1,7 +1,7 @@
 pytest-2.7.2: bug fixes
 =======================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.7.1.
 

doc/en/announce/release-2.8.2.rst

@@ -1,7 +1,7 @@
 pytest-2.8.2: bug fixes
 =======================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.8.1.
 

doc/en/announce/release-2.8.3.rst

@@ -1,7 +1,7 @@
 pytest-2.8.3: bug fixes
 =======================
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.8.2.
 

doc/en/announce/release-2.8.4.rst

@@ -1,7 +1,7 @@
 pytest-2.8.4
 ============
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.8.2.
 

doc/en/announce/release-2.8.5.rst

@@ -1,7 +1,7 @@
 pytest-2.8.5
 ============
 
-pytest is a mature Python testing tool with more than 1100 tests
+pytest is a mature Python testing tool with more than a 1100 tests
 against itself, passing on many different interpreters and platforms.
 This release is supposed to be drop-in compatible to 2.8.4.