pytest 8.4.1__tar.gz → 8.4.2__tar.gz

{pytest-8.4.1 → pytest-8.4.2}/.github/workflows/deploy.yml

@@ -109,8 +109,8 @@ jobs:
         tox -e generate-gh-release-notes -- "$VERSION" scripts/latest-release-notes.md
 
     - name: Publish GitHub Release
-      uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631
-      with:
-        body_path: scripts/latest-release-notes.md
-        files: dist/*
-        tag_name: ${{ github.event.inputs.version }}
+      env:
+        VERSION: ${{ github.event.inputs.version }}
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh release create --notes-file scripts/latest-release-notes.md --verify-tag "$VERSION" dist/*

{pytest-8.4.1 → pytest-8.4.2}/AUTHORS

@@ -261,6 +261,7 @@ Leonardus Chen
 Lev Maximov
 Levon Saldamli
 Lewis Cowles
+Liam DeVoe
 Llandy Riveron Del Risco
 Loic Esteve
 lovetheguitar

{pytest-8.4.1/src/pytest.egg-info → pytest-8.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest
-Version: 8.4.1
+Version: 8.4.2
 Summary: pytest: simple powerful testing with Python
 Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin, Others (See AUTHORS)
 License: MIT

{pytest-8.4.1 → pytest-8.4.2}/doc/en/announce/index.rst

@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
 
+   release-8.4.2
    release-8.4.1
    release-8.4.0
    release-8.3.5

pytest-8.4.2/doc/en/announce/release-8.4.2.rst

@@ -0,0 +1,27 @@
+pytest-8.4.2
+=======================================
+
+pytest 8.4.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement.
+
+The full changelog is available at https://docs.pytest.org/en/stable/changelog.html.
+
+Thanks to all of the contributors to this release:
+
+* AD
+* Aditi De
+* Bruno Oliveira
+* Florian Bruhin
+* John Litborn
+* Liam DeVoe
+* Marc Mueller
+* NayeemJohn
+* Olivier Grisel
+* Ran Benita
+* bengartner
+* 🇺🇦 Sviatoslav Sydorenko (Святослав Сидоренко)
+
+
+Happy testing,
+The pytest Development Team

{pytest-8.4.1 → pytest-8.4.2}/doc/en/builtin.rst

@@ -142,7 +142,7 @@ For information about fixtures, see :ref:`fixtures`. To see a complete list of a
 
         For more details: :ref:`doctest_namespace`.
 
-    pytestconfig [session scope] -- .../_pytest/fixtures.py:1424
+    pytestconfig [session scope] -- .../_pytest/fixtures.py:1425
         Session-scoped fixture that returns the session's :class:`pytest.Config`
         object.
 

{pytest-8.4.1 → pytest-8.4.2}/doc/en/changelog.rst

@@ -31,6 +31,49 @@ with advance notice in the **Deprecations** section of releases.
 
 .. towncrier release notes start
 
+pytest 8.4.2 (2025-09-03)
+=========================
+
+Bug fixes
+---------
+
+- `#13478 <https://github.com/pytest-dev/pytest/issues/13478>`_: Fixed a crash when using :confval:`console_output_style` with ``times`` and a module is skipped.
+
+
+- `#13530 <https://github.com/pytest-dev/pytest/issues/13530>`_: Fixed a crash when using :func:`pytest.approx` and :class:`decimal.Decimal` instances with the :class:`decimal.FloatOperation` trap set.
+
+
+- `#13549 <https://github.com/pytest-dev/pytest/issues/13549>`_: No longer evaluate type annotations in Python ``3.14`` when inspecting function signatures.
+
+  This prevents crashes during module collection when modules do not explicitly use ``from __future__ import annotations`` and import types for annotations within a ``if TYPE_CHECKING:`` block.
+
+
+- `#13559 <https://github.com/pytest-dev/pytest/issues/13559>`_: Added missing `int` and `float` variants to the `Literal` type annotation of the `type` parameter in :meth:`pytest.Parser.addini`.
+
+
+- `#13563 <https://github.com/pytest-dev/pytest/issues/13563>`_: :func:`pytest.approx` now only imports ``numpy`` if NumPy is already in ``sys.modules``. This fixes unconditional import behavior introduced in `8.4.0`.
+
+
+
+Improved documentation
+----------------------
+
+- `#13577 <https://github.com/pytest-dev/pytest/issues/13577>`_: Clarify that ``pytest_generate_tests`` is discovered in test modules/classes; other hooks must be in ``conftest.py`` or plugins.
+
+
+
+Contributor-facing changes
+--------------------------
+
+- `#13480 <https://github.com/pytest-dev/pytest/issues/13480>`_: Self-testing: fixed a few test failures when run with ``-Wdefault`` or a similar override.
+
+
+- `#13547 <https://github.com/pytest-dev/pytest/issues/13547>`_: Self-testing: corrected expected message for ``test_doctest_unexpected_exception`` in Python ``3.14``.
+
+
+- `#13684 <https://github.com/pytest-dev/pytest/issues/13684>`_: Make pytest's own testsuite insensitive to the presence of the ``CI`` environment variable -- by :user:`ogrisel`.
+
+
 pytest 8.4.1 (2025-06-17)
 =========================
 

{pytest-8.4.1 → pytest-8.4.2}/doc/en/example/parametrize.rst

@@ -162,7 +162,7 @@ objects, they are still using the default pytest representation:
     rootdir: /home/sweet/project
     collected 8 items
 
-    <Dir parametrize.rst-208>
+    <Dir parametrize.rst-209>
       <Module test_time.py>
         <Function test_timedistance_v0[a0-b0-expected0]>
         <Function test_timedistance_v0[a1-b1-expected1]>
@@ -239,7 +239,7 @@ If you just collect tests you'll also nicely see 'advanced' and 'basic' as varia
     rootdir: /home/sweet/project
     collected 4 items
 
-    <Dir parametrize.rst-208>
+    <Dir parametrize.rst-209>
       <Module test_scenarios.py>
         <Class TestSampleWithScenarios>
           <Function test_demo1[basic]>
@@ -318,7 +318,7 @@ Let's first see how it looks like at collection time:
     rootdir: /home/sweet/project
     collected 2 items
 
-    <Dir parametrize.rst-208>
+    <Dir parametrize.rst-209>
       <Module test_backends.py>
         <Function test_db_initialized[d1]>
         <Function test_db_initialized[d2]>

{pytest-8.4.1 → pytest-8.4.2}/doc/en/example/pythoncollection.rst

@@ -152,7 +152,7 @@ The test collection would look like this:
     configfile: pytest.ini
     collected 2 items
 
-    <Dir pythoncollection.rst-209>
+    <Dir pythoncollection.rst-210>
       <Module check_myapp.py>
         <Class CheckMyApp>
           <Function simple_check>
@@ -215,7 +215,7 @@ You can always peek at the collection tree without running tests like this:
     configfile: pytest.ini
     collected 3 items
 
-    <Dir pythoncollection.rst-209>
+    <Dir pythoncollection.rst-210>
       <Dir CWD>
         <Module pythoncollection.py>
           <Function test_function>

{pytest-8.4.1 → pytest-8.4.2}/doc/en/getting-started.rst

@@ -22,7 +22,7 @@ Install ``pytest``
 .. code-block:: bash
 
     $ pytest --version
-    pytest 8.4.1
+    pytest 8.4.2
 
 .. _`simpletest`:
 

{pytest-8.4.1 → pytest-8.4.2}/doc/en/how-to/fixtures.rst

@@ -1423,7 +1423,7 @@ Running the above tests results in the following test IDs being used:
    rootdir: /home/sweet/project
    collected 12 items
 
-   <Dir fixtures.rst-229>
+   <Dir fixtures.rst-230>
      <Module test_anothersmtp.py>
        <Function test_showhelo[smtp.gmail.com]>
        <Function test_showhelo[mail.python.org]>

{pytest-8.4.1 → pytest-8.4.2}/doc/en/how-to/parametrize.rst

@@ -240,6 +240,13 @@ command line option and the parametrization of our test function:
         if "stringinput" in metafunc.fixturenames:
             metafunc.parametrize("stringinput", metafunc.config.getoption("stringinput"))
 
+.. note::
+
+    The :hook:`pytest_generate_tests` hook can also be implemented directly in a test
+    module or inside a test class; unlike other hooks, pytest will discover it there
+    as well. Other hooks must live in a :ref:`conftest.py <localplugin>` or a plugin.
+    See :ref:`writinghooks`.
+
 If we now pass two stringinput values, our test will run twice:
 
 .. code-block:: pytest

{pytest-8.4.1 → pytest-8.4.2}/doc/en/how-to/writing_hook_functions.rst

@@ -235,6 +235,12 @@ Example:
         """
         print(config.hook)
 
+.. note::
+
+    Unlike other hooks, the :hook:`pytest_generate_tests` hook is also discovered when
+    defined inside a test module or test class. Other hooks must live in
+    :ref:`conftest.py plugins <localplugin>` or external plugins.
+    See :ref:`parametrize-basics` and the :ref:`hook-reference`.
 
 .. _`addoptionhooks`:
 

{pytest-8.4.1 → pytest-8.4.2}/doc/en/index.rst

@@ -2,7 +2,7 @@
 
 .. sidebar:: **Next Open Trainings and Events**
 
-    - `pytest - simple, rapid and fun testing with Python <https://ep2025.europython.eu/session/pytest-simple-rapid-and-fun-testing-with-python/>`_, at `EuroPython 2025 <https://ep2025.europython.eu/>`_, **July 14th** (3h), Prague, Czech Republic
+    - `Testen mit pytest <https://www.letsboot.ch/kurs/pytest>`_ (German), via `Letsboot <https://www.letsboot.ch/>`_ (3 day in-depth training), **October 29th -- 31st**, Zurich (CH)
     - `Professional Testing with Python <https://python-academy.com/courses/python_course_testing.html>`_, via `Python Academy <https://www.python-academy.com/>`_ (3 day in-depth training), **March 3th -- 5th 2026**, Leipzig (DE) / Remote
 
     Also see :doc:`previous talks and blogposts <talks>`

{pytest-8.4.1 → pytest-8.4.2}/pyproject.toml

@@ -426,6 +426,9 @@ markers = [
     "slow",
     # experimental mark for all tests using pexpect
     "uses_pexpect",
+    # Disables the `remove_ci_env_var` autouse fixture on a given test that
+    # actually inspects whether the CI environment variable is set.
+    "keep_ci_var",
 ]
 
 [tool.towncrier]

{pytest-8.4.1 → pytest-8.4.2}/scripts/prepare-release-pr.py

@@ -135,6 +135,7 @@ def prepare_release_pr(base_branch: str, is_major: bool, prerelease: str) -> Non
             f"--head={release_branch}",
             f"--title=Release {version}",
             f"--body={body}",
+            "--draft",
         ],
         check=True,
     )

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '8.4.1'
-__version_tuple__ = version_tuple = (8, 4, 1)
+__version__ = version = '8.4.2'
+__version_tuple__ = version_tuple = (8, 4, 2)
+
+__commit_id__ = commit_id = None

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/compat.py

@@ -8,7 +8,7 @@ import enum
 import functools
 import inspect
 from inspect import Parameter
-from inspect import signature
+from inspect import Signature
 import os
 from pathlib import Path
 import sys
@@ -19,6 +19,10 @@ from typing import NoReturn
 import py
 
 
+if sys.version_info >= (3, 14):
+    from annotationlib import Format
+
+
 #: constant to prepare valuing pylib path replacements/lazy proxies later on
 #  intended for removal in pytest 8.0 or 9.0
 
@@ -60,6 +64,13 @@ def is_async_function(func: object) -> bool:
     return iscoroutinefunction(func) or inspect.isasyncgenfunction(func)
 
 
+def signature(obj: Callable[..., Any]) -> Signature:
+    """Return signature without evaluating annotations."""
+    if sys.version_info >= (3, 14):
+        return inspect.signature(obj, annotation_format=Format.STRING)
+    return inspect.signature(obj)
+
+
 def getlocation(function, curdir: str | os.PathLike[str] | None = None) -> str:
     function = get_real_func(function)
     fn = Path(inspect.getfile(function))

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/config/argparsing.py

@@ -174,7 +174,9 @@ class Parser:
         self,
         name: str,
         help: str,
-        type: Literal["string", "paths", "pathlist", "args", "linelist", "bool"]
+        type: Literal[
+            "string", "paths", "pathlist", "args", "linelist", "bool", "int", "float"
+        ]
         | None = None,
         default: Any = NOT_SET,
     ) -> None:

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/fixtures.py

@@ -49,6 +49,7 @@ from _pytest.compat import NOTSET
 from _pytest.compat import NotSetType
 from _pytest.compat import safe_getattr
 from _pytest.compat import safe_isclass
+from _pytest.compat import signature
 from _pytest.config import _PluggyPlugin
 from _pytest.config import Config
 from _pytest.config import ExitCode
@@ -804,8 +805,8 @@ class SubRequest(FixtureRequest):
         path, lineno = getfslineno(factory)
         if isinstance(path, Path):
             path = bestrelpath(self._pyfuncitem.session.path, path)
-        signature = inspect.signature(factory)
-        return f"{path}:{lineno + 1}:  def {factory.__name__}{signature}"
+        sig = signature(factory)
+        return f"{path}:{lineno + 1}:  def {factory.__name__}{sig}"
 
     def addfinalizer(self, finalizer: Callable[[], object]) -> None:
         self._fixturedef.addfinalizer(finalizer)

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/nodes.py

@@ -8,7 +8,6 @@ from collections.abc import Iterator
 from collections.abc import MutableMapping
 from functools import cached_property
 from functools import lru_cache
-from inspect import signature
 import os
 import pathlib
 from pathlib import Path
@@ -29,6 +28,7 @@ from _pytest._code.code import TerminalRepr
 from _pytest._code.code import Traceback
 from _pytest._code.code import TracebackStyle
 from _pytest.compat import LEGACY_PATH
+from _pytest.compat import signature
 from _pytest.config import Config
 from _pytest.config import ConftestImportFailure
 from _pytest.config.compat import _check_path

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/python_api.py

@@ -426,12 +426,9 @@ class ApproxScalar(ApproxBase):
             # Check if `val` is a native bool or numpy bool.
             if isinstance(val, bool):
                 return True
-            try:
-                import numpy as np
-
+            if np := sys.modules.get("numpy"):
                 return isinstance(val, np.bool_)
-            except ImportError:
-                return False
+            return False
 
         asarray = _as_numpy_array(actual)
         if asarray is not None:
@@ -531,6 +528,25 @@ class ApproxDecimal(ApproxScalar):
     DEFAULT_ABSOLUTE_TOLERANCE = Decimal("1e-12")
     DEFAULT_RELATIVE_TOLERANCE = Decimal("1e-6")
 
+    def __repr__(self) -> str:
+        if isinstance(self.rel, float):
+            rel = Decimal.from_float(self.rel)
+        else:
+            rel = self.rel
+
+        if isinstance(self.abs, float):
+            abs_ = Decimal.from_float(self.abs)
+        else:
+            abs_ = self.abs
+
+        tol_str = "???"
+        if rel is not None and Decimal("1e-3") <= rel <= Decimal("1e3"):
+            tol_str = f"{rel:.1e}"
+        elif abs_ is not None:
+            tol_str = f"{abs_:.1e}"
+
+        return f"{self.expected} ± {tol_str}"
+
 
 def approx(expected, rel=None, abs=None, nan_ok: bool = False) -> ApproxBase:
     """Assert that two numbers (or two ordered sequences of numbers) are equal to each other

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/raises.py

@@ -457,7 +457,7 @@ class AbstractRaises(ABC, Generic[BaseExcT_co]):
                 return cast(type[BaseExcT_1], origin_exc)
             else:
                 raise ValueError(
-                    f"Only `ExceptionGroup[Exception]` or `BaseExceptionGroup[BaseExeption]` "
+                    f"Only `ExceptionGroup[Exception]` or `BaseExceptionGroup[BaseException]` "
                     f"are accepted as generic types but got `{exc}`. "
                     f"As `raises` will catch all instances of the specified group regardless of the "
                     f"generic argument specific nested exceptions has to be checked "
@@ -559,7 +559,7 @@ class RaisesExc(AbstractRaises[BaseExcT_co_default]):
         The type is checked with :func:`isinstance`, and does not need to be an exact match.
         If that is wanted you can use the ``check`` parameter.
 
-    :kwparam str | Pattern[str] match
+    :kwparam str | Pattern[str] match:
         A regex to match.
 
     :kwparam Callable[[BaseException], bool] check:

{pytest-8.4.1 → pytest-8.4.2}/src/_pytest/terminal.py

@@ -734,7 +734,9 @@ class TerminalReporter:
             last_in_module = tests_completed == tests_in_module
             if self.showlongtestinfo or last_in_module:
                 self._timing_nodeids_reported.update(r.nodeid for r in not_reported)
-                return format_node_duration(sum(r.duration for r in not_reported))
+                return format_node_duration(
+                    sum(r.duration for r in not_reported if isinstance(r, TestReport))
+                )
             return ""
         if collected:
             return f" [{len(self._progress_nodeids_reported) * 100 // collected:3d}%]"

{pytest-8.4.1 → pytest-8.4.2/src/pytest.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest
-Version: 8.4.1
+Version: 8.4.2
 Summary: pytest: simple powerful testing with Python
 Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin, Others (See AUTHORS)
 License: MIT

{pytest-8.4.1 → pytest-8.4.2}/src/pytest.egg-info/SOURCES.txt

@@ -253,6 +253,7 @@ doc/en/announce/release-8.3.4.rst
 doc/en/announce/release-8.3.5.rst
 doc/en/announce/release-8.4.0.rst
 doc/en/announce/release-8.4.1.rst
+doc/en/announce/release-8.4.2.rst
 doc/en/announce/sprint2016.rst
 doc/en/example/attic.rst
 doc/en/example/conftest.py

{pytest-8.4.1 → pytest-8.4.2}/testing/conftest.py

@@ -237,3 +237,15 @@ def mock_timing(monkeypatch: MonkeyPatch):
     result = MockTiming()
     result.patch(monkeypatch)
     return result
+
+
+@pytest.fixture(autouse=True)
+def remove_ci_env_var(monkeypatch: MonkeyPatch, request: pytest.FixtureRequest) -> None:
+    """Make the test insensitive if it is running in CI or not.
+
+    Use `@pytest.mark.keep_ci_var` in a test to avoid applying this fixture, letting the test
+    see the real `CI` variable (if present).
+    """
+    has_keep_ci_mark = request.node.get_closest_marker("keep_ci_var") is not None
+    if not has_keep_ci_mark:
+        monkeypatch.delenv("CI", raising=False)

{pytest-8.4.1 → pytest-8.4.2}/testing/python/approx.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from contextlib import contextmanager
+import decimal
 from decimal import Decimal
 from fractions import Fraction
 from math import sqrt
@@ -1015,6 +1016,11 @@ class TestApprox:
         expected_repr = "approx([1 ± 1.0e-06, 2 ± 2.0e-06, 3 ± 3.0e-06, 4 ± 4.0e-06])"
         assert repr(approx(expected)) == expected_repr
 
+    def test_decimal_approx_repr(self, monkeypatch) -> None:
+        monkeypatch.setitem(decimal.getcontext().traps, decimal.FloatOperation, True)
+        approx_obj = pytest.approx(decimal.Decimal("2.60"))
+        assert decimal.Decimal("2.600001") == approx_obj
+
     def test_allow_ordered_sequences_only(self) -> None:
         """pytest.approx() should raise an error on unordered sequences (#9692)."""
         with pytest.raises(TypeError, match="only supports ordered sequences"):
@@ -1079,10 +1085,10 @@ class TestRecursiveSequenceMap:
         ]
 
     def test_map_over_mixed_sequence(self):
-        assert _recursive_sequence_map(sqrt, [4, (25, 64), [(49)]]) == [
+        assert _recursive_sequence_map(sqrt, [4, (25, 64), [49]]) == [
             2,
             (5, 8),
-            [(7)],
+            [7],
         ]
 
     def test_map_over_sequence_like(self):

{pytest-8.4.1 → pytest-8.4.2}/testing/python/raises_group.py

@@ -1304,7 +1304,7 @@ def test_parametrizing_conditional_raisesgroup(
 def test_annotated_group() -> None:
     # repr depends on if exceptiongroup backport is being used or not
     t = repr(ExceptionGroup[ValueError])
-    msg = "Only `ExceptionGroup[Exception]` or `BaseExceptionGroup[BaseExeption]` are accepted as generic types but got `{}`. As `raises` will catch all instances of the specified group regardless of the generic argument specific nested exceptions has to be checked with `RaisesGroup`."
+    msg = "Only `ExceptionGroup[Exception]` or `BaseExceptionGroup[BaseException]` are accepted as generic types but got `{}`. As `raises` will catch all instances of the specified group regardless of the generic argument specific nested exceptions has to be checked with `RaisesGroup`."
 
     fail_msg = wrap_escape(msg.format(t))
     with pytest.raises(ValueError, match=fail_msg):

{pytest-8.4.1 → pytest-8.4.2}/testing/test_collection.py

@@ -1895,3 +1895,43 @@ def test_yield_disallowed_in_tests(pytester: Pytester):
     )
     # Assert that no tests were collected
     result.stdout.fnmatch_lines(["*collected 0 items*"])
+
+
+def test_annotations_deferred_future(pytester: Pytester):
+    """Ensure stringified annotations don't raise any errors."""
+    pytester.makepyfile(
+        """
+        from __future__ import annotations
+        import pytest
+
+        @pytest.fixture
+        def func() -> X: ...  # X is undefined
+
+        def test_func():
+            assert True
+        """
+    )
+    result = pytester.runpytest()
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(["*1 passed*"])
+
+
+@pytest.mark.skipif(
+    sys.version_info < (3, 14), reason="Annotations are only skipped on 3.14+"
+)
+def test_annotations_deferred_314(pytester: Pytester):
+    """Ensure annotation eval is deferred."""
+    pytester.makepyfile(
+        """
+        import pytest
+
+        @pytest.fixture
+        def func() -> X: ...  # X is undefined
+
+        def test_func():
+            assert True
+        """
+    )
+    result = pytester.runpytest()
+    assert result.ret == 0
+    result.stdout.fnmatch_lines(["*1 passed*"])

{pytest-8.4.1 → pytest-8.4.2}/testing/test_doctest.py

@@ -223,9 +223,12 @@ class TestDoctests:
                 "002 >>> 0 / i",
                 "UNEXPECTED EXCEPTION: ZeroDivisionError*",
                 "Traceback (most recent call last):",
-                '  File "*/doctest.py", line *, in __run',
-                "    *",
-                *((" *^^^^*", " *", " *") if sys.version_info >= (3, 13) else ()),
+                *(
+                    ('  File "*/doctest.py", line *, in __run', "    *")
+                    if sys.version_info <= (3, 14)
+                    else ()
+                ),
+                *((" *^^^^*", " *", " *") if sys.version_info[:2] == (3, 13) else ()),
                 '  File "<doctest test_doctest_unexpected_exception.txt[1]>", line 1, in <module>',
                 "ZeroDivisionError: division by zero",
                 "*/test_doctest_unexpected_exception.txt:2: UnexpectedException",

