Introduce missing remark as commented in original PR

https://github.com/pytest-dev/pytest/pull/6870/files#r390667966

.coveragerc

@@ -16,14 +16,3 @@ source = src/
   */lib/python*/site-packages/
   */pypy*/site-packages/
   *\Lib\site-packages\
-
-[report]
-skip_covered = True
-show_missing = True
-exclude_lines =
-    \#\s*pragma: no cover
-    ^\s*raise NotImplementedError\b
-    ^\s*return NotImplemented\b
-    ^\s*assert False(,|$)
-
-    ^\s*if TYPE_CHECKING:

.gitblameignore

@@ -1,28 +0,0 @@
-# List of revisions that can be ignored with git-blame(1).
-#
-# See `blame.ignoreRevsFile` in git-config(1) to enable it by default, or
-# use it with `--ignore-revs-file` manually with git-blame.
-#
-# To "install" it:
-#
-#   git config --local blame.ignoreRevsFile .gitblameignore
-
-# run black
-703e4b11ba76171eccd3f13e723c47b810ded7ef
-# switched to src layout
-eaa882f3d5340956beb176aa1753e07e3f3f2190
-# pre-commit run pyupgrade --all-files
-a91fe1feddbded535a4322ab854429e3a3961fb4
-# move node base classes from main to nodes
-afc607cfd81458d4e4f3b1f3cf8cc931b933907e
-# [?] split most fixture related code into own plugin
-8c49561470708761f7321504f5e8343811be87ac
-# run pyupgrade
-9aacb4635e81edd6ecf281d4f6c0cfc8e94ab301
-# run blacken-docs
-5f95dce95602921a70bfbc7d8de2f7712c5e4505
-# ran pyupgrade-docs again
-75d0b899bbb56d6849e9d69d83a9426ed3f43f8b
-
-# move argument parser to own file
-c9df77cbd6a365dcb73c39618e4842711817e871

.github/FUNDING.yml

@@ -2,4 +2,3 @@
 # * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
 # * https://tidelift.com/subscription/how-to-connect-tidelift-with-github
 tidelift: pypi/pytest
-open_collective: pytest

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,21 +2,15 @@
 Thanks for submitting a PR, your contribution is really appreciated!
 
 Here is a quick checklist that should be present in PRs.
+(please delete this text from the final description, this is just a guideline)
+-->
 
+- [ ] Target the `master` branch for bug fixes, documentation updates and trivial changes.
+- [ ] Target the `features` branch for new features and removals/deprecations.
 - [ ] Include documentation when adding new features.
 - [ ] 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.
 
-Unless your change is trivial or a small documentation fix (e.g., a typo or reword of a small section) please:
+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/master/changelog/README.rst) for details.
-
-  Write sentences in the **past or present tense**, examples:
-
-  * *Improved verbose diff output with sequences.*
-  * *Terminal summary statistics now use multiple colors.*
-
-  Also make sure to end the sentence with a `.`.
-
-- [ ] Add yourself to `AUTHORS` in alphabetical order.
--->
+- [ ] Add yourself to `AUTHORS` in alphabetical order;

.github/workflows/main.yml

@@ -1,23 +1,15 @@
-# 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"
+      - 4.6.x
     tags:
       - "*"
 
   pull_request:
     branches:
-      - master
-      - "[0-9]+.[0-9]+.x"
+      - 4.6.x
 
 jobs:
   build:
@@ -27,30 +19,34 @@ jobs:
       fail-fast: false
       matrix:
         name: [
+          "windows-py27",
           "windows-py35",
           "windows-py36",
           "windows-py37",
           "windows-py37-pluggy",
           "windows-py38",
 
-          "ubuntu-py35",
-          "ubuntu-py36",
+          "ubuntu-py27-pluggy",
+          "ubuntu-py27-nobyte",
           "ubuntu-py37",
           "ubuntu-py37-pluggy",
+          "ubuntu-py37-pexpect-py37-twisted",
           "ubuntu-py37-freeze",
-          "ubuntu-py38",
-          "ubuntu-py39",
+          "ubuntu-pypy",
           "ubuntu-pypy3",
 
-          "macos-py37",
+          "macos-py27",
           "macos-py38",
 
-          "linting",
-          "docs",
-          "doctesting",
         ]
 
         include:
+          # Windows jobs
+          - name: "windows-py27"
+            python: "2.7"
+            os: windows-latest
+            tox_env: "py27-xdist"
+            use_coverage: true
           - name: "windows-py35"
             python: "3.5"
             os: windows-latest
@@ -60,95 +56,86 @@ jobs:
             python: "3.6"
             os: windows-latest
             tox_env: "py36-xdist"
+            use_coverage: true
           - name: "windows-py37"
             python: "3.7"
             os: windows-latest
-            tox_env: "py37-numpy"
+            tox_env: "py37-twisted-numpy"
+            use_coverage: true
           - name: "windows-py37-pluggy"
             python: "3.7"
             os: windows-latest
             tox_env: "py37-pluggymaster-xdist"
+            use_coverage: true
           - name: "windows-py38"
             python: "3.8"
             os: windows-latest
-            tox_env: "py38-unittestextras"
+            tox_env: "py38-xdist"
             use_coverage: true
 
-          - name: "ubuntu-py35"
-            python: "3.5"
+          # Ubuntu jobs – find the rest of them in .travis.yml
+          - name: "ubuntu-py27-pluggy"
+            python: "2.7"
             os: ubuntu-latest
-            tox_env: "py35-xdist"
-          - name: "ubuntu-py36"
-            python: "3.6"
+            tox_env: "py27-pluggymaster-xdist"
+            use_coverage: true
+          - name: "ubuntu-py27-nobyte"
+            python: "2.7"
             os: ubuntu-latest
-            tox_env: "py36-xdist"
+            tox_env: "py27-nobyte-numpy-xdist"
+            use_coverage: true
           - name: "ubuntu-py37"
             python: "3.7"
             os: ubuntu-latest
-            tox_env: "py37-lsof-numpy-oldattrs-pexpect"
+            tox_env: "py37-lsof-numpy-xdist"
             use_coverage: true
           - name: "ubuntu-py37-pluggy"
             python: "3.7"
             os: ubuntu-latest
             tox_env: "py37-pluggymaster-xdist"
+            use_coverage: true
+          - name: "ubuntu-py37-pexpect-py37-twisted"
+            python: "3.7"
+            os: ubuntu-latest
+            tox_env: "py37-pexpect,py37-twisted"
+            use_coverage: true
           - name: "ubuntu-py37-freeze"
             python: "3.7"
             os: ubuntu-latest
             tox_env: "py37-freeze"
-          - name: "ubuntu-py38"
-            python: "3.8"
+          - name: "ubuntu-pypy"
+            python: "pypy2"
             os: ubuntu-latest
-            tox_env: "py38-xdist"
-          - name: "ubuntu-py39"
-            python: "3.8"
-            os: ubuntu-latest
-            tox_env: "py39-xdist"
+            tox_env: "pypy-xdist"
+            use_coverage: true
           - name: "ubuntu-pypy3"
             python: "pypy3"
             os: ubuntu-latest
             tox_env: "pypy3-xdist"
+            use_coverage: true
 
-          - name: "macos-py37"
-            python: "3.7"
+          # MacOS jobs
+          - name: "macos-py27"
+            python: "2.7"
             os: macos-latest
-            tox_env: "py37-xdist"
+            tox_env: "py27-xdist"
+            use_coverage: true
           - 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 }}
+    - name: Set up Python ${{ matrix.python }} on ${{ matrix.os }}
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python }}
-    - name: install python3.9
-      if: matrix.tox_env == 'py39-xdist'
-      run: |
-        sudo add-apt-repository ppa:deadsnakes/nightly
-        sudo apt-get update
-        sudo apt-get install -y --no-install-recommends python3.9-dev python3.9-distutils
     - 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 }}"
@@ -159,13 +146,12 @@ jobs:
         _PYTEST_TOX_COVERAGE_RUN: "coverage run -m"
         COVERAGE_PROCESS_START: ".coveragerc"
         _PYTEST_TOX_EXTRA_DEP: "coverage-enable-subprocess"
-      run: "tox -e ${{ matrix.tox_env }}"
+      run: "tox -vv -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:

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

@@ -1,28 +0,0 @@
-# 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 }}

.gitignore

@@ -25,19 +25,16 @@ src/_pytest/_version.py
 
 doc/*/_build
 doc/*/.doctrees
