Merge branch 'main' into doc-syntax-fix

Pierre-Sassoulas · web-flow · commit 77c3a8487e9d · 2025-11-10T21:48:33.000+01:00
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -64,7 +64,7 @@ jobs:
         tox -e generate-gh-release-notes -- "$VERSION" gh-release-notes.md
 
     - name: Upload release notes
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: release-notes
         path: gh-release-notes.md
diff --git a/changelog/13895.bugfix.rst b/changelog/13895.bugfix.rst
@@ -0,0 +1 @@
+Restore support for skipping tests via ``raise unittest.SkipTest``.
diff --git a/changelog/13896.bugfix.rst b/changelog/13896.bugfix.rst
@@ -0,0 +1 @@
+The terminal progress plugin added in pytest 9.0 is now automatically disabled when iTerm2 is detected, it generated desktop notifications instead of the desired functionality.
diff --git a/changelog/13904.bugfix.rst b/changelog/13904.bugfix.rst
@@ -0,0 +1 @@
+Fixed the TOML type of the verbosity settings in the API reference from number to string.
diff --git a/doc/en/reference/plugin_list.rst b/doc/en/reference/plugin_list.rst
diff --git a/doc/en/reference/reference.rst b/doc/en/reference/reference.rst
@@ -2596,7 +2596,7 @@ passed multiple times. The expected format is ``name=value``. For example::
         .. code-block:: toml
 
             [pytest]
-            verbosity_assertions = 2
+            verbosity_assertions = "2"
 
     .. tab:: ini
 
@@ -2618,7 +2618,7 @@ passed multiple times. The expected format is ``name=value``. For example::
         .. code-block:: toml
 
             [pytest]
-            verbosity_subtests = 1
+            verbosity_subtests = "1"
 
     .. tab:: ini
 
@@ -2645,7 +2645,7 @@ passed multiple times. The expected format is ``name=value``. For example::
         .. code-block:: toml
 
             [pytest]
-            verbosity_test_cases = 2
+            verbosity_test_cases = "2"
 
     .. tab:: ini
 
diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py
@@ -16,6 +16,7 @@
 import datetime
 from functools import partial
 import inspect
+import os
 from pathlib import Path
 import platform
 import sys
@@ -299,8 +300,15 @@ def mywriter(tags, args):
         config.trace.root.setprocessor("pytest:config", mywriter)
 
     if reporter.isatty():
-        plugin = TerminalProgressPlugin(reporter)
-        config.pluginmanager.register(plugin, "terminalprogress")
+        # Some terminals interpret OSC 9;4 as desktop notification,
+        # skip on those we know (#13896).
+        should_skip_terminal_progress = (
+            # iTerm2 (reported on version 3.6.5).
+            "ITERM_SESSION_ID" in os.environ
+        )
+        if not should_skip_terminal_progress:
+            plugin = TerminalProgressPlugin(reporter)
+            config.pluginmanager.register(plugin, "terminalprogress")
 
 
 def getreportopt(config: Config) -> str:
diff --git a/src/_pytest/unittest.py b/src/_pytest/unittest.py
@@ -476,6 +476,14 @@ def pytest_runtest_makereport(item: Item, call: CallInfo[None]) -> None:
             except AttributeError:
                 pass
 
+    # Convert unittest.SkipTest to pytest.skip.
+    # This covers explicit `raise unittest.SkipTest`.
+    unittest = sys.modules.get("unittest")
+    if unittest and call.excinfo and isinstance(call.excinfo.value, unittest.SkipTest):
+        excinfo = call.excinfo
+        call2 = CallInfo[None].from_call(lambda: skip(str(excinfo.value)), call.when)
+        call.excinfo = call2.excinfo
+
 
 def _is_skipped(obj) -> bool:
     """Return True if the given object has been marked with @unittest.skip."""
diff --git a/testing/plugins_integration/pytest.ini b/testing/plugins_integration/pytest.ini
@@ -1,7 +1,6 @@
 [pytest]
 strict_markers = True