{pytest-8.4.1 → pytest-8.4.2}/testing/test_faulthandler.py

@@ -71,6 +71,7 @@ def test_disabled(pytester: Pytester) -> None:
     assert result.ret == 0
 
 
+@pytest.mark.keep_ci_var
 @pytest.mark.parametrize(
     "enabled",
     [

{pytest-8.4.1 → pytest-8.4.2}/testing/test_terminal.py

@@ -112,6 +112,31 @@ class TestTerminal:
             ["    def test_func():", ">       assert 0", "E       assert 0"]
         )
 
+    def test_console_output_style_times_with_skipped_and_passed(
+        self, pytester: Pytester
+    ) -> None:
+        pytester.makepyfile(
+            test_repro="""
+                def test_hello():
+                    pass
+            """,
+            test_repro_skip="""
+                import pytest
+                pytest.importorskip("fakepackage_does_not_exist")
+            """,
+        )
+        result = pytester.runpytest(
+            "test_repro.py",
+            "test_repro_skip.py",
+            "-o",
+            "console_output_style=times",
+        )
+
+        result.stdout.fnmatch_lines("* 1 passed, 1 skipped in *")
+
+        combined = "\n".join(result.stdout.lines + result.stderr.lines)
+        assert "INTERNALERROR" not in combined
+
     def test_internalerror(self, pytester: Pytester, linecomp) -> None:
         modcol = pytester.getmodulecol("def test_one(): pass")
         rep = TerminalReporter(modcol.config, file=linecomp.stringio)

{pytest-8.4.1 → pytest-8.4.2}/testing/test_threadexception.py

@@ -211,7 +211,7 @@ def test_unhandled_thread_exception_after_teardown(pytester: Pytester) -> None:
         """
     )
 
-    result = pytester.runpytest()
+    result = pytester.runpytest("-Werror")
 
     # TODO: should be a test failure or error
     assert result.ret == pytest.ExitCode.INTERNAL_ERROR

{pytest-8.4.1 → pytest-8.4.2}/testing/test_warnings.py

@@ -149,6 +149,7 @@ def test_unicode(pytester: Pytester) -> None:
     )
 
 
+@pytest.mark.skip("issue #13485")
 def test_works_with_filterwarnings(pytester: Pytester) -> None:
     """Ensure our warnings capture does not mess with pre-installed filters (#2430)."""
     pytester.makepyfile(