-doc/*/_changelog_towncrier_draft.rst
 build/
 dist/
 *.egg-info
 issue/
 env/
 .env/
-.venv/
 3rdparty/
 .tox
 .cache
 .pytest_cache
-.mypy_cache
 .coverage
 .coverage.*
 coverage.xml

.pre-commit-config.yaml

@@ -1,21 +1,23 @@
+exclude: doc/en/example/py2py3/test_py2.py
 repos:
 -   repo: https://github.com/psf/black
     rev: 19.10b0
     hooks:
     -   id: black
         args: [--safe, --quiet]
+        language_version: python3
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.0.0
+    rev: v0.5.0
     hooks:
     -   id: blacken-docs
-        additional_dependencies: [black==19.10b0]
+        additional_dependencies: [black==19.3b0]
+        language_version: python3
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v2.2.2
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: fix-encoding-pragma
-        args: [--remove]
     -   id: check-yaml
     -   id: debug-statements
         exclude: _pytest/debugging.py
@@ -25,36 +27,33 @@ repos:
     hooks:
     -   id: flake8
         language_version: python3
-        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', --py3-plus]
+        args: ['--application-directories=.:src']
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.18.0
+    rev: v1.15.0
     hooks:
     -   id: pyupgrade
-        args: [--py3-plus]
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.761  # NOTE: keep this in sync with setup.py.
+        args: [--keep-percent-format]
+-   repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.3.0
     hooks:
-    -   id: mypy
-        files: ^(src/|testing/)
-        args: []
+    -   id: rst-backticks
 -   repo: local
     hooks:
     -   id: rst
         name: rst
         entry: rst-lint --encoding utf-8
-        files: ^(RELEASING.rst|README.rst|TIDELIFT.rst)$
+        files: ^(CHANGELOG.rst|HOWTORELEASE.rst|README.rst|TIDELIFT.rst|changelog/.*)$
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
     -   id: changelogs-rst
         name: changelog filenames
         language: fail
-        entry: 'changelog files must be named ####.(breaking|bugfix|deprecation|doc|feature|improvement|trivial|vendor).rst'
-        exclude: changelog/(\d+\.(breaking|bugfix|deprecation|doc|feature|improvement|trivial|vendor).rst|README.rst|_template.rst)
+        entry: 'changelog files must be named ####.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst'
+        exclude: changelog/(\d+\.(feature|bugfix|doc|deprecation|removal|vendor|trivial).rst|README.rst|_template.rst)
         files: ^changelog/
     -   id: py-deprecated
         name: py library is deprecated
@@ -64,7 +63,7 @@ repos:
                 _code\.|
                 builtin\.|
                 code\.|
-                io\.(BytesIO|saferepr|TerminalWriter)|
+                io\.(BytesIO|saferepr)|
                 path\.local\.sysfind|
                 process\.|
                 std\.

.travis.yml

@@ -1,11 +1,12 @@
 language: python
-dist: trusty
-python: '3.5.1'
+dist: xenial
+python: '3.7.4'
 cache: false
 
 env:
   global:
-    - PYTEST_ADDOPTS=-vv
+    - PYTEST_ADDOPTS="-vv --showlocals --durations=100 --exitfirst"
+    - PYTEST_COVERAGE=1
 
 # setuptools-scm needs all tags in order to obtain a proper version
 git:
@@ -16,11 +17,43 @@ install:
 
 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
+    # Coverage for:
+    # - TestArgComplete (linux only)
+    # - numpy
+    # - verbose=0
+    - stage: baseline
+      env: TOXENV=py27-xdist
+      python: '2.7'
+
+    - env: TOXENV=py38-xdist
+      python: '3.8'
+
+    - stage: tests
+    # - _pytest.unittest._handle_skip (via pexpect).
+      env: TOXENV=py27-pexpect,py27-twisted
+      python: '2.7'
+
+    - env: TOXENV=py35-xdist
+      python: '3.5.9'
+
+    - env: TOXENV=py36-xdist PYTEST_REORDER_TESTS=0
+      python: '3.6.9'
+
+    - env: TOXENV=py37-numpy-pexpect-twisted
+      python: '3.7.4'
+
+    # - test_sys_breakpoint_interception (via pexpect).
+    - env: TOXENV=py37-pexpect,py37-twisted
+      python: '3.7.4'
+
+    # Run also non-verbosely, to gain coverage
+    - env: TOXENV=py38-xdist PYTEST_ADDOPTS=""
+      python: '3.8'
+
+    - env: TOXENV=linting,docs,doctesting
+      cache:
+        directories:
+          - $HOME/.cache/pre-commit
 
 before_script:
   - |
@@ -35,26 +68,13 @@ before_script:
       export _PYTEST_TOX_COVERAGE_RUN="coverage run -m"
       export _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
     fi
-
-script: tox
+script: env COLUMNS=120 python -m tox
 
 after_success:
   - |
     if [[ "$PYTEST_COVERAGE" = 1 ]]; then
-      env CODECOV_NAME="$TOXENV-$TRAVIS_OS_NAME" scripts/report-coverage.sh -F Travis
+      env CODECOV_NAME="$TOXENV-$TRAVIS_OS_NAME" scripts/report-coverage.sh
     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$/
+    - 4.6.x

AUTHORS

@@ -15,7 +15,6 @@ Alexander Johnson
 Alexei Kozlenok
 Allan Feldman
 Aly Sivji
-Amir Elkess
 Anatoly Bubenkoff
 Anders Hovmöller
 Andras Mitzki
@@ -23,7 +22,6 @@ Andras Tim
 Andrea Cimatoribus
 Andreas Zeidler
 Andrey Paramonov
-Andrzej Klajnert
 Andrzej Ostrowski
 Andy Freeland
 Anthon van der Neut
@@ -52,36 +50,31 @@ Carl Friedrich Bolz
 Carlos Jenkins
 Ceridwen
 Charles Cloud
-Charles Machalow
 Charnjit SiNGH (CCSJ)
 Chris Lamb
 Christian Boelsen
 Christian Fetzer
-Christian Neumüller
 Christian Theunert
 Christian Tismer
-Christoph Buelter
-Christopher Dignam
 Christopher Gilling
+Christopher Dignam
 Claudio Madotto
 CrazyMerlyn
 Cyrus Maden
 Damian Skrzypczak
+Dhiren Serai
 Daniel Grana
 Daniel Hahler
 Daniel Nuri
 Daniel Wandschneider
 Danielle Jenkins
-Daniil Galiev
 Dave Hunt
 David Díaz-Barquero
 David Mohr
-David Paul Röthlisberger
 David Szotten
 David Vierra
 Daw-Ran Liou
 Denis Kirisov
-Dhiren Serai
 Diego Russo
 Dmitry Dygalo
 Dmitry Pribysh
@@ -99,22 +92,20 @@ Evan Kepner
 Fabien Zarifian
 Fabio Zadrozny
 Feng Ma
+Fernando Mezzabotta Rey
 Florian Bruhin
 Floris Bruynooghe
 Gabriel Reis
-Gene Wood
 George Kussumoto
 Georgy Dyuldin
 Graham Horler
 Greg Price
-Gregory Lee
 Grig Gheorghiu
 Grigorii Eremeev (budulianin)
 Guido Wesdorp
 Guoqiang Zhang
 Harald Armin Massa
 Henk-Jaap Wagenaar
-Holger Kohr
 Hugo van Kemenade
 Hui Wang (coldnight)
 Ian Bicking
@@ -123,7 +114,6 @@ Ilya Konstantinov
 Ionuț Turturică
 Iwan Briquemont
 Jaap Broekhuizen
-Jakub Mitoraj
 Jan Balster
 Janne Vanhala
 Jason R. Coombs
@@ -140,12 +130,10 @@ Jordan Guymon
 Jordan Moldow
 Jordan Speicher
 Joseph Hunkeler
-Josh Karpel
 Joshua Bronson
 Jurko Gospodnetić
 Justyna Janczyszyn
 Kale Kundert
-Karl O. Pinc
 Katarzyna Jachim
 Katerina Koukiou
 Kevin Cox
@@ -169,9 +157,7 @@ Manuel Krebber
 Marc Schlaich
 Marcelo Duarte Trevisani
 Marcin Bachry
-Marco Gorelli
 Mark Abramowitz
-Mark Dickinson
 Markus Unterwaditzer
 Martijn Faassen
 Martin Altmayer
@@ -187,15 +173,12 @@ mbyt
 Michael Aquilina
 Michael Birtwell
 Michael Droettboom
-Michael Goerz
-Michael Krebs
 Michael Seifert
 Michal Wajszczuk
 Mihai Capotă
 Mike Hoyle (hoylemd)
 Mike Lundy
 Miro Hrončok
-Nathaniel Compton
 Nathaniel Waisbrot
 Ned Batchelder
 Neven Mundar
@@ -212,23 +195,19 @@ Omer Hadari
 Ondřej Súkup
 Oscar Benjamin
 Patrick Hayes
-Pauli Virtanen
 Paweł Adamczak
 Pedro Algarvio
-Philipp Loose
 Pieter Mulder
 Piotr Banaszkiewicz
 Pulkit Goyal
 Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
-Ralph Giles
 Ran Benita
 Raphael Castaneda
 Raphael Pierzina
 Raquel Alegre
 Ravi Chandra
-Robert Holt
 Roberto Polli
 Roland Puntaier
 Romain Dorgueil
@@ -243,12 +222,10 @@ Samuele Pedroni
 Sankt Petersbug
 Segev Finer
 Serhii Mozghovyi
-Seth Junot
 Simon Gomizelj
 Skylar Downes
 Srinivas Reddy Thatiparthy
 Stefan Farmbauer
-Stefan Scherfke
 Stefan Zimmermann
 Stefano Taschini
 Steffen Allner
@@ -261,13 +238,10 @@ Tareq Alayan
 Ted Xiao
 Thomas Grainger
 Thomas Hisch
-Tim Hoffmann
 Tim Strazny
 Tom Dalton
 Tom Viner
-Tomáš Gavenčiak
 Tomer Keren
-Tor Colvin
 Trevor Bekolay
 Tyler Goodlet
 Tzu-ping Chung
@@ -278,16 +252,12 @@ Vidar T. Fauske
 Virgil Dupras
 Vitaly Lashmanov
 Vlad Dragos
-Vladyslav Rachek
 Volodymyr Piskun
-Wei Lin
 Wil Cooley
 William Lee
 Wim Glenn
 Wouter van Ackooy
-Xixi Zhao
 Xuan Luong
 Xuecong Liao
-Yoav Caspi
 Zac Hatfield-Dodds
 Zoltán Máté

CODE_OF_CONDUCT.md

@@ -1,83 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at coc@pytest.org. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-The coc@pytest.org address is routed to the following people who can also be
-contacted individually:
-
-- Brianna Laugher ([@pfctdayelise](https://github.com/pfctdayelise)): brianna@laugher.id.au
-- Bruno Oliveira ([@nicoddemus](https://github.com/nicoddemus)): nicoddemus@gmail.com
-- Florian Bruhin ([@the-compiler](https://github.com/the-compiler)): pytest@the-compiler.org
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

CONTRIBUTING.rst

@@ -5,9 +5,8 @@ Contribution getting started
 Contributions are highly welcomed and appreciated.  Every little help counts,
 so do not hesitate!
 
-.. contents::
+.. contents:: Contribution links
    :depth: 2
-   :backlinks: none
 
 
 .. _submitfeedback:
@@ -51,8 +50,7 @@ Fix bugs
 
 Look through the `GitHub issues for bugs <https://github.com/pytest-dev/pytest/labels/type:%20bug>`_.
 
-: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.
+:ref:`Talk <contact>` to developers to find out how you can fix specific bugs.
 
 Don't forget to check the issue trackers of your favourite plugins, too!
 
@@ -86,7 +84,7 @@ 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``.
+    The built documentation should be available in the ``doc/en/_build/``.
 
     Where 'en' refers to the documentation language.
 
@@ -166,14 +164,16 @@ Short version
 
 #. Fork the repository.
 #. 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.
+#. Target ``master`` for bugfixes and doc changes.
+#. Target ``features`` for new features or functionality changes.
+#. Follow **PEP-8** for naming and `black <https://github.com/python/black>`_ for formatting.
 #. Tests are run using ``tox``::
 
-    tox -e linting,py37
+    tox -e linting,py27,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
+#. Write a ``changelog`` entry: ``changelog/2574.bugfix``, use issue id number
    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
@@ -202,20 +202,22 @@ Here is a simple overview, with pytest-specific bits:
 
     $ git clone git@github.com:YOUR_GITHUB_USERNAME/pytest.git
     $ cd pytest
-    # now, create your own branch off "master":
+    # now, to fix a bug create your own branch off "master":
 
         $ git checkout -b your-bugfix-branch-name master
 
-   Given we have "major.minor.micro" version numbers, bug fixes will usually
+    # or to instead add a feature create your own branch off "features":
+
+        $ git checkout -b your-feature-branch-name features
+
+   Given we have "major.minor.micro" version numbers, bugfixes will usually
    be released in micro releases whereas features will be released in
    minor releases and incompatible changes in major releases.
 
    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:
-
-   **Note: pre-commit must be installed as admin, as it will not function otherwise**::
+#. Install `pre-commit <https://pre-commit.com>`_ and its hook on the pytest repo::
 
      $ pip install --user pre-commit
      $ pre-commit install
@@ -235,20 +237,20 @@ Here is a simple overview, with pytest-specific bits:
 
 #. Run all the tests
 
-   You need to have Python 3.7 available in your system.  Now
+   You need to have Python 2.7 and 3.7 available in your system.  Now
    running tests is as simple as issuing this command::
 
-    $ tox -e linting,py37
+    $ tox -e linting,py27,py37
 
-   This command will run tests via the "tox" tool against Python 3.7
+   This command will run tests via the "tox" tool against Python 2.7 and 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.7 and pass options to pytest
+   You can pass different options to ``tox``. For example, to run tests on Python 2.7 and pass options to pytest
    (e.g. enter pdb on failure) to pytest you can do::
 
-    $ tox -e py37 -- --pdb
+    $ tox -e py27 -- --pdb
 
    Or to only run tests in a particular test module on Python 3.7::
 
@@ -257,28 +259,14 @@ Here is a simple overview, with pytest-specific bits:
 
    When committing, ``pre-commit`` will re-format the files if necessary.
 
-#. If instead of using ``tox`` you prefer to run the tests directly, then we suggest to create a virtual environment and use
-   an editable install with the ``testing`` extra::
-
-       $ python3 -m venv .venv
-       $ source .venv/bin/activate  # Linux
-       $ .venv/Scripts/activate.bat  # Windows
-       $ pip install -e ".[testing]"
-
-   Afterwards, you can edit the files and run pytest normally::
-
-       $ pytest testing/test_config.py
-
-
 #. 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``,
+#. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>``,
    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.
+   ``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or ``trivial``.
 
 #. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
 
@@ -288,7 +276,8 @@ Here is a simple overview, with pytest-specific bits:
     compare: your-branch-name
 
     base-fork: pytest-dev/pytest
-    base: master
+    base: master          # if it's a bugfix
+    base: features        # if it's a feature
 
 
 Writing Tests

HOWTORELEASE.rst

@@ -0,0 +1,48 @@
+Release Procedure
+-----------------
+
+Our current policy for releasing is to aim for a bugfix every few weeks and a minor release every 2-3 months. The idea
+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.
+
+.. important::
+
+    pytest releases must be prepared on **Linux** because the docs and examples expect
+    to be executed in that platform.
+
+#. Create a branch ``release-X.Y.Z`` with the version for the release.
+
+   * **patch releases**: from the latest ``master``;
+
+   * **minor releases**: from the latest ``features``; then merge with the latest ``master``;
+
+   Ensure your are in a clean work tree.
+
+#. Using ``tox``, generate docs, changelog, announcements::
+
+    $ tox -e release -- <VERSION>
+
+   This will generate a commit with all the changes ready for pushing.
+
+#. Open a PR for this branch targeting ``master``.
+
+#. After all tests pass and the PR has been approved, publish to PyPI by pushing the tag::
+
+     git tag <VERSION>
+     git push git@github.com:pytest-dev/pytest.git <VERSION>
+
+   Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
+
+#. Merge the PR into ``master``.
+
+#. Send an email announcement with the contents from::
+
+     doc/en/announce/release-<VERSION>.rst
+
+   To the following mailing lists:
+
+   * pytest-dev@python.org (all releases)
+   * python-announce-list@python.org (all releases)
+   * testing-in-python@lists.idyll.org (only major/minor releases)
+
+   And announce it on `Twitter <https://twitter.com/>`_ with the ``#pytest`` hashtag.

OPENCOLLECTIVE.rst

@@ -1,44 +0,0 @@
-==============
-OpenCollective
-==============
-
-pytest has a collective setup at `OpenCollective`_. This document describes how the core team manages
-OpenCollective-related activities.
-
-What is it
-==========
-
-Open Collective is an online funding platform for open and transparent communities.
-It provides tools to raise money and share your finances in full transparency.
-
-It is the platform of choice for individuals and companies that want to make one-time or
-monthly donations directly to the project.
-
-Funds
-=====
-
-The OpenCollective funds donated to pytest will be used to fund overall maintenance,
-local sprints, merchandising (stickers to distribute in conferences for example), and future
-gatherings of pytest developers (sprints).
-
-`Core contributors`_ which are contributing on a continuous basis are free to submit invoices
-to bill maintenance hours using the platform. How much each contributor should request is still an
-open question, but we should use common sense and trust in the contributors, most of which know
-themselves in-person. A good rule of thumb is to bill the same amount as monthly payments
-contributors which participate in the `Tidelift`_ subscription. If in doubt, just ask.
-
-Admins
-======
-
-A few people have admin access to the OpenCollective dashboard to make changes. Those people
-are part of the `@pytest-dev/opencollective-admins`_ team.
-
-`Core contributors`_ interested in helping out with OpenCollective maintenance are welcome! We don't
-expect much work here other than the occasional approval of expenses from other core contributors.
-Just drop a line to one of the `@pytest-dev/opencollective-admins`_ or use the mailing list.
-
-
-.. _`OpenCollective`: https://opencollective.com/pytest
-.. _`Tidelift`: https://tidelift.com
-.. _`core contributors`: https://github.com/orgs/pytest-dev/teams/core/members
-.. _`@pytest-dev/opencollective-admins`: https://github.com/orgs/pytest-dev/teams/opencollective-admins/members

README.rst

@@ -26,15 +26,11 @@
     :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
+    :target: https://github.com/python/black
 
 .. image:: https://www.codetriage.com/pytest-dev/pytest/badges/users.svg
     :target: https://www.codetriage.com/pytest-dev/pytest
 
-.. image:: https://readthedocs.org/projects/pytest/badge/?version=latest
-    :target: https://pytest.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
-
 The ``pytest`` framework makes it easy to write small tests, yet
 scales to support complex functional testing for applications and libraries.
 
@@ -89,7 +85,7 @@ Features
 - 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.5+ and PyPy3;
+- Python 2.7, Python 3.4+, PyPy 2.3, Jython 2.5 (untested);
 
 - Rich plugin architecture, with over 315+ `external plugins <http://plugincompat.herokuapp.com>`_ and thriving community;
 
@@ -115,33 +111,19 @@ Consult the `Changelog <https://docs.pytest.org/en/latest/changelog.html>`__ pag
 Support pytest
 --------------
 
-`Open Collective`_ is an online funding platform for open and transparent communities.
-It provides tools to raise money and share your finances in full transparency.
+You can support pytest by obtaining a `Tideflift subscription`_.
 
-It is the platform of choice for individuals and companies that want to make one-time or
-monthly donations directly to the project.
-
-See more details in the `pytest collective`_.
-
-.. _Open Collective: https://opencollective.com
-.. _pytest collective: https://opencollective.com/pytest
+Tidelift gives software development teams a single source for purchasing and maintaining their software,
+with professional grade assurances from the experts who know it best, while seamlessly integrating with existing tools.
 
 
-pytest for enterprise
----------------------
+.. _`Tideflift subscription`: https://tidelift.com/subscription/pkg/pypi-pytest?utm_source=pypi-pytest&utm_medium=referral&utm_campaign=readme
 
-Available as part of the Tidelift Subscription.
-
-The maintainers of pytest and thousands of other packages are working with Tidelift to deliver commercial support and
-maintenance for the open source dependencies you use to build your applications.
-Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use.
-
-`Learn more. <https://tidelift.com/subscription/pkg/pypi-pytest?utm_source=pypi-pytest&utm_medium=referral&utm_campaign=enterprise&utm_term=repo>`_
 
 Security
 ^^^^^^^^
 
-pytest has never been associated with a security vulnerability, but in any case, to report a
+pytest has never been associated with a security vunerability, but in any case, to report a
 security vulnerability please use the `Tidelift security contact <https://tidelift.com/security>`_.
 Tidelift will coordinate the fix and disclosure.
 

RELEASING.rst

@@ -1,82 +0,0 @@
-Release Procedure
------------------
-
-Our current policy for releasing is to aim for a bug-fix release every few weeks and a minor release every 2-3 months. The idea
-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.
-
-Preparing: Automatic Method
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We have developed an automated workflow for releases, that uses GitHub workflows and is triggered
-by opening an issue or issuing a comment one.
-
-The comment must be in the form::
-
-    @pytestbot please prepare release from BRANCH
-
-Where ``BRANCH`` is ``master`` or one of the maintenance branches.
-
-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.
-
-To release a version ``MAJOR.MINOR.PATCH``, follow these steps:
-
-#. 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.
-
-   Ensure your are updated and in a clean working tree.
-
-#. Using ``tox``, generate docs, changelog, announcements::
-
-    $ tox -e release -- MAJOR.MINOR.PATCH
-
-   This will generate a commit with all the changes ready for pushing.
-
-#. Open a PR for the ``release-MAJOR.MINOR.PATCH`` branch targeting ``MAJOR.MINOR.x``.
-
-
-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, tag the release commit
-   in the ``MAJOR.MINOR.x`` branch and push it. This will publish to PyPI::
-
-     git tag MAJOR.MINOR.PATCH
-     git push git@github.com:pytest-dev/pytest.git MAJOR.MINOR.PATCH
-
-   Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/pytest>`_.
-
-#. Merge the PR.
-
-#. Cherry-pick the CHANGELOG / announce files to the ``master`` 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::
-
-     doc/en/announce/release-<VERSION>.rst
-
-   To the following mailing lists:
-
-   * pytest-dev@python.org (all releases)
-   * python-announce-list@python.org (all releases)
-   * testing-in-python@lists.idyll.org (only major/minor releases)
-
-   And announce it on `Twitter <https://twitter.com/>`_ with the ``#pytest`` hashtag.

TIDELIFT.rst

@@ -12,9 +12,6 @@ Tidelift aims to make Open Source sustainable by offering subscriptions to compa
 on Open Source packages. This subscription allows it to pay maintainers of those Open Source
 packages to aid sustainability of the work.
 
-It is the perfect platform for companies that want to support Open Source packages and at the same
-time obtain assurances regarding maintenance, quality and security.
-
 Funds
 =====
 

azure-pipelines.yml

@@ -0,0 +1,107 @@
+trigger:
+- master
+- features
+
+variables:
+  PYTEST_ADDOPTS: "--junitxml=build/test-results/$(tox.env).xml -vv"
+  python.needs_vc: False
+  COVERAGE_FILE: "$(Build.Repository.LocalPath)/.coverage"
+  COVERAGE_PROCESS_START: "$(Build.Repository.LocalPath)/.coveragerc"
+  PYTEST_COVERAGE: '0'
+
+jobs:
+
+- job: 'Test'
+  pool:
+    vmImage: "vs2017-win2016"
+  strategy:
+    matrix:
+      py27:
+        python.version: '2.7'
+        tox.env: 'py27'
+      py27-nobyte-lsof-numpy:
+        python.version: '2.7'
+        tox.env: 'py27-lsof-nobyte-numpy'
+        # Coverage for:
+        # - test_supports_breakpoint_module_global
+        # - test_terminal_reporter_writer_attr (without xdist)
+        # - "if write" branch in _pytest.assertion.rewrite
+        # - numpy
+        # - pytester's LsofFdLeakChecker (being skipped)
+        PYTEST_COVERAGE: '1'
+      py27-twisted:
+        python.version: '2.7'
+        tox.env: 'py27-twisted'
+        python.needs_vc: True
+      py27-pluggymaster-xdist:
+        python.version: '2.7'
+        tox.env: 'py27-pluggymaster-xdist'
+        # Coverage for:
+        # - except-IOError in _attempt_to_close_capture_file for py2.
+        #   Also seen with py27-nobyte (using xdist), and py27-xdist.
+        #   But no exception with py27-pexpect,py27-twisted,py27-numpy.
+        PYTEST_COVERAGE: '1'
+      # -- pypy2 and pypy3 are disabled for now: #5279 --
+      # pypy:
+      #   python.version: 'pypy2'
+      #   tox.env: 'pypy'
+      # pypy3:
+      #   python.version: 'pypy3'
+      #   tox.env: 'pypy3'
+      py35-xdist:
+        python.version: '3.5'
+        tox.env: 'py35-xdist'
+        # Coverage for:
+        # - test_supports_breakpoint_module_global
+        PYTEST_COVERAGE: '1'
+      py36-xdist:
+        python.version: '3.6'
+        tox.env: 'py36-xdist'
+      py37:
+        python.version: '3.7'
+        tox.env: 'py37'
+        # Coverage for:
+        # - _py36_windowsconsoleio_workaround (with py36+)
+        # - test_request_garbage (no xdist)
+        PYTEST_COVERAGE: '1'
+      py37-linting/docs/doctesting:
+        python.version: '3.7'
+        tox.env: 'linting,docs,doctesting'
+      py37-twisted/numpy:
+        python.version: '3.7'
+        tox.env: 'py37-twisted,py37-numpy'
+      py37-pluggymaster-xdist:
+        python.version: '3.7'
+        tox.env: 'py37-pluggymaster-xdist'
+    maxParallel: 10
+
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
+      architecture: 'x64'
+
+  - script: choco install vcpython27
+    condition: eq(variables['python.needs_vc'], True)
+    displayName: 'Install VC for py27'
+
+  - script: python -m pip install tox
+    displayName: 'Install tox'
+
+  - script: |
+      call scripts/setup-coverage-vars.bat || goto :eof
+      python -m tox -e $(tox.env)
+    displayName: 'Run tests'
+
+  - task: PublishTestResults@2
+    inputs:
+      testResultsFiles: 'build/test-results/$(tox.env).xml'
+      testRunTitle: '$(tox.env)'
+    condition: succeededOrFailed()
+
+  - script: call scripts\upload-coverage.bat
+    displayName: 'Report and upload coverage'
+    condition: eq(variables['PYTEST_COVERAGE'], '1')
+    env:
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+      PYTEST_CODECOV_NAME: $(tox.env)

bench/bench.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 
 if __name__ == "__main__":
@@ -6,7 +7,7 @@ if __name__ == "__main__":
     import pstats
 
     script = sys.argv[1:] if len(sys.argv) > 1 else ["empty.py"]
-    cProfile.run("pytest.cmdline.main(%r)" % script, "prof")
+    stats = cProfile.run("pytest.cmdline.main(%r)" % script, "prof")
     p = pstats.Stats("prof")
     p.strip_dirs()
     p.sort_stats("cumulative")

bench/bench_argcomplete.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # 10000 iterations, just for relative comparison
 #                      2.7.5     3.3.2
 # FilesCompleter       75.1109   69.2116

bench/empty.py

@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 for i in range(1000):
     exec("def test_func_%d(): pass" % i)

bench/manyparam.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 

bench/skip.py

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+from six.moves import range
+
 import pytest
 
 SKIP = True

changelog/5456.bugfix.rst

@@ -1,2 +0,0 @@
-Fix a possible race condition when trying to remove lock files used to control access to folders
-created by ``tmp_path`` and ``tmpdir``.

changelog/README.rst

@@ -1,24 +1,21 @@
 This directory contains "newsfragments" which are short files that contain a small **ReST**-formatted
 text that will be added to the next ``CHANGELOG``.
 
-The ``CHANGELOG`` will be read by **users**, so this description should be aimed to pytest users
+The ``CHANGELOG`` will be read by users, so this description should be aimed to pytest users
 instead of describing internal changes which are only relevant to the developers.
 
-Make sure to use full sentences in the **past or present tense** and use punctuation, examples::
+Make sure to use full sentences with correct case and punctuation, for example::
 
-    Improved verbose diff output with sequences.
-
-    Terminal summary statistics now use multiple colors.
+    Fix issue with non-ascii messages from the ``warnings`` module.
 
 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 ``--junitxml``, improved colors in terminal, etc).
-* ``bugfix``: fixes a bug.
+* ``bugfix``: fixes a reported bug.
 * ``doc``: documentation improvement, like rewording an entire session or adding missing docs.
 * ``deprecation``: feature deprecation.
-* ``breaking``: a change which may break existing suites, such as feature removal or behavior change.
+* ``removal``: feature removal.
 * ``vendor``: changes in packages vendored in pytest.
 * ``trivial``: fixing a small typo or internal change that might be noteworthy.
 
@@ -31,7 +28,6 @@ changelog using that instead.
 If you are not sure what issue type to use, don't hesitate to ask in your PR.
 
 ``towncrier`` preserves multiple paragraphs and formatting (code blocks, lists, and so on), but for entries
-other than ``features`` it is usually better to stick to a single paragraph to keep it concise.
-
-You can also run ``tox -e docs`` to build the documentation
-with the draft changelog (``doc/en/_build/html/changelog.html``) if you want to get a preview of how your change will look in the final release notes.
+other than ``features`` it is usually better to stick to a single paragraph to keep it concise. You can install
+``towncrier`` and then run ``towncrier --draft``
+if you want to get a preview of how your change will look in the final release notes.

codecov.yml

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

doc/en/Makefile

@@ -1,30 +1,22 @@
-# Minimal makefile for Sphinx documentation
+# Makefile for Sphinx documentation
 #
 
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
 BUILDDIR      = _build
 
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 REGENDOC_ARGS := \
 	--normalize "/[ \t]+\n/\n/" \
 	--normalize "~\$$REGENDOC_TMPDIR~/home/sweet/project~" \
 	--normalize "~/path/to/example~/home/sweet/project~" \
-	--normalize "/in \d.\d\ds/in 0.12s/" \
+	--normalize "/in \d+.\d+ seconds/in 0.12 seconds/" \
 	--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@" \
@@ -33,8 +25,130 @@ REGENDOC_ARGS := \
 	--normalize "@hypothesis-(\d+)\\.[.\d,]+@hypothesis-\1.x.y@" \
 	--normalize "@Python (\d+)\\.[^ ,]+@Python \1.x.y@"
 
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  showtarget to show the pytest.org target directory"
+	@echo "  install    to install docs to pytest.org/SITETARGET"
+	@echo "  install-ldf to install the doc pdf to pytest.org/SITETARGET"
+	@echo "  regen      to regenerate pytest examples using the installed pytest"
+	@echo "  linkcheck  to check all external links for integrity"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
 regen: REGENDOC_FILES:=*.rst */*.rst
 regen:
 	PYTHONDONTWRITEBYTECODE=1 PYTEST_ADDOPTS="-pno:hypothesis -Wignore::pytest.PytestUnknownMarkWarning" COLUMNS=76 regendoc --update ${REGENDOC_FILES} ${REGENDOC_ARGS}
 
