Merge pull request #1058 from bluetech/pytest-min-7

Bump min pytest to 7.0.0

.pre-commit-config.yaml

@@ -29,5 +29,5 @@ repos:
         files: ^(src/|testing/)
         args: []
         additional_dependencies:
-          - pytest>=6.2.0
+          - pytest>=7.0.0
           - py>=1.10.0

changelog/1057.removal

@@ -0,0 +1 @@
+pytest>=7.0.0 is now required.

pyproject.toml

@@ -34,7 +34,7 @@ classifiers = [
 requires-python = ">=3.8"
 dependencies = [
     "execnet>=1.1",
-    "pytest>=6.2.0",
+    "pytest>=7.0.0",
 ]
 dynamic = ["version"]
 

src/xdist/dsession.py

@@ -206,9 +206,7 @@ def worker_internal_error(self, node, formatted_error):
         try:
             assert False, formatted_error
         except AssertionError:
-            from _pytest._code import ExceptionInfo
-
-            excinfo = ExceptionInfo.from_current()
+            excinfo = pytest.ExceptionInfo.from_current()
             excrepr = excinfo.getrepr()
             self.config.hook.pytest_internalerror(excrepr=excrepr, excinfo=excinfo)
 

src/xdist/looponfail.py

@@ -168,7 +168,7 @@ def init_worker_session(channel, args, option_dict):
     sys.path[:] = newpaths
 
     # fullwidth, hasmarkup = channel.receive()
-    from _pytest.config import Config
+    from pytest import Config
 
     config = Config.fromdictargs(option_dict, list(args))
     config.args = args

src/xdist/plugin.py

@@ -6,8 +6,6 @@
 import pytest
 
 
-PYTEST_GTE_7 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 0)  # type: ignore[attr-defined]
-
 _sys_path = list(sys.path)  # freeze a copy of sys.path at interpreter startup
 
 
@@ -188,16 +186,16 @@ def pytest_addoption(parser):
     parser.addini(
         "rsyncdirs",
         "list of (relative) paths to be rsynced for remote distributed testing.",
-        type="paths" if PYTEST_GTE_7 else "pathlist",
+        type="paths",
     )
     parser.addini(
         "rsyncignore",
         "list of (relative) glob-style paths to be ignored for rsyncing.",
-        type="paths" if PYTEST_GTE_7 else "pathlist",
+        type="paths",
     )
     parser.addini(
         "looponfailroots",
-        type="paths" if PYTEST_GTE_7 else "pathlist",
+        type="paths",
         help="directories to check for changes. Default: current directory.",
     )
 

src/xdist/remote.py

@@ -201,14 +201,9 @@ def pytest_collection_modifyitems(self, session, config, items):
 
     @pytest.hookimpl
     def pytest_collection_finish(self, session):
-        try:
-            topdir = str(self.config.rootpath)
-        except AttributeError:  # pytest <= 6.1.0
-            topdir = str(self.config.rootdir)
-
         self.sendevent(
             "collectionfinish",
-            topdir=topdir,
+            topdir=str(self.config.rootpath),
             ids=[item.nodeid for item in session.items],
         )
 

src/xdist/scheduler/load.py

@@ -1,6 +1,6 @@
 from itertools import cycle
 
-from _pytest.runner import CollectReport
+import pytest
 
 from xdist.remote import Producer
 from xdist.report import report_collection_diff
@@ -307,8 +307,11 @@ def _check_nodes_have_same_collection(self):
                 same_collection = False
                 self.log(msg)
                 if self.config is not None:
