From ef699f8c1719959dfa6c32f06fc705f70672308d Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Thu, 30 Nov 2023 19:53:31 +0200 Subject: [PATCH 1/2] testing: remove a no longer necessary skip pytest-xdist was released at 2019-02-15, seems enough time. --- testing/test_config.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testing/test_config.py b/testing/test_config.py index 58671e6ed..900cccee8 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -1959,16 +1959,6 @@ def test_invocation_args(pytester: Pytester) -> None: ], ) def test_config_blocked_default_plugins(pytester: Pytester, plugin: str) -> None: - if plugin == "debugging": - # Fixed in xdist (after 1.27.0). - # https://github.com/pytest-dev/pytest-xdist/pull/422 - try: - import xdist # noqa: F401 - except ImportError: - pass - else: - pytest.skip("does not work with xdist currently") - p = pytester.makepyfile("def test(): pass") result = pytester.runpytest(str(p), "-pno:%s" % plugin) From 5689d806cffa394ae3e79aff9617784bb14533c2 Mon Sep 17 00:00:00 2001 From: touilleWoman <39769383+touilleWoman@users.noreply.github.com> Date: Fri, 1 Dec 2023 15:25:01 +0100 Subject: [PATCH 2/2] Fix "Customizing Colors" documentation section (#11652) Fixes #11573 --- doc/en/how-to/logging.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/en/how-to/logging.rst b/doc/en/how-to/logging.rst index b9f522fa4..bdcfbe34f 100644 --- a/doc/en/how-to/logging.rst +++ b/doc/en/how-to/logging.rst @@ -241,7 +241,7 @@ through ``add_color_level()``. Example: .. code-block:: python - @pytest.hookimpl + @pytest.hookimpl(trylast=True) def pytest_configure(config): logging_plugin = config.pluginmanager.get_plugin("logging-plugin")