-.PHONY: regen
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/pytest.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/pytest.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/pytest"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/pytest"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	make -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+texinfo:
+	mkdir -p $(BUILDDIR)/texinfo
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	mkdir -p $(BUILDDIR)/texinfo
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."

doc/en/_templates/globaltoc.html

@@ -4,15 +4,12 @@
   <li><a href="{{ pathto('index') }}">Home</a></li>
   <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('reference') }}">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>
   <li><a href="{{ pathto('contact') }}">Contact Channels</a></li>
 </ul>
@@ -21,7 +18,3 @@
   <hr>
   {{ toc }}
 {%- endif %}
-
-<hr>
-<a href="{{ pathto('genindex') }}">Index</a>
-<hr>

doc/en/_templates/layout.html

@@ -0,0 +1,20 @@
+{% extends "!layout.html" %}
+{% block header %}
+  {{super()}}
+{% endblock %}
+{% block footer %}
+{{ super() }}
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-7597274-13']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+{% endblock %}

doc/en/_themes/flask/layout.html

@@ -16,7 +16,7 @@
 {%- block footer %}
   <div class="footer">
     &copy; Copyright {{ copyright }}.
-    Created using <a href="https://www.sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.
+    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
   </div>
   {% if pagename == 'index' %}
   </div>

doc/en/_themes/flask/slim_searchbox.html