-                    rep = CollectReport(
-                        node.gateway.id, "failed", longrepr=msg, result=[]
+                    rep = pytest.CollectReport(
+                        nodeid=node.gateway.id,
+                        outcome="failed",
+                        longrepr=msg,
+                        result=[],
                     )
                     self.config.hook.pytest_collectreport(report=rep)
 

src/xdist/scheduler/loadscope.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 
-from _pytest.runner import CollectReport
+import pytest
 
 from xdist.remote import Producer
 from xdist.report import report_collection_diff
@@ -410,7 +410,12 @@ def _check_nodes_have_same_collection(self):
             if self.config is None:
                 continue
 
-            rep = CollectReport(node.gateway.id, "failed", longrepr=msg, result=[])
+            rep = pytest.CollectReport(
+                nodeid=node.gateway.id,
+                outcome="failed",
+                longrepr=msg,
+                result=[],
+            )
             self.config.hook.pytest_collectreport(report=rep)
 
         return same_collection

src/xdist/scheduler/worksteal.py

@@ -3,7 +3,7 @@
 from typing import Any
 from typing import NamedTuple
 
-from _pytest.runner import CollectReport
+import pytest
 
 from xdist.remote import Producer
 from xdist.report import report_collection_diff
@@ -323,8 +323,11 @@ def _check_nodes_have_same_collection(self):
                 same_collection = False
                 self.log(msg)
                 if self.config is not None:
-                    rep = CollectReport(
-                        node.gateway.id, "failed", longrepr=msg, result=[]
+                    rep = pytest.CollectReport(
+                        nodeid=node.gateway.id,
+                        outcome="failed",
+                        longrepr=msg,
+                        result=[],
                     )
                     self.config.hook.pytest_collectreport(report=rep)
 

src/xdist/workermanage.py

@@ -401,9 +401,7 @@ def process_from_remote(self, eventcall):
             # should not land in receiver-thread
             raise
         except BaseException:
-            from _pytest._code import ExceptionInfo
-
-            excinfo = ExceptionInfo.from_current()
+            excinfo = pytest.ExceptionInfo.from_current()
             print("!" * 20, excinfo)
             self.config.notify_exception(excinfo)
             self.shutdown()

testing/acceptance_test.py

@@ -1112,14 +1112,11 @@ def test_error_report_styles():
     result.assert_outcomes(failed=1)
 
 
-def test_color_yes_collection_on_non_atty(pytester, request) -> None:
+def test_color_yes_collection_on_non_atty(pytester) -> None:
     """Skip collect progress report when working on non-terminals.
 
     Similar to pytest-dev/pytest#1397
     """
-    tr = request.config.pluginmanager.getplugin("terminalreporter")
-    if not hasattr(tr, "isatty"):
-        pytest.skip("only valid for newer pytest versions")
     pytester.makepyfile(
         """
         import pytest

testing/test_looponfail.py

@@ -12,9 +12,6 @@
 from xdist.looponfail import StatRecorder
 
 
-PYTEST_GTE_7 = hasattr(pytest, "version_tuple") and pytest.version_tuple >= (7, 0)  # type: ignore[attr-defined]
-
-
 class TestStatRecorder:
     def test_filechange(self, tmp_path: Path) -> None:
         tmp = tmp_path
@@ -128,9 +125,8 @@ def test_failures_somewhere(self, pytester: pytest.Pytester) -> None:
         failures = control.runsession()
         assert failures
         control.setup()
-        item_path = item.path if PYTEST_GTE_7 else Path(str(item.fspath))  # type: ignore[attr-defined]
-        item_path.write_text("def test_func():\n assert 1\n")
-        removepyc(item_path)
+        item.path.write_text("def test_func():\n assert 1\n")
+        removepyc(item.path)
         topdir, failures = control.runsession()[:2]
         assert not failures
 
@@ -146,10 +142,7 @@ def test_func():
         control = RemoteControl(modcol.config)
         control.loop_once()
         assert control.failures
-        if PYTEST_GTE_7:
-            modcol_path = modcol.path  # type:ignore[attr-defined]
-        else:
-            modcol_path = Path(str(modcol.fspath))
+        modcol_path = modcol.path  # type:ignore[attr-defined]
 
         modcol_path.write_text(
             textwrap.dedent(
@@ -179,10 +172,7 @@ def test_func():
                 """
             )
         )
-        if PYTEST_GTE_7:
-            parent = modcol.path.parent.parent  # type: ignore[attr-defined]
-        else:
-            parent = Path(modcol.fspath.dirpath().dirpath())
+        parent = modcol.path.parent.parent  # type: ignore[attr-defined]
         monkeypatch.chdir(parent)
         modcol.config.args = [
             str(Path(x).relative_to(parent)) for x in modcol.config.args
@@ -248,8 +238,7 @@ def test_two():
         remotecontrol.loop_once()
         assert len(remotecontrol.failures) == 1
 
-        modcol_path = modcol.path if PYTEST_GTE_7 else Path(modcol.fspath)
-        modcol_path.write_text(
+        modcol.path.write_text(
             textwrap.dedent(
                 """
                 def test_one():
@@ -259,7 +248,7 @@ def test_two():
                 """
             )
         )
-        removepyc(modcol_path)
+        removepyc(modcol.path)
         remotecontrol.loop_once()
         assert not remotecontrol.failures
 
@@ -277,8 +266,7 @@ def test_one():
         assert len(remotecontrol.failures) == 1
         assert "test_one" in remotecontrol.failures[0]
 
-        modcol_path = modcol.path if PYTEST_GTE_7 else Path(modcol.fspath)
-        modcol_path.write_text(
+        modcol.path.write_text(
             textwrap.dedent(
                 """
                 def test_one():
@@ -288,7 +276,7 @@ def test_two():
                 """
             )
         )
-        removepyc(modcol_path)
+        removepyc(modcol.path)
         remotecontrol.loop_once()
         assert len(remotecontrol.failures) == 0
         remotecontrol.loop_once()

testing/test_remote.py

@@ -338,9 +338,7 @@ def test_mainargv(request):
     assert result.ret == 0
 
 
-def test_remote_usage_prog(pytester: pytest.Pytester, request) -> None:
-    if not hasattr(request.config._parser, "prog"):
-        pytest.skip("prog not available in config parser")
+def test_remote_usage_prog(pytester: pytest.Pytester) -> None:
     pytester.makeconftest(
         """
         import pytest

tox.ini

@@ -9,7 +9,7 @@ isolated_build = true
 [testenv]
 extras = testing
 deps =
-  pytestmin: pytest==6.2.0
+  pytestmin: pytest==7.0.0
   pytestlatest: pytest
   pytestmain: git+https://github.com/pytest-dev/pytest.git
 commands=