-; Temporarily disabled until adds support for pytest 9.
-; asyncio_mode = strict
+asyncio_mode = strict
 filterwarnings =
     error::pytest.PytestWarning
     ignore:usefixtures.* without arguments has no effect:pytest.PytestWarning
diff --git a/testing/plugins_integration/requirements.txt b/testing/plugins_integration/requirements.txt
@@ -1,7 +1,6 @@
 anyio[trio]==4.11.0
 django==5.2.8
-# Temporarily disabled until adds support for pytest 9.
-#pytest-asyncio==1.2.0
+pytest-asyncio==1.3.0
 pytest-bdd==8.1.0
 pytest-cov==7.0.0
 pytest-django==4.11.1
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
@@ -3443,6 +3443,17 @@ def test_disabled_for_non_tty(self, pytester: pytest.Pytester) -> None:
             plugin = config.pluginmanager.get_plugin("terminalprogress")
             assert plugin is None
 
+    def test_disabled_for_iterm2(self, pytester: pytest.Pytester, monkeypatch) -> None:
+        """Should not register the plugin on iTerm2 terminal since it interprets
+        OSC 9;4 as desktop notifications, not progress (#13896)."""
+        monkeypatch.setenv(
+            "ITERM_SESSION_ID", "w0t1p0:3DB6DF06-FE11-40C3-9A66-9E10A193A632"
+        )
+        with patch.object(sys.stdout, "isatty", return_value=True):
+            config = pytester.parseconfigure()
+            plugin = config.pluginmanager.get_plugin("terminalprogress")
+            assert plugin is None
+
     @pytest.mark.parametrize(
         ["state", "progress", "expected"],
         [
diff --git a/testing/test_unittest.py b/testing/test_unittest.py
@@ -1094,6 +1094,49 @@ def test_two(self):
     result.assert_outcomes(passed=2)
 
 
+def test_skip_setup_class(pytester: Pytester) -> None:
+    """Skipping tests in a class by raising unittest.SkipTest in `setUpClass` (#13985)."""
+    pytester.makepyfile(
+        """
+        import unittest
+
+        class Test(unittest.TestCase):
+
+            @classmethod
+            def setUpClass(cls):
+                raise unittest.SkipTest('Skipping setupclass')
+
+            def test_foo(self):
+                assert False
+
+            def test_bar(self):
+                assert False
+        """
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(skipped=2)
+
+
+def test_unittest_skip_function(pytester: Pytester) -> None:
+    """
+    Ensure raising an explicit unittest.SkipTest skips standard pytest functions.
+
+    Support for this is debatable -- technically we only support unittest.SkipTest in TestCase subclasses,
+    but stating this support here in this test because users currently expect this to work,
+    so if we ever break it we at least know we are breaking this use case (#13985).
+    """
+    pytester.makepyfile(
+        """
+        import unittest
+
+        def test_foo():
+            raise unittest.SkipTest('Skipping test_foo')
+        """
+    )
+    result = pytester.runpytest()
+    result.assert_outcomes(skipped=1)
+
+
 def test_testcase_handles_init_exceptions(pytester: Pytester) -> None:
     """
     Regression test to make sure exceptions in the __init__ method are bubbled up correctly.
diff --git a/tox.ini b/tox.ini
@@ -175,8 +175,7 @@ commands =
     pytest --html=simple.html simple_integration.py
     pytest --reruns 5 simple_integration.py pytest_rerunfailures_integration.py
     pytest pytest_anyio_integration.py
-    # Temporarily disabled until adds support for pytest 9.
-    # pytest pytest_asyncio_integration.py
+    pytest pytest_asyncio_integration.py
     pytest pytest_mock_integration.py
     pytest pytest_trio_integration.py
     pytest pytest_twisted_integration.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Restore support for skipping tests via ``raise unittest.SkipTest``.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+The terminal progress plugin added in pytest 9.0 is now automatically disabled when iTerm2 is detected, it generated desktop notifications instead of the desired functionality.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixed the TOML type of the verbosity settings in the API reference from number to string.`