@@ -1,15 +0,0 @@
-{#
-    basic/searchbox.html with heading removed.
-#}
-{%- if pagename != "search" and builder != "singlehtml" %}
-<div id="searchbox" style="display: none" role="search">
-  <div class="searchformwrapper">
-    <form class="search" action="{{ pathto('search') }}" method="get">
-      <input type="text" name="q" aria-labelledby="searchlabel"
-        placeholder="Search"/>
-      <input type="submit" value="{{ _('Go') }}" />
-    </form>
-  </div>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
-{%- endif %}

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

@@ -8,12 +8,11 @@
 
 {% 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' %}
+/* orange of logo is #d67c29 but we use black for links for now */
+{% set link_color = '#000' %}
+{% set link_hover_color = '#000' %}
 {% set base_font = 'sans-serif' %}
-{% set header_font = 'sans-serif' %}
+{% set header_font = 'serif' %}
 
 @import url("basic.css");
 
@@ -21,7 +20,7 @@
 
 body {
     font-family: {{ base_font }};
-    font-size: 16px;
+    font-size: 17px;
     background-color: white;
     color: #000;
     margin: 0;
@@ -79,13 +78,13 @@ div.related {
 }
 
 div.sphinxsidebar a {
+    color: #444;
     text-decoration: none;
-    border-bottom: none;
+    border-bottom: 1px dotted #999;
 }
 
 div.sphinxsidebar a:hover {
-    color: {{ link_hover_color }};
-    border-bottom: 1px solid {{ link_hover_color }};
+    border-bottom: 1px solid #999;
 }
 
 div.sphinxsidebar {
@@ -107,14 +106,14 @@ div.sphinxsidebar h3,
 div.sphinxsidebar h4 {
     font-family: {{ header_font }};
     color: #444;
-    font-size: 21px;
+    font-size: 24px;
     font-weight: normal;
-    margin: 16px 0 0 0;
+    margin: 0 0 5px 0;
     padding: 0;
 }
 
 div.sphinxsidebar h4 {
-    font-size: 18px;
+    font-size: 20px;
 }
 
 div.sphinxsidebar h3 a {
@@ -206,22 +205,10 @@ 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;
+    margin: 20px -30px;
+    padding: 10px 30px;
     border-top: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
 }
@@ -230,6 +217,11 @@ div.admonition tt.xref, div.admonition a tt {
     border-bottom: 1px solid #fafafa;
 }
 
+dd div.admonition {
+    margin-left: -60px;
+    padding-left: 60px;
+}
+
 div.admonition p.admonition-title {
     font-family: {{ header_font }};
     font-weight: normal;
@@ -239,7 +231,7 @@ div.admonition p.admonition-title {
     line-height: 1;
 }
 
-div.admonition :last-child {
+div.admonition p.last {
     margin-bottom: 0;
 }
 
@@ -251,7 +243,7 @@ dt:target, .highlight {
     background: #FAF3E8;
 }
 
-div.note, div.warning {
+div.note {
     background-color: #eee;
     border: 1px solid #ccc;
 }
@@ -265,11 +257,6 @@ div.topic {
     background-color: #eee;
 }
 
-div.topic a {
-    text-decoration: none;
-    border-bottom: none;
-}
-
 p.admonition-title {
     display: inline;
 }
@@ -371,10 +358,21 @@ ul, ol {
 
 pre {
     background: #eee;
-    padding: 7px 12px;
+    padding: 7px 30px;
+    margin: 15px -30px;
     line-height: 1.3em;
 }
 
+dl pre, blockquote pre, li pre {
+    margin-left: -60px;
+    padding-left: 60px;
+}
+
+dl dl pre {
+    margin-left: -90px;
+    padding-left: 90px;
+}
+
 tt {
     background-color: #ecf0f3;
     color: #222;
@@ -395,20 +393,6 @@ 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;
@@ -424,56 +408,6 @@ 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) {
 

doc/en/_themes/flask_theme_support.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # flasky extensions.  flasky pygments style based on tango style
 from pygments.style import Style
 from pygments.token import Comment

doc/en/adopt.rst

@@ -24,9 +24,11 @@ The ideal pytest helper
  - feels confident in using pytest (e.g. has explored command line options, knows how to write parametrized tests, has an idea about conftest contents)
  - does not need to be an expert in every aspect!
 
-Pytest helpers, sign up here! (preferably in February, hard deadline 22 March)
+`Pytest helpers, sign up here`_! (preferably in February, hard deadline 22 March)
 
 
+.. _`Pytest helpers, sign up here`: http://goo.gl/forms/nxqAhqWt1P
+
 
 The ideal partner project
 -----------------------------------------
@@ -38,9 +40,11 @@ The ideal partner project
  - has the support of the core development team, in trying out pytest adoption
  - has no tests... or 100% test coverage... or somewhere in between!
 
-Partner projects, sign up here! (by 22 March)
+`Partner projects, sign up here`_! (by 22 March)
 
 
+.. _`Partner projects, sign up here`:  http://goo.gl/forms/ZGyqlHiwk3
+
 
 What does it mean to "adopt pytest"?
 -----------------------------------------
@@ -64,11 +68,11 @@ 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 and unittest`: faq.html#how-does-pytest-relate-to-nose-and-unittest
-.. _assert: assert.html
+.. _assert: asserts.html
 .. _pycmd: https://bitbucket.org/hpk42/pycmd/overview
 .. _`setUp/tearDown methods`: xunit_setup.html
 .. _fixtures: fixture.html
-.. _markers: mark.html
+.. _markers: markers.html
 .. _distributed: xdist.html
 
 

doc/en/announce/index.rst

@@ -6,27 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
-   release-5.4.3
-   release-5.4.2
-   release-5.4.1
-   release-5.4.0
-   release-5.3.5
-   release-5.3.4
-   release-5.3.3
-   release-5.3.2
-   release-5.3.1
-   release-5.3.0
-   release-5.2.4
-   release-5.2.3
-   release-5.2.2
-   release-5.2.1
-   release-5.2.0
-   release-5.1.3
-   release-5.1.2
-   release-5.1.1
-   release-5.1.0
-   release-5.0.1
-   release-5.0.0
+   release-4.6.10
    release-4.6.9
    release-4.6.8
    release-4.6.7

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/latest/index.html
+    http://pytest.org/2.0.0/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/latest/usage.html for details.
+  see http://pytest.org/2.0.0/usage.html for details.
 
 - new and better reporting information in assert expressions
   if comparing lists, sequences or strings.
 
-  see http://pytest.org/en/latest/assert.html#newreport
+  see http://pytest.org/2.0.0/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/latest/customize.html
+  see http://pytest.org/2.0.0/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/latest/plugins.html#cmdunregister
+  command line, see http://pytest.org/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/latest/assert.html for
+See http://pytest.org/assert.html#advanced-assertion-introspection for
 detailed information.  The work has been partly sponsored by my company,
 merlinux GmbH.
 

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/latest/example/parametrize.html
+  - see examples at http://pytest.org/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/latest/example/markers.html
+  - see examples at http://pytest.org/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/latest/mark.html
+  for your test suite.  See examples at http://pytest.org/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

@@ -3,22 +3,22 @@ pytest-2.3: improved fixtures / better unittest integration
 
 pytest-2.3 comes with many major improvements for fixture/funcarg management
 and parametrized testing in Python.  It is now easier, more efficient and
-more predictable to re-run the same tests with different fixture
+more predicatable to re-run the same tests with different fixture
 instances.  Also, you can directly declare the caching "scope" of
 fixtures so that dependent tests throughout your whole test suite can
 re-use database or other expensive fixture objects with ease.  Lastly,
 it's possible for fixture functions (formerly known as funcarg
 factories) to use other fixtures, allowing for a completely modular and
-re-usable fixture design.
+re-useable fixture design.
 
 For detailed info and tutorial-style examples, see:
 
-    http://pytest.org/en/latest/fixture.html
+    http://pytest.org/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/latest/unittest.html
+    http://pytest.org/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/latest/funcarg_compare.html
+http://pytest.org/latest/funcarg_compare.html
 
 For general info on installation and getting started:
 
-    http://pytest.org/en/latest/getting-started.html
+    http://pytest.org/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 http://pytest.org/en/latest/faq.html
+- fix issue159: improve http://pytest.org/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/latest/example/parametrize.html
+  http://pytest.org/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.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/latest/yieldfixture.html>`_, allowing to use
+  <http://pytest.org/latest/yieldfixture.html>`_, allowing to use
   existing with-style context managers in fixture functions.
 
 - improved pdb support: ``import pdb ; pdb.set_trace()`` now works

doc/en/announce/release-2.5.0.rst

@@ -91,7 +91,7 @@ holger krekel
   it might be the cause for other finalizers to fail.
 
 - fix ordering when mock.patch or other standard decorator-wrappings
-  are used with test methods.  This fixes issue346 and should
+  are used with test methods.  This fixues issue346 and should
   help with random "xdist" collection failures.  Thanks to
   Ronny Pfannschmidt and Donald Stufft for helping to isolate it.
 

doc/en/announce/release-2.7.0.rst

@@ -35,7 +35,7 @@ holger krekel
 - fix issue435: make reload() work when assert rewriting is active.
   Thanks Daniel Hahler.
 
-- fix issue616: conftest.py files and their contained fixtures are now
+- fix issue616: conftest.py files and their contained fixutres are now
   properly considered for visibility, independently from the exact
   current working directory and test arguments that are used.
   Many thanks to Eric Siegerman and his PR235 which contains
@@ -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/latest/contributing.html .
+  github.  See https://pytest.org/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.9.0.rst

@@ -75,7 +75,7 @@ The py.test Development Team
 
 **Changes**
 
-* **Important**: `py.code <https://pylib.readthedocs.io/en/stable/code.html>`_ has been
+* **Important**: `py.code <https://pylib.readthedocs.io/en/latest/code.html>`_ has been
   merged into the ``pytest`` repository as ``pytest._code``. This decision
   was made because ``py.code`` had very few uses outside ``pytest`` and the
   fact that it was in a different repository made it difficult to fix bugs on
@@ -88,7 +88,7 @@ The py.test Development Team
   **experimental**, so you definitely should not import it explicitly!
 
   Please note that the original ``py.code`` is still available in
-  `pylib <https://pylib.readthedocs.io/en/stable/>`_.
+  `pylib <https://pylib.readthedocs.io>`_.
 
 * ``pytest_enter_pdb`` now optionally receives the pytest config object.
   Thanks `@nicoddemus`_ for the PR.
@@ -131,7 +131,7 @@ The py.test Development Team
   with same name.
 
 
-.. _`traceback style docs`: https://pytest.org/en/latest/usage.html#modifying-python-traceback-printing
+.. _`traceback style docs`: https://pytest.org/latest/usage.html#modifying-python-traceback-printing
 
 .. _#1422: https://github.com/pytest-dev/pytest/issues/1422
 .. _#1379: https://github.com/pytest-dev/pytest/issues/1379

doc/en/announce/release-2.9.2.rst

@@ -66,8 +66,8 @@ The py.test Development Team
 
 .. _#510: https://github.com/pytest-dev/pytest/issues/510
 .. _#1506: https://github.com/pytest-dev/pytest/pull/1506
-.. _#1496: https://github.com/pytest-dev/pytest/issues/1496
-.. _#1524: https://github.com/pytest-dev/pytest/pull/1524
+.. _#1496: https://github.com/pytest-dev/pytest/issue/1496
+.. _#1524: https://github.com/pytest-dev/pytest/issue/1524
 
 .. _@astraw38: https://github.com/astraw38
 .. _@hackebrot: https://github.com/hackebrot

doc/en/announce/release-3.8.2.rst

@@ -20,7 +20,7 @@ Thanks to all who contributed to this release, among them:
 * Jeffrey Rackauckas
 * Jose Carlos Menezes
 * Ronny Pfannschmidt
-* Zac Hatfield-Dodds
+* Zac-HD
 * iwanb
 
 

doc/en/announce/release-4.3.1.rst

@@ -21,6 +21,7 @@ Thanks to all who contributed to this release, among them:
 * Kyle Altendorf
 * Stephan Hoyer
 * Zac Hatfield-Dodds
+* Zac-HD
 * songbowen
 
 

doc/en/announce/release-4.5.0.rst

@@ -28,6 +28,7 @@ Thanks to all who contributed to this release, among them:
 * Pulkit Goyal
 * Samuel Searles-Bryant
 * Zac Hatfield-Dodds
+* Zac-HD
 
 
 Happy testing,

doc/en/announce/release-4.6.10.rst

@@ -1,7 +1,7 @@
-pytest-5.4.3
+pytest-4.6.10
 =======================================
 
-pytest 5.4.3 has just been released to PyPI.
+pytest 4.6.10 has just been released to PyPI.
 
 This is a bug-fix release, being a drop-in replacement. To upgrade::
 
@@ -13,8 +13,7 @@ Thanks to all who contributed to this release, among them:
 
 * Anthony Sottile
 * Bruno Oliveira
-* Ran Benita
-* Tor Colvin
+* Fernando Mez
 
 
 Happy testing,

doc/en/announce/release-5.0.0.rst

@@ -1,46 +0,0 @@
-pytest-5.0.0
-=======================================
-
-The pytest team is proud to announce the 5.0.0 release!
-
-pytest is a mature Python testing tool with more than a 2000 tests
-against itself, passing on many different interpreters and platforms.
-
-This release contains a number of bugs fixes and improvements, so users are encouraged
-to take a look at the CHANGELOG:
-
-    https://docs.pytest.org/en/latest/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/latest/
-
-As usual, you can upgrade from pypi via:
-
-    pip install -U pytest
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* Dirk Thomas
-* Evan Kepner
-* Florian Bruhin
-* Hugo
-* Kevin J. Foley
-* Pulkit Goyal
-* Ralph Giles
-* Ronny Pfannschmidt
-* Thomas Grainger
-* Thomas Hisch
-* Tim Gates
-* Victor Maryama
-* Yuri Apollov
-* Zac Hatfield-Dodds
-* curiousjazz77
-* patriksevallius
-
-
-Happy testing,
-The Pytest Development Team

doc/en/announce/release-5.0.1.rst

@@ -1,25 +0,0 @@
-pytest-5.0.1
-=======================================
-
-pytest 5.0.1 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* AmirElkess
-* Andreu Vallbona Plazas
-* Anthony Sottile
-* Bruno Oliveira
-* Florian Bruhin
-* Michael Moore
-* Niklas Meinzer
-* Thomas Grainger
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.1.0.rst

@@ -1,56 +0,0 @@
-pytest-5.1.0
-=======================================
-
-The pytest team is proud to announce the 5.1.0 release!
-
-pytest is a mature Python testing tool with more than a 2000 tests
-against itself, passing on many different interpreters and platforms.
-
-This release contains a number of bugs fixes and improvements, so users are encouraged
-to take a look at the CHANGELOG:
-
-    https://docs.pytest.org/en/latest/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/latest/
-
-As usual, you can upgrade from pypi via:
-
-    pip install -U pytest
-
-Thanks to all who contributed to this release, among them:
-
-* Albert Tugushev
-* Alexey Zankevich
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* David Röthlisberger
-* Florian Bruhin
-* Ilya Stepin
-* Jon Dufresne
-* Kaiqi
-* Max R
-* Miro Hrončok
-* Oliver Bestwalter
-* Ran Benita
-* Ronny Pfannschmidt
-* Samuel Searles-Bryant
-* Semen Zhydenko
-* Steffen Schroeder
-* Thomas Grainger
-* Tim Hoffmann
-* William Woodall
-* Wojtek Erbetowski
-* Xixi Zhao
-* Yash Todi
-* boris
-* dmitry.dygalo
-* helloocc
-* martbln
-* mei-li
-
-
-Happy testing,
-The Pytest Development Team

doc/en/announce/release-5.1.1.rst

@@ -1,24 +0,0 @@
-pytest-5.1.1
-=======================================
-
-pytest 5.1.1 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* Florian Bruhin
-* Hugo van Kemenade
-* Ran Benita
-* Ronny Pfannschmidt
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.1.2.rst

@@ -1,23 +0,0 @@
-pytest-5.1.2
-=======================================
-
-pytest 5.1.2 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Andrzej Klajnert
-* Anthony Sottile
-* Bruno Oliveira
-* Christian Neumüller
-* Robert Holt
-* linchiwei123
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.1.3.rst

@@ -1,23 +0,0 @@
-pytest-5.1.3
-=======================================
-
-pytest 5.1.3 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Christian Neumüller
-* Daniel Hahler
-* Gene Wood
-* Hugo
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.2.0.rst

@@ -1,35 +0,0 @@
-pytest-5.2.0
-=======================================
-
-The pytest team is proud to announce the 5.2.0 release!
-
-pytest is a mature Python testing tool with more than a 2000 tests
-against itself, passing on many different interpreters and platforms.
-
-This release contains a number of bugs fixes and improvements, so users are encouraged
-to take a look at the CHANGELOG:
-
-    https://docs.pytest.org/en/latest/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/latest/
-
-As usual, you can upgrade from pypi via:
-
-    pip install -U pytest
-
-Thanks to all who contributed to this release, among them:
-
-* Andrzej Klajnert
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* James Cooke
-* Michael Goerz
-* Ran Benita
-* Tomáš Chvátal
-
-
-Happy testing,
-The Pytest Development Team

doc/en/announce/release-5.2.1.rst

@@ -1,23 +0,0 @@
-pytest-5.2.1
-=======================================
-
-pytest 5.2.1 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Florian Bruhin
-* Hynek Schlawack
-* Kevin J. Foley
-* tadashigaki
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.2.2.rst

@@ -1,29 +0,0 @@
-pytest-5.2.2
-=======================================
-
-pytest 5.2.2 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Albert Tugushev
-* Andrzej Klajnert
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* Florian Bruhin
-* Nattaphoom Chaipreecha
-* Oliver Bestwalter
-* Philipp Loose
-* Ran Benita
-* Victor Maryama
-* Yoav Caspi
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.2.3.rst

@@ -1,28 +0,0 @@
-pytest-5.2.3
-=======================================
-
-pytest 5.2.3 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Brett Cannon
-* Bruno Oliveira
-* Daniel Hahler
-* Daniil Galiev
-* David Szotten
-* Florian Bruhin
-* Patrick Harmon
-* Ran Benita
-* Zac Hatfield-Dodds
-* Zak Hassan
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.2.4.rst

@@ -1,22 +0,0 @@
-pytest-5.2.4
-=======================================
-
-pytest 5.2.4 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* Hugo
-* Michael Shields
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.3.0.rst

@@ -1,45 +0,0 @@
-pytest-5.3.0
-=======================================
-
-The pytest team is proud to announce the 5.3.0 release!
-
-pytest is a mature Python testing tool with more than a 2000 tests
-against itself, passing on many different interpreters and platforms.
-
-This release contains a number of bugs fixes and improvements, so users are encouraged
-to take a look at the CHANGELOG:
-
-    https://docs.pytest.org/en/latest/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/latest/
-
-As usual, you can upgrade from pypi via:
-
-    pip install -U pytest
-
-Thanks to all who contributed to this release, among them:
-
-* AnjoMan
-* Anthony Sottile
-* Anton Lodder
-* Bruno Oliveira
-* Daniel Hahler
-* Gregory Lee
-* Josh Karpel
-* JoshKarpel
-* Joshua Storck
-* Kale Kundert
-* MarcoGorelli
-* Michael Krebs
-* NNRepos
-* Ran Benita
-* TH3CHARLie
-* Tibor Arpas
-* Zac Hatfield-Dodds
-* 林玮
-
-
-Happy testing,
-The Pytest Development Team

doc/en/announce/release-5.3.1.rst

@@ -1,26 +0,0 @@
-pytest-5.3.1
-=======================================
-
-pytest 5.3.1 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* Felix Yan
-* Florian Bruhin
-* Mark Dickinson
-* Nikolay Kondratyev
-* Steffen Schroeder
-* Zac Hatfield-Dodds
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.3.2.rst

@@ -1,26 +0,0 @@
-pytest-5.3.2
-=======================================
-
-pytest 5.3.2 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Claudio Madotto
-* Daniel Hahler
-* Jared Vasquez
-* Michael Rose
-* Ran Benita
-* Ronny Pfannschmidt
-* Zac Hatfield-Dodds
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.3.3.rst

@@ -1,30 +0,0 @@
-pytest-5.3.3
-=======================================
-
-pytest 5.3.3 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Adam Johnson
-* Alexandre Mulatinho
-* Anthony Sottile
-* Bruno Oliveira
-* Chris NeJame
-* Daniel Hahler
-* Hugo van Kemenade
-* Marcelo Duarte Trevisani
-* PaulC
-* Ran Benita
-* Ryan Barner
-* Seth Junot
-* marc
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.3.4.rst

@@ -1,20 +0,0 @@
-pytest-5.3.4
-=======================================
-
-pytest 5.3.4 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Bruno Oliveira
-* Daniel Hahler
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.3.5.rst

@@ -1,19 +0,0 @@
-pytest-5.3.5
-=======================================
-
-pytest 5.3.5 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Daniel Hahler
-* Ran Benita
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.4.0.rst

@@ -1,59 +0,0 @@
-pytest-5.4.0
-=======================================
-
-The pytest team is proud to announce the 5.4.0 release!
-
-pytest is a mature Python testing tool with more than a 2000 tests
-against itself, passing on many different interpreters and platforms.
-
-This release contains a number of bug fixes and improvements, so users are encouraged
-to take a look at the CHANGELOG:
-
-    https://docs.pytest.org/en/latest/changelog.html
-
-For complete documentation, please visit:
-
-    https://docs.pytest.org/en/latest/
-
-As usual, you can upgrade from PyPI via:
-
-    pip install -U pytest
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Christoph Buelter
-* Christoph Bülter
-* Daniel Arndt
-* Daniel Hahler
-* Holger Kohr
-* Hugo
-* Hugo van Kemenade
-* Jakub Mitoraj
-* Kyle Altendorf
-* Minuddin Ahmed Rana
-* Nathaniel Compton
-* ParetoLife
-* Pauli Virtanen
-* Philipp Loose
-* Ran Benita
-* Ronny Pfannschmidt
-* Stefan Scherfke
-* Stefano Mazzucco
-* TWood67
-* Tobias Schmidt
-* Tomáš Gavenčiak
-* Vinay Calastry
-* Vladyslav Rachek
-* Zac Hatfield-Dodds
-* captainCapitalism
-* cmachalo
-* gftea
-* kpinc
-* rebecca-palmer
-* sdementen
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.4.1.rst

@@ -1,18 +0,0 @@
-pytest-5.4.1
-=======================================
-
-pytest 5.4.1 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Bruno Oliveira
-
-
-Happy testing,
-The pytest Development Team

doc/en/announce/release-5.4.2.rst

@@ -1,22 +0,0 @@
-pytest-5.4.2
-=======================================
-
-pytest 5.4.2 has just been released to PyPI.
-
-This is a bug-fix release, being a drop-in replacement. To upgrade::
-
-  pip install --upgrade pytest
-
-The full changelog is available at https://docs.pytest.org/en/latest/changelog.html.
-
-Thanks to all who contributed to this release, among them:
-
-* Anthony Sottile
-* Bruno Oliveira
-* Daniel Hahler
-* Ran Benita
-* Ronny Pfannschmidt
-
-
-Happy testing,
-The pytest Development Team

doc/en/assert.rst

@@ -31,7 +31,7 @@ you will see the return value of the function call:
 
     $ pytest test_assert1.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 1 item
@@ -47,9 +47,7 @@ you will see the return value of the function call:
     E        +  where 3 = f()
 
     test_assert1.py:6: AssertionError
-    ========================= short test summary info ==========================
-    FAILED test_assert1.py::test_function - assert 3 == 4
-    ============================ 1 failed in 0.12s =============================
+    ========================= 1 failed in 0.12 seconds =========================
 
 ``pytest`` has support for showing the values of the most common subexpressions
 including calls, attributes, comparisons, and binary and unary
@@ -188,7 +186,7 @@ if you run this module:
 
     $ pytest test_assert2.py
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 1 item
@@ -210,9 +208,7 @@ if you run this module:
     E         Use -v to get the full diff
 
     test_assert2.py:6: AssertionError
-    ========================= short test summary info ==========================
-    FAILED test_assert2.py::test_set_comparison - AssertionError: assert {'0'...
-    ============================ 1 failed in 0.12s =============================
+    ========================= 1 failed in 0.12 seconds =========================
 
 Special comparisons are done for a number of cases:
 
@@ -242,17 +238,14 @@ file which provides an alternative explanation for ``Foo`` objects:
 
    def pytest_assertrepr_compare(op, left, right):
        if isinstance(left, Foo) and isinstance(right, Foo) and op == "==":
-           return [
-               "Comparing Foo instances:",
-               "   vals: {} != {}".format(left.val, right.val),
-           ]
+           return ["Comparing Foo instances:", "   vals: %s != %s" % (left.val, right.val)]
 
 now, given this test module:
 
 .. code-block:: python
 
    # content of test_foocompare.py
-   class Foo:
+   class Foo(object):
        def __init__(self, val):
            self.val = val
 
@@ -283,9 +276,7 @@ the conftest file:
    E            vals: 1 != 2
 
    test_foocompare.py:12: AssertionError
-   ========================= short test summary info ==========================
-   FAILED test_foocompare.py::test_compare - assert Comparing Foo instances:
-   1 failed in 0.12s
+   1 failed in 0.12 seconds
 
 .. _assert-details:
 .. _`assert introspection`:

doc/en/backwards-compatibility.rst

@@ -3,61 +3,6 @@
 Backwards Compatibility Policy
 ==============================
 
-.. versionadded: 6.0
-
-pytest is actively evolving and is a project that has been decades in the making,
-we keep learning about new and better structures to express different details about testing.
-
-While we implement those modifications we try to ensure an easy transition and don't want to impose unnecessary churn on our users and community/plugin authors.
-
-As of now, pytest considers multipe types of backward compatibility transitions:
-
-a) trivial: APIs which trivially translate to the new mechanism,
-   and do not cause problematic changes.
-
-   We try to support those indefinitely while encouraging users to switch to newer/better mechanisms through documentation.
-
-b) transitional: the old and new API don't conflict
-   and we can help users transition by using warnings, while supporting both for a prolonged time.
-
-   We will only start the removal of deprecated functionality in major releases (e.g. if we deprecate something in 3.0 we will start to remove it in 4.0), and keep it around for at least two minor releases (e.g. if we deprecate something in 3.9 and 4.0 is the next release, we start to remove it in 5.0, not in 4.0).
-
-   When the deprecation expires (e.g. 4.0 is released), we won't remove the deprecated functionality immediately, but will use the standard warning filters to turn them into **errors** by default. This approach makes it explicit that removal is imminent, and still gives you time to turn the deprecated feature into a warning instead of an error so it can be dealt with in your own time. In the next minor release (e.g. 4.1), the feature will be effectively removed.
-
-
-c) true breakage: should only to be considered when normal transition is unreasonably unsustainable and would offset important development/features by years.
-   In addition, they should be limited to APIs where the number of actual users is very small (for example only impacting some plugins), and can be coordinated with the community in advance.
-
-   Examples for such upcoming changes:
-
-   * removal of ``pytest_runtest_protocol/nextitem`` - `#895`_
-   * rearranging of the node tree to include ``FunctionDefinition``
-   * rearranging of ``SetupState`` `#895`_
-
-   True breakages must be announced first in an issue containing:
-
-   * Detailed description of the change
-   * Rationale
-   * Expected impact on users and plugin authors (example in `#895`_)
-
-   After there's no hard *-1* on the issue it should be followed up by an initial proof-of-concept Pull Request.
-
-   This POC serves as both a coordination point to assess impact and potential inspriation to come up with a transitional solution after all.
-
-   After a reasonable amount of time the PR can be merged to base a new major release.
-
-   For the PR to mature from POC to acceptance, it must contain:
-   * Setup of deprecation errors/warnings that help users fix and port their code. If it is possible to introduce a deprecation period under the current series, before the true breakage, it should be introduced in a separate PR and be part of the current release stream.
-   * Detailed description of the rationale and examples on how to port code in ``doc/en/deprecations.rst``.
-
-
-History
-=========
-
-
-Focus primary on smooth transition - stance (pre 6.0)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
 Keeping backwards compatibility has a very high priority in the pytest project. Although we have deprecated functionality over the years, most of it is still supported. All deprecations in pytest were done because simpler or more efficient ways of accomplishing the same tasks have emerged, making the old way of doing things unnecessary.
 
 With the pytest 3.0 release we introduced a clear communication scheme for when we will actually remove the old busted joint and politely ask you to use the new hotness instead, while giving you enough time to adjust your tests or raise concerns if there are valid reasons to keep deprecated functionality around.
@@ -75,6 +20,3 @@ Deprecation Roadmap
 Features currently deprecated and removed in previous releases can be found in :ref:`deprecations`.
 
 We track future deprecation and removal of features using milestones and the `deprecation <https://github.com/pytest-dev/pytest/issues?q=label%3A%22type%3A+deprecation%22>`_ and `removal <https://github.com/pytest-dev/pytest/labels/type%3A%20removal>`_ labels on GitHub.
-
-
-.. _`#895`: https://github.com/pytest-dev/pytest/issues/895

doc/en/builtin.rst

@@ -104,7 +104,6 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         Captured logs are available through the following properties/methods::
 
-        * caplog.messages        -> list of format-interpolated log messages
         * caplog.text            -> string containing formatted log output
         * caplog.records         -> list of logging.LogRecord instances
         * caplog.record_tuples   -> list of (logger_name, level, message) tuples
@@ -137,11 +136,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
     tmpdir_factory [session scope]
         Return a :class:`_pytest.tmpdir.TempdirFactory` instance for the test session.
 
-
     tmp_path_factory [session scope]
         Return a :class:`_pytest.tmpdir.TempPathFactory` instance for the test session.
 
-
     tmpdir
         Return a temporary directory path object
         which is unique to each test function invocation,
@@ -163,12 +160,9 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
             in python < 3.6 this is a pathlib2.Path
 
 
-    no tests ran in 0.12s
+    no tests ran in 0.12 seconds
 
-You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like:
-
-.. code-block:: python
+You can also interactively ask for help, e.g. by typing on the Python interactive prompt something like::
 
     import pytest
-
     help(pytest)

doc/en/cache.rst

@@ -33,18 +33,15 @@ Other plugins may access the `config.cache`_ object to set/get
 Rerunning only failures or failures first
 -----------------------------------------------
 
-First, let's create 50 test invocation of which only 2 fail:
-
-.. code-block:: python
+First, let's create 50 test invocation of which only 2 fail::
 
     # content of test_50.py
     import pytest
 
-
     @pytest.mark.parametrize("i", range(50))
     def test_num(i):
         if i in (17, 25):
-            pytest.fail("bad luck")
+           pytest.fail("bad luck")
 
 If you run this for the first time you will see two failures:
 
@@ -60,10 +57,10 @@ If you run this for the first time you will see two failures:
         @pytest.mark.parametrize("i", range(50))
         def test_num(i):
             if i in (17, 25):
-    >           pytest.fail("bad luck")
-    E           Failed: bad luck
+    >          pytest.fail("bad luck")
+    E          Failed: bad luck
 
-    test_50.py:7: Failed
+    test_50.py:6: Failed
     _______________________________ test_num[25] _______________________________
 
     i = 25
@@ -71,14 +68,11 @@ If you run this for the first time you will see two failures:
         @pytest.mark.parametrize("i", range(50))
         def test_num(i):
             if i in (17, 25):
-    >           pytest.fail("bad luck")
-    E           Failed: bad luck
+    >          pytest.fail("bad luck")
+    E          Failed: bad luck
 
-    test_50.py:7: Failed
-    ========================= short test summary info ==========================
-    FAILED test_50.py::test_num[17] - Failed: bad luck
-    FAILED test_50.py::test_num[25] - Failed: bad luck
-    2 failed, 48 passed in 0.12s
+    test_50.py:6: Failed
+    2 failed, 48 passed in 0.12 seconds
 
 If you then run it with ``--lf``:
 
@@ -86,10 +80,10 @@ If you then run it with ``--lf``:
 
     $ pytest --lf
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
-    collected 2 items
+    collected 50 items / 48 deselected / 2 selected
     run-last-failure: rerun previous 2 failures
 
     test_50.py FF                                                        [100%]
@@ -102,10 +96,10 @@ If you then run it with ``--lf``:
         @pytest.mark.parametrize("i", range(50))
         def test_num(i):
             if i in (17, 25):
-    >           pytest.fail("bad luck")
-    E           Failed: bad luck
+    >          pytest.fail("bad luck")
+    E          Failed: bad luck
 
-    test_50.py:7: Failed
+    test_50.py:6: Failed
     _______________________________ test_num[25] _______________________________
 
     i = 25
@@ -113,17 +107,14 @@ If you then run it with ``--lf``:
         @pytest.mark.parametrize("i", range(50))
         def test_num(i):
             if i in (17, 25):
-    >           pytest.fail("bad luck")
-    E           Failed: bad luck
+    >          pytest.fail("bad luck")
+    E          Failed: bad luck
 
-    test_50.py:7: Failed
-    ========================= short test summary info ==========================
-    FAILED test_50.py::test_num[17] - Failed: bad luck
-    FAILED test_50.py::test_num[25] - Failed: bad luck
-    ============================ 2 failed in 0.12s =============================
+    test_50.py:6: Failed
+    ================= 2 failed, 48 deselected in 0.12 seconds ==================
 
-You have run only the two failing tests from the last run, while the 48 passing
-tests have not been run ("deselected").
+You have run only the two failing test from the last run, while 48 tests have
+not been run ("deselected").
 
 Now, if you run with the ``--ff`` option, all tests will be run but the first
 previous failures will be executed first (as can be seen from the series
@@ -133,7 +124,7 @@ of ``FF`` and dots):
 
     $ pytest --ff
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 50 items
@@ -149,10 +140,10 @@ of ``FF`` and dots):
         @pytest.mark.parametrize("i", range(50))
         def test_num(i):
             if i in (17, 25):
-    >           pytest.fail("bad luck")
-    E           Failed: bad luck
+    >          pytest.fail("bad luck")
+    E          Failed: bad luck
 
-    test_50.py:7: Failed
+    test_50.py:6: Failed
     _______________________________ test_num[25] _______________________________
 
     i = 25
@@ -160,14 +151,11 @@ of ``FF`` and dots):
         @pytest.mark.parametrize("i", range(50))
         def test_num(i):
             if i in (17, 25):
-    >           pytest.fail("bad luck")
-    E           Failed: bad luck
+    >          pytest.fail("bad luck")
+    E          Failed: bad luck
 
-    test_50.py:7: Failed
-    ========================= short test summary info ==========================
-    FAILED test_50.py::test_num[17] - Failed: bad luck
-    FAILED test_50.py::test_num[25] - Failed: bad luck
-    ======================= 2 failed, 48 passed in 0.12s =======================
+    test_50.py:6: Failed
+    =================== 2 failed, 48 passed in 0.12 seconds ====================
 
 .. _`config.cache`:
 
@@ -195,19 +183,15 @@ The new config.cache object
 Plugins or conftest.py support code can get a cached value using the
 pytest ``config`` object.  Here is a basic example plugin which
 implements a :ref:`fixture` which re-uses previously created state
-across pytest invocations:
-
-.. code-block:: python
+across pytest invocations::
 
     # content of test_caching.py
     import pytest
     import time
 
-
     def expensive_computation():
         print("running expensive computation...")
 
-
     @pytest.fixture
     def mydata(request):
         val = request.config.cache.get("example/value", None)
@@ -217,7 +201,6 @@ across pytest invocations:
             request.config.cache.set("example/value", val)
         return val
 
-
     def test_function(mydata):
         assert mydata == 23
 
@@ -236,14 +219,12 @@ If you run this command for the first time, you can see the print statement:
     >       assert mydata == 23
     E       assert 42 == 23
 
-    test_caching.py:20: AssertionError
+    test_caching.py:17: AssertionError
     -------------------------- Captured stdout setup ---------------------------
     running expensive computation...
-    ========================= short test summary info ==========================
-    FAILED test_caching.py::test_function - assert 42 == 23
-    1 failed in 0.12s
+    1 failed in 0.12 seconds
 
-If you run it a second time, the value will be retrieved from
+If you run it a second time the value will be retrieved from
 the cache and nothing will be printed:
 
 .. code-block:: pytest
@@ -259,12 +240,10 @@ the cache and nothing will be printed:
     >       assert mydata == 23
     E       assert 42 == 23
 
-    test_caching.py:20: AssertionError
-    ========================= short test summary info ==========================
-    FAILED test_caching.py::test_function - assert 42 == 23
-    1 failed in 0.12s
+    test_caching.py:17: AssertionError
+    1 failed in 0.12 seconds
 
-See the :fixture:`config.cache fixture <config.cache>` for more details.
+See the :ref:`cache-api` for more details.
 
 
 Inspecting Cache content
@@ -277,7 +256,7 @@ You can always peek at the content of the cache using the
 
     $ pytest --cache-show
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     cachedir: $PYTHON_PREFIX/.pytest_cache
@@ -290,66 +269,13 @@ You can always peek at the content of the cache using the
        'test_caching.py::test_function': True,
        'test_foocompare.py::test_compare': True}
     cache/nodeids contains:
-      ['test_assert1.py::test_function',
-       'test_assert2.py::test_set_comparison',
-       'test_foocompare.py::test_compare',
-       'test_50.py::test_num[0]',
-       'test_50.py::test_num[1]',
-       'test_50.py::test_num[2]',
-       'test_50.py::test_num[3]',
-       'test_50.py::test_num[4]',
-       'test_50.py::test_num[5]',
-       'test_50.py::test_num[6]',
-       'test_50.py::test_num[7]',
-       'test_50.py::test_num[8]',
-       'test_50.py::test_num[9]',
-       'test_50.py::test_num[10]',
-       'test_50.py::test_num[11]',
-       'test_50.py::test_num[12]',
-       'test_50.py::test_num[13]',
-       'test_50.py::test_num[14]',
-       'test_50.py::test_num[15]',
-       'test_50.py::test_num[16]',
-       'test_50.py::test_num[17]',
-       'test_50.py::test_num[18]',
-       'test_50.py::test_num[19]',
-       'test_50.py::test_num[20]',
-       'test_50.py::test_num[21]',
-       'test_50.py::test_num[22]',
-       'test_50.py::test_num[23]',
-       'test_50.py::test_num[24]',
-       'test_50.py::test_num[25]',
-       'test_50.py::test_num[26]',
-       'test_50.py::test_num[27]',
-       'test_50.py::test_num[28]',
-       'test_50.py::test_num[29]',
-       'test_50.py::test_num[30]',
-       'test_50.py::test_num[31]',
-       'test_50.py::test_num[32]',
-       'test_50.py::test_num[33]',
-       'test_50.py::test_num[34]',
-       'test_50.py::test_num[35]',
-       'test_50.py::test_num[36]',
-       'test_50.py::test_num[37]',
-       'test_50.py::test_num[38]',
-       'test_50.py::test_num[39]',
-       'test_50.py::test_num[40]',
-       'test_50.py::test_num[41]',
-       'test_50.py::test_num[42]',
-       'test_50.py::test_num[43]',
-       'test_50.py::test_num[44]',
-       'test_50.py::test_num[45]',
-       'test_50.py::test_num[46]',
-       'test_50.py::test_num[47]',
-       'test_50.py::test_num[48]',
-       'test_50.py::test_num[49]',
-       'test_caching.py::test_function']
+      ['test_caching.py::test_function']
     cache/stepwise contains:
       []
     example/value contains:
       42
 
-    ========================== no tests ran in 0.12s ===========================
+    ======================= no tests ran in 0.12 seconds =======================
 
 ``--cache-show`` takes an optional argument to specify a glob pattern for
 filtering:
@@ -358,7 +284,7 @@ filtering:
 
     $ pytest --cache-show example/*
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     cachedir: $PYTHON_PREFIX/.pytest_cache
@@ -366,7 +292,7 @@ filtering:
     example/value contains:
       42
 
-    ========================== no tests ran in 0.12s ===========================
+    ======================= no tests ran in 0.12 seconds =======================
 
 Clearing Cache content
 ----------------------

doc/en/capture.rst

@@ -21,36 +21,27 @@ file descriptors.  This allows to capture output from simple
 print statements as well as output from a subprocess started by
 a test.
 
-.. _capture-method:
-
 Setting capturing methods or disabling capturing
 -------------------------------------------------
 
-There are three ways in which ``pytest`` can perform capturing:
+There are two ways in which ``pytest`` can perform capturing:
 
-* ``fd`` (file descriptor) level capturing (default): All writes going to the
+* file descriptor (FD) level capturing (default): All writes going to the
   operating system file descriptors 1 and 2 will be captured.
 
 * ``sys`` level capturing: Only writes to Python files ``sys.stdout``
   and ``sys.stderr`` will be captured.  No capturing of writes to
   filedescriptors is performed.
 
-* ``tee-sys`` capturing: Python writes to ``sys.stdout`` and ``sys.stderr``
-  will be captured, however the writes will also be passed-through to
-  the actual ``sys.stdout`` and ``sys.stderr``. This allows output to be
-  'live printed' and captured for plugin use, such as junitxml (new in pytest 5.4).
-
 .. _`disable capturing`:
 
 You can influence output capturing mechanisms from the command line:
 
 .. code-block:: bash
 
-    pytest -s                  # disable all capturing
-    pytest --capture=sys       # replace sys.stdout/stderr with in-mem files
-    pytest --capture=fd        # also point filedescriptors 1 and 2 to temp file
-    pytest --capture=tee-sys   # combines 'sys' and '-s', capturing sys.stdout/stderr
-                               # and passing it along to the actual sys.stdout/stderr
+    pytest -s            # disable all capturing
+    pytest --capture=sys # replace sys.stdout/stderr with in-mem files
+    pytest --capture=fd  # also point filedescriptors 1 and 2 to temp file
 
 .. _printdebugging:
 
@@ -58,21 +49,16 @@ Using print statements for debugging
 ---------------------------------------------------
 
 One primary benefit of the default capturing of stdout/stderr output
-is that you can use print statements for debugging:
-
-.. code-block:: python
+is that you can use print statements for debugging::
 
     # content of test_module.py
 
-
     def setup_function(function):
-        print("setting up", function)
-
+        print("setting up %s" % function)
 
     def test_func1():
         assert True
 
-
     def test_func2():
         assert False
 
@@ -83,7 +69,7 @@ of the failing function and hide the other one:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 2 items
@@ -97,12 +83,10 @@ of the failing function and hide the other one:
     >       assert False
     E       assert False
 
-    test_module.py:12: AssertionError
+    test_module.py:9: AssertionError
     -------------------------- Captured stdout setup ---------------------------
     setting up <function test_func2 at 0xdeadbeef>
-    ========================= short test summary info ==========================
-    FAILED test_module.py::test_func2 - assert False
-    ======================= 1 failed, 1 passed in 0.12s ========================
+    ==================== 1 failed, 1 passed in 0.12 seconds ====================
 
 Accessing captured output from a test function
 ---------------------------------------------------
@@ -170,3 +154,5 @@ as a context manager, disabling capture inside the ``with`` block:
         with capsys.disabled():
             print("output not captured, going directly to sys.stdout")
         print("this output is also captured")
+
+.. include:: links.inc

doc/en/conf.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #
 # pytest documentation build configuration file, created by
 # sphinx-quickstart on Fri Oct  8 17:54:28 2010.
@@ -15,15 +16,11 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
+import datetime
 import os
 import sys
 
 from _pytest import __version__ as version
-from _pytest.compat import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    import sphinx.application
-
 
 release = ".".join(version.split(".")[:2])
 
@@ -66,8 +63,9 @@ source_suffix = ".rst"
 master_doc = "contents"
 
 # General information about the project.
-project = "pytest"
-copyright = "2015–2020, holger krekel and pytest-dev team"
+project = u"pytest"
+year = datetime.datetime.utcnow().year
+copyright = u"2015–2020, holger krekel and pytest-dev team"
 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
@@ -83,6 +81,7 @@ copyright = "2015–2020, holger krekel and pytest-dev team"
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = [
+    "links.inc",
     "_build",
     "naming20.rst",
     "test/*",
@@ -96,7 +95,7 @@ exclude_patterns = [
 
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-default_role = "literal"
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 # add_function_parentheses = True
@@ -116,19 +115,6 @@ pygments_style = "sphinx"
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
 
-# A list of regular expressions that match URIs that should not be checked when
-# doing a linkcheck.
-linkcheck_ignore = [
-    "https://github.com/numpy/numpy/blob/master/doc/release/1.16.0-notes.rst#new-deprecations",
-    "https://blogs.msdn.microsoft.com/bharry/2017/06/28/testing-in-a-cloud-delivery-cadence/",
-    "http://pythontesting.net/framework/pytest-introduction/",
-    r"https://github.com/pytest-dev/pytest/issues/\d+",
-    r"https://github.com/pytest-dev/pytest/pull/\d+",
-]
-
-# The number of worker threads to use when checking links (default=5).
-linkcheck_workers = 5
-
 
 # -- Options for HTML output ---------------------------------------------------
 
@@ -161,7 +147,7 @@ html_logo = "img/pytest1.png"
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "img/favicon.png"
+html_favicon = "img/pytest1favi.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -182,18 +168,18 @@ html_favicon = "img/favicon.png"
 
 html_sidebars = {
     "index": [
-        "slim_searchbox.html",
         "sidebarintro.html",
         "globaltoc.html",
         "links.html",
         "sourcelink.html",
+        "searchbox.html",
     ],
     "**": [
-        "slim_searchbox.html",
         "globaltoc.html",
         "relations.html",
         "links.html",
         "sourcelink.html",
+        "searchbox.html",
     ],
 }
 
@@ -207,7 +193,7 @@ html_sidebars = {
 html_domain_indices = True
 
 # If false, no index is generated.
-html_use_index = True
+html_use_index = False
 
 # If true, the index is split into individual pages for each letter.
 # html_split_index = False
@@ -247,8 +233,8 @@ latex_documents = [
     (
         "contents",
         "pytest.tex",
-        "pytest Documentation",
-        "holger krekel, trainer and consultant, http://merlinux.eu",
+        u"pytest Documentation",
+        u"holger krekel, trainer and consultant, http://merlinux.eu",
         "manual",
     )
 ]
@@ -280,16 +266,16 @@ latex_domain_indices = False
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"], 1)]
+man_pages = [("usage", "pytest", u"pytest usage", [u"holger krekel at merlinux eu"], 1)]
 
 
 # -- Options for Epub output ---------------------------------------------------
 
 # Bibliographic Dublin Core info.
-epub_title = "pytest"
-epub_author = "holger krekel at merlinux eu"
-epub_publisher = "holger krekel at merlinux eu"
-epub_copyright = "2013-2020, holger krekel et alii"
+epub_title = u"pytest"
+epub_author = u"holger krekel at merlinux eu"
+epub_publisher = u"holger krekel at merlinux eu"
+epub_copyright = u"2013-2020, holger krekel et alii"
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.
@@ -346,44 +332,12 @@ texinfo_documents = [
 intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}
 
 
-def configure_logging(app: "sphinx.application.Sphinx") -> None:
-    """Configure Sphinx's WarningHandler to handle (expected) missing include."""
-    import sphinx.util.logging
-    import logging
-
-    class WarnLogFilter(logging.Filter):
-        def filter(self, record: logging.LogRecord) -> bool:
-            """Ignore warnings about missing include with "only" directive.
-
-            Ref: https://github.com/sphinx-doc/sphinx/issues/2150."""
-            if (
-                record.msg.startswith('Problems with "include" directive path:')
-                and "_changelog_towncrier_draft.rst" in record.msg
-            ):
-                return False
-            return True
-
-    logger = logging.getLogger(sphinx.util.logging.NAMESPACE)
-    warn_handler = [x for x in logger.handlers if x.level == logging.WARNING]
-    assert len(warn_handler) == 1, warn_handler
-    warn_handler[0].filters.insert(0, WarnLogFilter())
-
-
-def setup(app: "sphinx.application.Sphinx") -> None:
+def setup(app):
     # from sphinx.ext.autodoc import cut_lines
     # app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
-    app.add_crossref_type(
-        "fixture",
-        "fixture",
-        objname="built-in fixture",
-        indextemplate="pair: %s; fixture",
-    )
-
     app.add_object_type(
         "confval",
         "confval",
         objname="configuration value",
         indextemplate="pair: %s; configuration value",
     )
-
-    configure_logging(app)

doc/en/conftest.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 collect_ignore = ["conf.py"]

doc/en/contents.rst

@@ -38,24 +38,19 @@ Full pytest documentation
    customize
    example/index
    bash-completion
-   faq
 
    backwards-compatibility
    deprecations
    py27-py34-deprecation
-
+   historical-notes
+   license
    contributing
    development_guide
-
-   sponsor
-   tidelift
-   license
-   contact
-
-   historical-notes
    talks
    projects
-
+   faq
+   contact
+   tidelift
 
 .. only:: html
 

doc/en/customize.rst

@@ -20,6 +20,8 @@ which were registered by installed plugins.
 Initialization: determining rootdir and inifile
 -----------------------------------------------
 
+
+
 pytest determines a ``rootdir`` for each test run which depends on
 the command line arguments (specified test files, paths) and on
 the existence of *ini-files*.  The determined ``rootdir`` and *ini-file* are
@@ -28,17 +30,17 @@ printed as part of the pytest header during startup.
 Here's a summary what ``pytest`` uses ``rootdir`` for:
 
 * Construct *nodeids* during collection; each test is assigned
-  a unique *nodeid* which is rooted at the ``rootdir`` and takes into account
-  the full path, class name, function name and parametrization (if any).
+  a unique *nodeid* which is rooted at the ``rootdir`` and takes in account full path,
+  class name, function name and parametrization (if any).
 
 * Is used by plugins as a stable location to store project/test run specific information;
   for example, the internal :ref:`cache <cache>` plugin creates a ``.pytest_cache`` subdirectory
   in ``rootdir`` to store its cross-test run state.
 
-``rootdir`` is **NOT** used to modify ``sys.path``/``PYTHONPATH`` or
+Important to emphasize that ``rootdir`` is **NOT** used to modify ``sys.path``/``PYTHONPATH`` or
 influence how modules are imported. See :ref:`pythonpath` for more details.
 
-The ``--rootdir=path`` command-line option can be used to force a specific directory.
+``--rootdir=path`` command-line option can be used to force a specific directory.
 The directory passed may contain environment variables when it is used in conjunction
 with ``addopts`` in a ``pytest.ini`` file.
 
@@ -105,8 +107,8 @@ check for ini-files as follows:
 
     # first look for pytest.ini files
     path/pytest.ini
-    path/tox.ini    # must also contain [pytest] section to match
     path/setup.cfg  # must also contain [tool:pytest] section to match
+    path/tox.ini    # must also contain [pytest] section to match
     pytest.ini
     ... # all the way down to the root
 
@@ -132,13 +134,10 @@ progress output, you can write it into a configuration file:
 .. code-block:: ini
 
     # content of pytest.ini or tox.ini
+    # setup.cfg files should use [tool:pytest] section instead
     [pytest]
     addopts = -ra -q
 
-    # content of setup.cfg
-    [tool:pytest]
-    addopts = -ra -q
-
 Alternatively, you can set a ``PYTEST_ADDOPTS`` environment variable to add command
 line options while the environment is in use:
 

doc/en/deprecations.rst

@@ -19,119 +19,12 @@ Below is a complete list of all pytest features which are considered deprecated.
 :class:`_pytest.warning_types.PytestWarning` or subclasses, which can be filtered using
 :ref:`standard warning filters <warnings>`.
 
-
-``--no-print-logs`` command-line option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.4
-
-
-Option ``--no-print-logs`` is deprecated and meant to be removed in a future release. If you use ``--no-print-logs``, please try out ``--show-capture`` and
-provide feedback.
-
-``--show-capture`` command-line option was added in ``pytest 3.5.0` and allows to specify how to
-display captured output when tests fail: ``no``, ``stdout``, ``stderr``, ``log`` or ``all`` (the default).
-
-
-
-Node Construction changed to ``Node.from_parent``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.4
-
-The construction of nodes new should use the named constructor ``from_parent``.
-This limitation in api surface intends to enable better/simpler refactoring of the collection tree.
-
-
-``junit_family`` default value change to "xunit2"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.2
-
-The default value of ``junit_family`` option will change to ``xunit2`` in pytest 6.0, given
-that this is the version supported by default in modern tools that manipulate this type of file.
-
-In order to smooth the transition, pytest will issue a warning in case the ``--junitxml`` option
-is given in the command line but ``junit_family`` is not explicitly configured in ``pytest.ini``::
-
-    PytestDeprecationWarning: The 'junit_family' default value will change to 'xunit2' in pytest 6.0.
-      Add 'junit_family=legacy' to your pytest.ini file to silence this warning and make your suite compatible.
-
-In order to silence this warning, users just need to configure the ``junit_family`` option explicitly:
-
-.. code-block:: ini
-
-    [pytest]
-    junit_family=legacy
-
-
-``funcargnames`` alias for ``fixturenames``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.0
-
-The ``FixtureRequest``, ``Metafunc``, and ``Function`` classes track the names of
-their associated fixtures, with the aptly-named ``fixturenames`` attribute.
-
-Prior to pytest 2.3, this attribute was named ``funcargnames``, and we have kept
-that as an alias since.  It is finally due for removal, as it is often confusing
-in places where we or plugin authors must distinguish between fixture names and
-names supplied by non-fixture things such as ``pytest.mark.parametrize``.
-
-
-Result log (``--result-log``)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 4.0
-
-The ``--result-log`` option produces a stream of test reports which can be
-analysed at runtime, but it uses a custom format which requires users to implement their own
-parser.
-
-The  `pytest-reportlog <https://github.com/pytest-dev/pytest-reportlog>`__ plugin provides a ``--report-log`` option, a more standard and extensible alternative, producing
-one JSON object per-line, and should cover the same use cases. Please try it out and provide feedback.
-
-The plan is remove the ``--result-log`` option in pytest 6.0 if ``pytest-reportlog`` proves satisfactory
-to all users and is deemed stable. The ``pytest-reportlog`` plugin might even be merged into the core
-at some point, depending on the plans for the plugins and number of users using it.
-
-TerminalReporter.writer
-~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 5.4
-
-The ``TerminalReporter.writer`` attribute has been deprecated and should no longer be used. This
-was inadvertently exposed as part of the public API of that plugin and ties it too much
-with ``py.io.TerminalWriter``.
-
-Plugins that used ``TerminalReporter.writer`` directly should instead use ``TerminalReporter``
-methods that provide the same functionality.
-
-
-Removed Features
-----------------
-
-As stated in our :ref:`backwards-compatibility` policy, deprecated features are removed only in major releases after
-an appropriate period of deprecation has passed.
-
-
-``pytest.config`` global
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionremoved:: 5.0
-
-The ``pytest.config`` global object is deprecated.  Instead use
-``request.config`` (via the ``request`` fixture) or if you are a plugin author
-use the ``pytest_configure(config)`` hook. Note that many hooks can also access
-the ``config`` object indirectly, through ``session.config`` or ``item.config`` for example.
-
-
 .. _`raises message deprecated`:
 
 ``"message"`` parameter of ``pytest.raises``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionremoved:: 5.0
+.. deprecated:: 4.1
 
 It is a common mistake to think this parameter will match the exception message, while in fact
 it only serves to provide a custom message in case the ``pytest.raises`` check fails. To prevent
@@ -162,12 +55,22 @@ If you still have concerns about this deprecation and future removal, please com
 `issue #3974 <https://github.com/pytest-dev/pytest/issues/3974>`__.
 
 
+``pytest.config`` global
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 4.1
+
+The ``pytest.config`` global object is deprecated.  Instead use
+``request.config`` (via the ``request`` fixture) or if you are a plugin author
+use the ``pytest_configure(config)`` hook. Note that many hooks can also access
+the ``config`` object indirectly, through ``session.config`` or ``item.config`` for example.
+
 .. _raises-warns-exec:
 
 ``raises`` / ``warns`` with a string as the second argument
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionremoved:: 5.0
+.. deprecated:: 4.1
 
 Use the context manager form of these instead.  When necessary, invoke ``exec``
 directly.
@@ -199,6 +102,26 @@ Becomes:
 
 
 
+
+
+Result log (``--result-log``)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+The ``--resultlog`` command line option has been deprecated: it is little used
+and there are more modern and better alternatives, for example `pytest-tap <https://tappy.readthedocs.io/en/latest/>`_.
+
+This feature will be effectively removed in pytest 4.0 as the team intends to include a better alternative in the core.
+
+If you have any concerns, please don't hesitate to `open an issue <https://github.com/pytest-dev/pytest/issues>`__.
+
+Removed Features
+----------------
+
+As stated in our :ref:`backwards-compatibility` policy, deprecated features are removed only in major releases after
+an appropriate period of deprecation has passed.
+
 Using ``Class`` in custom Collectors
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -516,9 +439,7 @@ Internal classes accessed through ``Node``
 .. versionremoved:: 4.0
 
 Access of ``Module``, ``Function``, ``Class``, ``Instance``, ``File`` and ``Item`` through ``Node`` instances now issue
-this warning:
-
-.. code-block:: text
+this warning::
 
     usage of Function.Module is deprecated, please use pytest.Module instead
 

doc/en/development_guide.rst

@@ -19,7 +19,7 @@ Branches
 
 We have two long term branches:
 
-* ``master``: contains the code for the next bug-fix release.
+* ``master``: contains the code for the next bugfix release.
 * ``features``: contains the code with new features for the next minor release.
 
 The official repository usually does not contain topic branches, developers and contributors should create topic
@@ -57,4 +57,4 @@ Issues created at those events should have other relevant labels added as well.
 Those labels should be removed after they are no longer relevant.
 
 
-.. include:: ../../RELEASING.rst
+.. include:: ../../HOWTORELEASE.rst

doc/en/doctest.rst

@@ -29,14 +29,14 @@ then you can just invoke ``pytest`` directly:
 
     $ pytest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_example.txt .                                                   [100%]
 
-    ============================ 1 passed in 0.12s =============================
+    ========================= 1 passed in 0.12 seconds =========================
 
 By default, pytest will collect ``test*.txt`` files looking for doctest directives, but you
 can pass additional globs using the ``--doctest-glob`` option (multi-allowed).
@@ -58,7 +58,7 @@ and functions, including from test modules:
 
     $ pytest --doctest-modules
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 2 items
@@ -66,7 +66,7 @@ and functions, including from test modules:
     mymodule.py .                                                        [ 50%]
     test_example.txt .                                                   [100%]
 
-    ============================ 2 passed in 0.12s =============================
+    ========================= 2 passed in 0.12 seconds =========================
 
 You can make these changes permanent in your project by
 putting them into a pytest.ini file like this:
@@ -103,7 +103,7 @@ that will be used for those doctest files using the
 Using 'doctest' options
 -----------------------
 
-Python's standard ``doctest`` module provides some `options <https://docs.python.org/3/library/doctest.html#option-flags>`__
+The standard ``doctest`` module provides some `options <https://docs.python.org/3/library/doctest.html#option-flags>`__
 to configure the strictness of doctest tests. In pytest, you can enable those flags using the
 configuration file.
 
@@ -115,52 +115,23 @@ lengthy exception stack traces you can just write:
     [pytest]
     doctest_optionflags= NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL
 
+pytest also introduces new options to allow doctests to run in Python 2 and
+Python 3 unchanged:
+
+* ``ALLOW_UNICODE``: when enabled, the ``u`` prefix is stripped from unicode
+  strings in expected doctest output.
+
+* ``ALLOW_BYTES``: when enabled, the ``b`` prefix is stripped from byte strings
+  in expected doctest output.
+
 Alternatively, options can be enabled by an inline comment in the doc test
 itself:
 
 .. code-block:: rst
 
-    >>> something_that_raises()  # doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-    ValueError: ...
-
-pytest also introduces new options:
-
-* ``ALLOW_UNICODE``: when enabled, the ``u`` prefix is stripped from unicode
-  strings in expected doctest output. This allows doctests to run in Python 2
-  and Python 3 unchanged.
-
-* ``ALLOW_BYTES``: similarly, the ``b`` prefix is stripped from byte strings
-  in expected doctest output.
-
-* ``NUMBER``: when enabled, floating-point numbers only need to match as far as
-  the precision you have written in the expected doctest output. For example,
-  the following output would only need to match to 2 decimal places::
-
-      >>> math.pi
-      3.14
-
-  If you wrote ``3.1416`` then the actual output would need to match to 4
-  decimal places; and so on.
-
-  This avoids false positives caused by limited floating-point precision, like
-  this::
-
-      Expected:
-          0.233
-      Got:
-          0.23300000000000001
-
-  ``NUMBER`` also supports lists of floating-point numbers -- in fact, it
-  matches floating-point numbers appearing anywhere in the output, even inside
-  a string! This means that it may not be appropriate to enable globally in
-  ``doctest_optionflags`` in your configuration file.
-
-  .. versionadded:: 5.1
-
-
-Continue on failure
--------------------
+    # content of example.rst
+    >>> get_unicode_greeting()  # doctest: +ALLOW_UNICODE
+    'Hello'
 
 By default, pytest would report only the first failure for a given doctest. If
 you want to continue the test even when you have failures, do:
@@ -220,21 +191,15 @@ namespace in which your doctests run. It is intended to be used within
 your own fixtures to provide the tests that use them with context.
 
 ``doctest_namespace`` is a standard ``dict`` object into which you
-place the objects you want to appear in the doctest namespace:
-
-.. code-block:: python
+place the objects you want to appear in the doctest namespace::
 
     # content of conftest.py
     import numpy
-
-
     @pytest.fixture(autouse=True)
     def add_np(doctest_namespace):
-        doctest_namespace["np"] = numpy
+        doctest_namespace['np'] = numpy
 
-which can then be used in your doctests directly:
-
-.. code-block:: python
+which can then be used in your doctests directly::
 
     # content of numpy.py
     def arange():
@@ -254,9 +219,7 @@ Skipping tests dynamically
 
 .. versionadded:: 4.4
 
-You can use ``pytest.skip`` to dynamically skip doctests. For example:
-
-.. code-block:: text
+You can use ``pytest.skip`` to dynamically skip doctests. For example::
 
     >>> import sys, pytest
     >>> if sys.platform.startswith('win'):

doc/en/example/assertion/failure_demo.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import _pytest._code
 import pytest
 from pytest import raises
@@ -20,7 +21,7 @@ def test_generative(param1, param2):
     assert param1 * 2 < param2
 
 
-class TestFailing:
+class TestFailing(object):
     def test_simple(self):
         def f():
             return 42
@@ -40,7 +41,7 @@ class TestFailing:
         assert not f()
 
 
-class TestSpecialisedExplanations:
+class TestSpecialisedExplanations(object):
     def test_eq_text(self):
         assert "spam" == "eggs"
 
@@ -100,7 +101,7 @@ class TestSpecialisedExplanations:
         from dataclasses import dataclass
 
         @dataclass
-        class Foo:
+        class Foo(object):
             a: int
             b: str
 
@@ -112,7 +113,7 @@ class TestSpecialisedExplanations:
         import attr
 
         @attr.s
-        class Foo:
+        class Foo(object):
             a = attr.ib()
             b = attr.ib()
 
@@ -122,7 +123,7 @@ class TestSpecialisedExplanations:
 
 
 def test_attribute():
-    class Foo:
+    class Foo(object):
         b = 1
 
     i = Foo()
@@ -130,14 +131,14 @@ def test_attribute():
 
 
 def test_attribute_instance():
-    class Foo:
+    class Foo(object):
         b = 1
 
     assert Foo().b == 2
 
 
 def test_attribute_failure():
-    class Foo:
+    class Foo(object):
         def _get_b(self):
             raise Exception("Failed to get attrib")
 
@@ -148,10 +149,10 @@ def test_attribute_failure():
 
 
 def test_attribute_multiple():
-    class Foo:
+    class Foo(object):
         b = 1
 
-    class Bar:
+    class Bar(object):
         b = 2
 
     assert Foo().b == Bar().b
@@ -161,7 +162,7 @@ def globf(x):
     return x + 1
 
 
-class TestRaises:
+class TestRaises(object):
     def test_raises(self):
         s = "qwe"
         raises(TypeError, int, s)
@@ -177,7 +178,7 @@ class TestRaises:
 
     def test_reinterpret_fails_with_print_for_the_fun_of_it(self):
         items = [1, 2, 3]
-        print("items is {!r}".format(items))
+        print("items is %r" % items)
         a, b = items.pop()
 
     def test_some_error(self):
@@ -190,20 +191,19 @@ class TestRaises:
 
 # thanks to Matthew Scott for this test
 def test_dynamic_compile_shows_nicely():
-    import importlib.util
+    import imp
     import sys
 
     src = "def foo():\n assert 1 == 0\n"
     name = "abc-123"
-    spec = importlib.util.spec_from_loader(name, loader=None)
-    module = importlib.util.module_from_spec(spec)
+    module = imp.new_module(name)
     code = _pytest._code.compile(src, name, "exec")
     exec(code, module.__dict__)
     sys.modules[name] = module
     module.foo()
 
 
-class TestMoreErrors:
+class TestMoreErrors(object):
     def test_complex_error(self):
         def f():
             return 44
@@ -253,16 +253,16 @@ class TestMoreErrors:
             x = 0
 
 
-class TestCustomAssertMsg:
+class TestCustomAssertMsg(object):
     def test_single_line(self):
-        class A:
+        class A(object):
             a = 1
 
         b = 2
         assert A.a == b, "A.a appears not to be b"
 
     def test_multiline(self):
-        class A:
+        class A(object):
             a = 1
 
         b = 2
@@ -271,7 +271,7 @@ class TestCustomAssertMsg:
         ), "A.a appears not to be b\nor does not appear to be b\none of those"
 
     def test_custom_repr(self):
-        class JSON:
+        class JSON(object):
             a = 1
 
             def __repr__(self):

doc/en/example/assertion/global_testmodule_config/conftest.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import py
 
 import pytest

doc/en/example/assertion/global_testmodule_config/test_hello_world.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 hello = "world"
 
 

doc/en/example/assertion/test_failures.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import py
 
 failure_demo = py.path.local(__file__).dirpath("failure_demo.py")

doc/en/example/assertion/test_setup_flow_example.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 def setup_module(module):
     module.TestStateFullThing.classcount = 0
 
 
-class TestStateFullThing:
+class TestStateFullThing(object):
     def setup_class(cls):
         cls.classcount += 1
 

doc/en/example/attic.rst

@@ -18,7 +18,7 @@ example: specifying and selecting acceptance tests
         return AcceptFixture(request)
 
 
-    class AcceptFixture:
+    class AcceptFixture(object):
         def __init__(self, request):
             if not request.config.getoption("acceptance"):
                 pytest.skip("specify -A to run acceptance tests")
@@ -65,7 +65,7 @@ extend the `accept example`_ by putting this in our test module:
         return arg
 
 
-    class TestSpecialAcceptance:
+    class TestSpecialAcceptance(object):
         def test_sometest(self, accept):
             assert accept.tmpdir.join("special").check()
 

doc/en/example/conftest.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 collect_ignore = ["nonpython"]

doc/en/example/costlysetup/conftest.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+import pytest
+
+
+@pytest.fixture("session")
+def setup(request):
+    setup = CostlySetup()
+    yield setup
+    setup.finalize()
+
+
+class CostlySetup(object):
+    def __init__(self):
+        import time
+
+        print("performing costly setup")
+        time.sleep(5)
+        self.timecostly = 1
+
+    def finalize(self):
+        del self.timecostly

doc/en/example/costlysetup/sub_a/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+#

doc/en/example/costlysetup/sub_a/test_quick.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+def test_quick(setup):
+    pass

doc/en/example/costlysetup/sub_b/__init__.py

@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+#

doc/en/example/costlysetup/sub_b/test_two.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+def test_something(setup):
+    assert setup.timecostly == 1
+
+
+def test_something_more(setup):
+    assert setup.timecostly == 1

doc/en/example/fixtures/test_fixtures_order.py

@@ -1,38 +0,0 @@
-import pytest
-
-# fixtures documentation order example
-order = []
-
-
-@pytest.fixture(scope="session")
-def s1():
-    order.append("s1")
-
-
-@pytest.fixture(scope="module")
-def m1():
-    order.append("m1")
-
-
-@pytest.fixture
-def f1(f3):
-    order.append("f1")
-
-
-@pytest.fixture
-def f3():
-    order.append("f3")
-
-
-@pytest.fixture(autouse=True)
-def a1():
-    order.append("a1")
-
-
-@pytest.fixture
-def f2():
-    order.append("f2")
-
-
-def test_order(f1, m1, f2, s1):
-    assert order == ["s1", "m1", "a1", "f3", "f1", "f2"]

doc/en/example/markers.rst

@@ -33,7 +33,7 @@ You can "mark" a test function with custom metadata like this:
         pass
 
 
-    class TestClass:
+    class TestClass(object):
         def test_method(self):
             pass
 
@@ -45,14 +45,14 @@ You can then restrict a test run to only run tests marked with ``webtest``:
 
     $ pytest -v -m webtest
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 4 items / 3 deselected / 1 selected
 
     test_server.py::test_send_http PASSED                                [100%]
 
-    ===================== 1 passed, 3 deselected in 0.12s ======================
+    ================== 1 passed, 3 deselected in 0.12 seconds ==================
 
 Or the inverse, running all tests except the webtest ones:
 
@@ -60,7 +60,7 @@ Or the inverse, running all tests except the webtest ones:
 
     $ pytest -v -m "not webtest"
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 4 items / 1 deselected / 3 selected
@@ -69,7 +69,7 @@ Or the inverse, running all tests except the webtest ones:
     test_server.py::test_another PASSED                                  [ 66%]
     test_server.py::TestClass::test_method PASSED                        [100%]
 
-    ===================== 3 passed, 1 deselected in 0.12s ======================
+    ================== 3 passed, 1 deselected in 0.12 seconds ==================
 
 Selecting tests based on their node ID
 --------------------------------------
@@ -82,14 +82,14 @@ tests based on their module, class, method, or function name:
 
     $ pytest -v test_server.py::TestClass::test_method
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 1 item
 
     test_server.py::TestClass::test_method PASSED                        [100%]
 
-    ============================ 1 passed in 0.12s =============================
+    ========================= 1 passed in 0.12 seconds =========================
 
 You can also select on the class:
 
@@ -97,14 +97,14 @@ You can also select on the class:
 
     $ pytest -v test_server.py::TestClass
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 1 item
 
     test_server.py::TestClass::test_method PASSED                        [100%]
 
-    ============================ 1 passed in 0.12s =============================
+    ========================= 1 passed in 0.12 seconds =========================
 
 Or select multiple nodes:
 
@@ -112,7 +112,7 @@ Or select multiple nodes:
 
     $ pytest -v test_server.py::TestClass test_server.py::test_send_http
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 2 items
@@ -120,7 +120,7 @@ Or select multiple nodes:
     test_server.py::TestClass::test_method PASSED                        [ 50%]
     test_server.py::test_send_http PASSED                                [100%]
 
-    ============================ 2 passed in 0.12s =============================
+    ========================= 2 passed in 0.12 seconds =========================
 
 .. _node-id:
 
@@ -148,22 +148,18 @@ which implements a substring match on the test names instead of the
 exact match on markers that ``-m`` provides.  This makes it easy to
 select tests based on their names:
 
-.. versionadded: 5.4
-
-The expression matching is now case-insensitive.
-
 .. code-block:: pytest
 
     $ pytest -v -k http  # running with the above defined example module
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 4 items / 3 deselected / 1 selected
 
     test_server.py::test_send_http PASSED                                [100%]
 
-    ===================== 1 passed, 3 deselected in 0.12s ======================
+    ================== 1 passed, 3 deselected in 0.12 seconds ==================
 
 And you can also run all tests except the ones that match the keyword:
 
@@ -171,7 +167,7 @@ And you can also run all tests except the ones that match the keyword:
 
     $ pytest -k "not send_http" -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 4 items / 1 deselected / 3 selected
@@ -180,7 +176,7 @@ And you can also run all tests except the ones that match the keyword:
     test_server.py::test_another PASSED                                  [ 66%]
     test_server.py::TestClass::test_method PASSED                        [100%]
 
-    ===================== 3 passed, 1 deselected in 0.12s ======================
+    ================== 3 passed, 1 deselected in 0.12 seconds ==================
 
 Or to select "http" and "quick" tests:
 
@@ -188,7 +184,7 @@ Or to select "http" and "quick" tests:
 
     $ pytest -k "http or quick" -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collecting ... collected 4 items / 2 deselected / 2 selected
@@ -196,7 +192,7 @@ Or to select "http" and "quick" tests:
     test_server.py::test_send_http PASSED                                [ 50%]
     test_server.py::test_something_quick PASSED                          [100%]
 
-    ===================== 2 passed, 2 deselected in 0.12s ======================
+    ================== 2 passed, 2 deselected in 0.12 seconds ==================
 
 .. note::
 
@@ -282,7 +278,7 @@ its test methods:
 
 
     @pytest.mark.webtest
-    class TestClass:
+    class TestClass(object):
         def test_startup(self):
             pass
 
@@ -292,14 +288,15 @@ its test methods:
 This is equivalent to directly applying the decorator to the
 two test functions.
 
-Due to legacy reasons, it is possible to set the ``pytestmark`` attribute on a TestClass like this:
+To remain backward-compatible with Python 2.4 you can also set a
+``pytestmark`` attribute on a TestClass like this:
 
 .. code-block:: python
 
     import pytest
 
 
-    class TestClass:
+    class TestClass(object):
         pytestmark = pytest.mark.webtest
 
 or if you need to use multiple markers you can use a list:
@@ -309,7 +306,7 @@ or if you need to use multiple markers you can use a list:
     import pytest
 
 
-    class TestClass:
+    class TestClass(object):
         pytestmark = [pytest.mark.webtest, pytest.mark.slowtest]
 
 You can also set a module level marker::
@@ -340,7 +337,7 @@ apply a marker to an individual test instance:
 
     @pytest.mark.foo
     @pytest.mark.parametrize(
-        ("n", "expected"), [(1, 2), pytest.param(1, 3, marks=pytest.mark.bar), (2, 3)]
+        ("n", "expected"), [(1, 2), pytest.param((1, 3), marks=pytest.mark.bar), (2, 3)]
     )
     def test_increment(n, expected):
         assert n + 1 == expected
@@ -388,7 +385,7 @@ specifies via named environments:
         envnames = [mark.args[0] for mark in item.iter_markers(name="env")]
         if envnames:
             if item.config.getoption("-E") not in envnames:
-                pytest.skip("test requires env in {!r}".format(envnames))
+                pytest.skip("test requires env in %r" % envnames)
 
 A test file using this local plugin:
 
@@ -410,14 +407,14 @@ the test needs:
 
     $ pytest -E stage2
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_someenv.py s                                                    [100%]
 
-    ============================ 1 skipped in 0.12s ============================
+    ======================== 1 skipped in 0.12 seconds =========================
 
 and here is one that specifies exactly the environment needed:
 
@@ -425,14 +422,14 @@ and here is one that specifies exactly the environment needed:
 
     $ pytest -E stage1
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 1 item
 
     test_someenv.py .                                                    [100%]
 
-    ============================ 1 passed in 0.12s =============================
+    ========================= 1 passed in 0.12 seconds =========================
 
 The ``--markers`` option always gives you a list of available markers:
 
@@ -503,7 +500,7 @@ The output is as follows:
     $ pytest -q -s
     Mark(name='my_marker', args=(<function hello_world at 0xdeadbeef>,), kwargs={})
     .
-    1 passed in 0.12s
+    1 passed in 0.12 seconds
 
 We can see that the custom marker has its argument set extended with the function ``hello_world``. This is the key difference between creating a custom marker as a callable, which invokes ``__call__`` behind the scenes, and using ``with_args``.
 
@@ -527,7 +524,7 @@ code you can read over all such settings.  Example:
 
 
     @pytest.mark.glob("class", x=2)
-    class TestClass:
+    class TestClass(object):
         @pytest.mark.glob("function", x=3)
         def test_something(self):
             pass
@@ -543,7 +540,7 @@ test function.  From a conftest file we can read it like this:
 
     def pytest_runtest_setup(item):
         for mark in item.iter_markers(name="glob"):
-            print("glob args={} kwargs={}".format(mark.args, mark.kwargs))
+            print("glob args=%s kwargs=%s" % (mark.args, mark.kwargs))
             sys.stdout.flush()
 
 Let's run this without capturing output and see what we get:
@@ -555,7 +552,7 @@ Let's run this without capturing output and see what we get:
     glob args=('class',) kwargs={'x': 2}
     glob args=('module',) kwargs={'x': 1}
     .
-    1 passed in 0.12s
+    1 passed in 0.12 seconds
 
 marking platform specific tests with pytest
 --------------------------------------------------------------
@@ -582,7 +579,7 @@ for your particular platform, you could use the following plugin:
         supported_platforms = ALL.intersection(mark.name for mark in item.iter_markers())
         plat = sys.platform
         if supported_platforms and plat not in supported_platforms:
-            pytest.skip("cannot run on platform {}".format(plat))
+            pytest.skip("cannot run on platform %s" % (plat))
 
 then tests will be skipped if they were specified for a different platform.
 Let's do a little test file to show how this looks like:
@@ -618,7 +615,7 @@ then you will see two tests skipped and two executed tests as expected:
 
     $ pytest -rs # this option reports skip reasons
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 4 items
@@ -626,8 +623,8 @@ then you will see two tests skipped and two executed tests as expected:
     test_plat.py s.s.                                                    [100%]
 
     ========================= short test summary info ==========================
-    SKIPPED [2] $REGENDOC_TMPDIR/conftest.py:12: cannot run on platform linux
-    ======================= 2 passed, 2 skipped in 0.12s =======================
+    SKIPPED [2] $REGENDOC_TMPDIR/conftest.py:13: cannot run on platform linux
+    =================== 2 passed, 2 skipped in 0.12 seconds ====================
 
 Note that if you specify a platform via the marker-command line option like this:
 
@@ -635,14 +632,14 @@ Note that if you specify a platform via the marker-command line option like this
 
     $ pytest -m linux
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 4 items / 3 deselected / 1 selected
 
     test_plat.py .                                                       [100%]
 
-    ===================== 1 passed, 3 deselected in 0.12s ======================
+    ================== 1 passed, 3 deselected in 0.12 seconds ==================
 
 then the unmarked-tests will not be run.  It is thus a way to restrict the run to the specific tests.
 
@@ -699,7 +696,7 @@ We can now use the ``-m option`` to select one set:
 
     $ pytest -m interface --tb=short
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 4 items / 2 deselected / 2 selected
@@ -715,10 +712,7 @@ We can now use the ``-m option`` to select one set:
     test_module.py:8: in test_interface_complex
         assert 0
     E   assert 0
-    ========================= short test summary info ==========================
-    FAILED test_module.py::test_interface_simple - assert 0
-    FAILED test_module.py::test_interface_complex - assert 0
-    ===================== 2 failed, 2 deselected in 0.12s ======================
+    ================== 2 failed, 2 deselected in 0.12 seconds ==================
 
 or to select both "event" and "interface" tests:
 
@@ -726,7 +720,7 @@ or to select both "event" and "interface" tests:
 
     $ pytest -m "interface or event" --tb=short
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR
     collected 4 items / 1 deselected / 3 selected
@@ -746,8 +740,4 @@ or to select both "event" and "interface" tests:
     test_module.py:12: in test_event_simple
         assert 0
     E   assert 0
-    ========================= short test summary info ==========================
-    FAILED test_module.py::test_interface_simple - assert 0
-    FAILED test_module.py::test_interface_complex - assert 0
-    FAILED test_module.py::test_event_simple - assert 0
-    ===================== 3 failed, 1 deselected in 0.12s ======================
+    ================== 3 failed, 1 deselected in 0.12 seconds ==================

doc/en/example/multipython.py

@@ -1,14 +1,15 @@
+# -*- coding: utf-8 -*-
 """
 module containing a parametrized tests testing cross-python
 serialization via the pickle module.
 """
-import shutil
+import distutils.spawn
 import subprocess
 import textwrap
 
 import pytest
 
-pythonlist = ["python3.5", "python3.6", "python3.7"]
+pythonlist = ["python2.7", "python3.4", "python3.5"]
 
 
 @pytest.fixture(params=pythonlist)
@@ -22,9 +23,9 @@ def python2(request, python1):
     return Python(request.param, python1.picklefile)
 
 
-class Python:
+class Python(object):
     def __init__(self, version, picklefile):
-        self.pythonpath = shutil.which(version)
+        self.pythonpath = distutils.spawn.find_executable(version)
         if not self.pythonpath:
             pytest.skip("{!r} not found".format(version))
         self.picklefile = picklefile
@@ -69,4 +70,4 @@ class Python:
 @pytest.mark.parametrize("obj", [42, {}, {1: 3}])
 def test_basic_objects(python1, python2, obj):
     python1.dumps(obj)
-    python2.load_and_is_true("obj == {}".format(obj))
+    python2.load_and_is_true("obj == %s" % obj)

doc/en/example/nonpython.rst

@@ -12,14 +12,14 @@ A basic example for specifying tests in Yaml files
 .. _`pytest-yamlwsgi`: http://bitbucket.org/aafshar/pytest-yamlwsgi/src/tip/pytest_yamlwsgi.py
 .. _`PyYAML`: https://pypi.org/project/PyYAML/
 
-Here is an example ``conftest.py`` (extracted from Ali Afshnars special purpose `pytest-yamlwsgi`_ plugin).   This ``conftest.py`` will  collect ``test*.yaml`` files and will execute the yaml-formatted content as custom tests:
+Here is an example ``conftest.py`` (extracted from Ali Afshnars special purpose `pytest-yamlwsgi`_ plugin).   This ``conftest.py`` will  collect ``test*.yml`` files and will execute the yaml-formatted content as custom tests:
 
 .. include:: nonpython/conftest.py
     :literal:
 
 You can create a simple example file:
 
-.. include:: nonpython/test_simple.yaml
+.. include:: nonpython/test_simple.yml
     :literal:
 
 and if you installed `PyYAML`_ or a compatible YAML-parser you can
@@ -27,23 +27,21 @@ now execute the test specification:
 
 .. code-block:: pytest
 
-    nonpython $ pytest test_simple.yaml
+    nonpython $ pytest test_simple.yml
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR/nonpython
     collected 2 items
 
-    test_simple.yaml F.                                                  [100%]
+    test_simple.yml F.                                                   [100%]
 
     ================================= FAILURES =================================
     ______________________________ usecase: hello ______________________________
     usecase execution failed
        spec failed: 'some': 'other'
        no further details known at this point.
-    ========================= short test summary info ==========================
-    FAILED test_simple.yaml::hello
-    ======================= 1 failed, 1 passed in 0.12s ========================
+    ==================== 1 failed, 1 passed in 0.12 seconds ====================
 
 .. regendoc:wipe
 
@@ -66,22 +64,20 @@ consulted when reporting in ``verbose`` mode:
 
     nonpython $ pytest -v
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y -- $PYTHON_PREFIX/bin/python
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR/nonpython
     collecting ... collected 2 items
 
-    test_simple.yaml::hello FAILED                                       [ 50%]
-    test_simple.yaml::ok PASSED                                          [100%]
+    test_simple.yml::hello FAILED                                        [ 50%]
+    test_simple.yml::ok PASSED                                           [100%]
 
     ================================= FAILURES =================================
     ______________________________ usecase: hello ______________________________
     usecase execution failed
        spec failed: 'some': 'other'
        no further details known at this point.
-    ========================= short test summary info ==========================
-    FAILED test_simple.yaml::hello
-    ======================= 1 failed, 1 passed in 0.12s ========================
+    ==================== 1 failed, 1 passed in 0.12 seconds ====================
 
 .. regendoc:wipe
 
@@ -92,13 +88,13 @@ interesting to just look at the collection tree:
 
     nonpython $ pytest --collect-only
     =========================== test session starts ============================
-    platform linux -- Python 3.x.y, pytest-5.x.y, py-1.x.y, pluggy-0.x.y
+    platform linux -- Python 3.x.y, pytest-4.x.y, py-1.x.y, pluggy-0.x.y
     cachedir: $PYTHON_PREFIX/.pytest_cache
     rootdir: $REGENDOC_TMPDIR/nonpython
     collected 2 items
     <Package $REGENDOC_TMPDIR/nonpython>
-      <YamlFile test_simple.yaml>
+      <YamlFile test_simple.yml>
         <YamlItem hello>
         <YamlItem ok>
 
-    ========================== no tests ran in 0.12s ===========================
+    ======================= no tests ran in 0.12 seconds =======================