Merge pull request #741 from nicoddemus/release-2.5.0

CHANGELOG.rst

@@ -1,3 +1,26 @@
+pytest-xdist 2.5.0 (2021-12-10)
+===============================
+
+Features
+--------
+
+- `#722 <https://github.com/pytest-dev/pytest-xdist/issues/722>`_: Full compatibility with pytest 7 - no deprecation warnings or use of legacy features.
+
+- `#733 <https://github.com/pytest-dev/pytest-xdist/issues/733>`_: New ``--dist=loadgroup`` option, which ensures all tests marked with ``@pytest.mark.xdist_group`` run in the same session/worker. Other tests run distributed as in ``--dist=load``.
+
+
+Trivial Changes
+---------------
+
+- `#708 <https://github.com/pytest-dev/pytest-xdist/issues/708>`_: Use ``@pytest.hookspec`` decorator to declare hook options in ``newhooks.py`` to avoid warnings in ``pytest 7.0``.
+
+- `#719 <https://github.com/pytest-dev/pytest-xdist/issues/719>`_: Use up-to-date ``setup.cfg``/``pyproject.toml`` packaging setup.
+
+- `#720 <https://github.com/pytest-dev/pytest-xdist/issues/720>`_: Require pytest>=6.2.0.
+
+- `#721 <https://github.com/pytest-dev/pytest-xdist/issues/721>`_: Started using type annotations and mypy checking internally. The types are incomplete and not published.
+
+
 pytest-xdist 2.4.0 (2021-09-20)
 ===============================
 

changelog/708.trivial.rst

@@ -1 +0,0 @@
-Use ``@pytest.hookspec`` decorator to declare hook options in ``newhooks.py`` to avoid warnings in ``pytest 7.0``.

changelog/719.trivial.rst

@@ -1 +0,0 @@
-Use up-to-date ``setup.cfg``/``pyproject.toml`` packaging setup.

changelog/720.trivial.rst

@@ -1 +0,0 @@
-Require pytest>=6.2.0.

changelog/721.trivial.rst

@@ -1 +0,0 @@
-Started using type annotations and mypy checking internally. The types are incomplete and not published.

changelog/722.feature.rst

@@ -1 +0,0 @@
-Full compatibility with pytest 7 - no deprecation warnings or use of legacy features.

changelog/733.feature.rst

@@ -1 +0,0 @@
-New ``--dist=loadgroup`` option, which ensures all tests marked with ``@pytest.mark.xdist_group`` run in the same session/worker. Other tests run distributed as in ``--dist=load``.

src/xdist/dsession.py

@@ -294,6 +294,8 @@ class DSession:
 
     def worker_warning_captured(self, warning_message, when, item):
         """Emitted when a node calls the pytest_warning_captured hook (deprecated in 6.0)."""
+        # This hook as been removed in pytest 7.1, and we can remove support once we only
+        # support pytest >=7.1.
         kwargs = dict(warning_message=warning_message, when=when, item=item)
         self.config.hook.pytest_warning_captured.call_historic(kwargs=kwargs)
 

testing/acceptance_test.py

@@ -447,11 +447,6 @@ class TestTerminalReporting:
 
     def test_logfinish_hook(self, pytester: pytest.Pytester) -> None:
         """Ensure the pytest_runtest_logfinish hook is being properly handled"""
-        from _pytest import hookspec
-
-        if not hasattr(hookspec, "pytest_runtest_logfinish"):
-            pytest.skip("test requires pytest_runtest_logfinish hook in pytest (3.4+)")
-
         pytester.makeconftest(
             """
             def pytest_runtest_logfinish():
@@ -773,6 +768,13 @@ class TestWarnings:
         """
         Do not trigger the deprecated pytest_warning_captured hook in pytest 6+ (#562)
         """
+        from _pytest import hookspec
+
+        if not hasattr(hookspec, "pytest_warning_captured"):
+            pytest.skip(
+                f"pytest {pytest.__version__} does not have the pytest_warning_captured hook."
+            )
+
         pytester.makeconftest(
             """
             def pytest_warning_captured(warning_message):