Allow newer versions of pytest (6.2.x) (pantsbuild#11381)

### Problem pytest 6.2 was released in the past month, there are no critical breaking changes in that version so we should allow pants to use it. ### Solution Allow pants to use pytest 6.2.x
vkleen · Dec 23, 2020 · d771e60 · d771e60
1 parent e25327a
commit d771e60
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/3rdparty/python/constraints.txt b/3rdparty/python/constraints.txt
@@ -1,4 +1,4 @@
-# Generated by build-support/bin/generate_lockfile.sh on Fri Dec 18 14:52:30 PST 2020
+# Generated by build-support/bin/generate_lockfile.sh on Wed Dec 23 10:11:46 PST 2020
 ansicolors==1.1.8
 attrs==20.3.0
 beautifulsoup4==4.6.3
@@ -10,7 +10,6 @@ fasteners==0.15
 idna==2.10
 iniconfig==1.1.1
 monotonic==1.5
-more-itertools==8.6.0
 mypy==0.782
 mypy-extensions==0.4.3
 packaging==20.8
@@ -24,7 +23,7 @@ pycparser==2.20
 pyOpenSSL==20.0.1
 pyparsing==2.4.7
 pystache==0.5.4
-pytest==6.0.2
+pytest==6.2.1
 PyYAML==5.3.1
 requests==2.25.1
 setproctitle==1.2

diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
@@ -18,7 +18,7 @@ pex==2.1.24
 psutil==5.7.0
 pystache==0.5.4
 # This should be kept in sync with `pytest.py`.
-pytest>=6.0.1,<6.1
+pytest>=6.0.1,<6.3
 PyYAML>=5.3.1,<5.4
 requests[security]>=2.20.1
 setproctitle==1.2

diff --git a/src/python/pants/backend/python/subsystems/pytest.py b/src/python/pants/backend/python/subsystems/pytest.py
@@ -26,7 +26,7 @@ def register_options(cls, register):
             # This should be kept in sync with `requirements.txt`.
             # TODO: To fix this, we should allow using a `target_option` referring to a
             #  `python_requirement_library` to override the version.
-            default="pytest>=6.0.1,<6.1",
+            default="pytest>=6.0.1,<6.3",
             advanced=True,
             help="Requirement string for Pytest.",
         )

diff --git a/tests/python/pants_test/init/test_plugin_resolver.py b/tests/python/pants_test/init/test_plugin_resolver.py
@@ -247,7 +247,7 @@ def _do_test_exact_requirements_interpreter_change(rule_runner: RuleRunner, sdis
 
         # But for a compatible interpreter the exact resolve results should be re-used and load
         # directly from the still in-tact cache.
-        with plugin_resolution(  # type: ignore[unreachable]
+        with plugin_resolution(
             rule_runner,
             interpreter=python36,
             chroot=chroot,