Merge pull request #8258 from cjc7373/update-pytest

Update pytest

setup.cfg

@@ -38,6 +38,18 @@ ignore_errors = True
 
 [tool:pytest]
 addopts = --ignore src/pip/_vendor --ignore tests/tests_cache -r aR
+markers =
+    network: tests that needs network
+    incompatible_with_test_venv
+    incompatible_with_venv
+    no_auto_tempdir_manager
+    unit: unit tests
+    integration: integration tests
+    bzr: VCS: Bazaar
+    svn: VCS: Subversion
+    mercurial: VCS: Mercurial
+    git: VCS: git
+    yaml: yaml based tests
 
 [bdist_wheel]
 universal = 1

tools/requirements/tests.txt

@@ -4,13 +4,13 @@ enum34; python_version < '3.4'
 freezegun
 mock
 pretend
-pytest==3.8.2
+# pytest 5.x only supports python 3.5+
+pytest<5.0.0
 pytest-cov
-# Prevent installing 7.0 which has install_requires "pytest >= 3.10".
-pytest-rerunfailures<7.0
+# Prevent installing 9.0 which has install_requires "pytest >= 5.0".
+pytest-rerunfailures<9.0
 pytest-timeout
-# Prevent installing 1.28.0 which has install_requires "pytest >= 4.4.0".
-pytest-xdist<1.28.0
+pytest-xdist
 pyyaml
 setuptools>=39.2.0  # Needed for `setuptools.wheel.Wheel` support.
 scripttest