Merge pull request #4119 from HypothesisWorks/create-pull-request/patch

Update pinned dependencies

hypothesis-python/RELEASE.rst

@@ -0,0 +1,4 @@
+RELEASE_TYPE: patch
+
+This patch fixes an internal error when the ``__context__``
+attribute of a raised exception leads to a cycle (:issue:`4115`).

hypothesis-python/setup.py

@@ -60,11 +60,11 @@ def local_file(name):
     "pytest": ["pytest>=4.6"],
     "dpcontracts": ["dpcontracts>=0.4"],
     "redis": ["redis>=3.0.0"],
-    "crosshair": ["hypothesis-crosshair>=0.0.14", "crosshair-tool>=0.0.71"],
+    "crosshair": ["hypothesis-crosshair>=0.0.14", "crosshair-tool>=0.0.72"],
     # zoneinfo is an odd one: every dependency is conditional, because they're
     # only necessary on old versions of Python or Windows systems or emscripten.
     "zoneinfo": [
-        "tzdata>=2024.1 ; sys_platform == 'win32' or sys_platform == 'emscripten'",
+        "tzdata>=2024.2 ; sys_platform == 'win32' or sys_platform == 'emscripten'",
         "backports.zoneinfo>=0.2.1 ; python_version<'3.9'",
     ],
     # We only support Django versions with upstream support - see

hypothesis-python/src/hypothesis/internal/escalation.py

@@ -13,9 +13,10 @@
 import sys
 import textwrap
 import traceback
+from functools import partial
 from inspect import getframeinfo
 from pathlib import Path
-from typing import Dict, NamedTuple, Optional, Type
+from typing import Dict, NamedTuple, Optional, Tuple, Type
 
 import hypothesis
 from hypothesis.errors import _Trimmable
@@ -107,20 +108,27 @@ def __str__(self) -> str:
         return f"{self.exc_type.__name__} at {self.filename}:{self.lineno}{ctx}{group}"
 
     @classmethod
-    def from_exception(cls, exception: BaseException, /) -> "InterestingOrigin":
+    def from_exception(
+        cls, exception: BaseException, /, seen: Tuple[BaseException, ...] = ()
+    ) -> "InterestingOrigin":
         filename, lineno = None, None
         if tb := get_trimmed_traceback(exception):
             filename, lineno, *_ = traceback.extract_tb(tb)[-1]
+        seen = (*seen, exception)
+        make = partial(cls.from_exception, seen=seen)
+        context: "InterestingOrigin | tuple[()]" = ()
+        if exception.__context__ is not None and exception.__context__ not in seen:
+            context = make(exception.__context__)
         return cls(
             type(exception),
             filename,
             lineno,
             # Note that if __cause__ is set it is always equal to __context__, explicitly
             # to support introspection when debugging, so we can use that unconditionally.
-            cls.from_exception(exception.__context__) if exception.__context__ else (),
+            context,
             # We distinguish exception groups by the inner exceptions, as for __context__
             (
-                tuple(map(cls.from_exception, exception.exceptions))
+                tuple(make(exc) for exc in exception.exceptions if exc not in seen)
                 if isinstance(exception, BaseExceptionGroup)
                 else ()
             ),

hypothesis-python/src/hypothesis/vendor/tlds-alpha-by-domain.txt

@@ -1,4 +1,4 @@
-# Version 2024071300, Last Updated Sat Jul 13 07:07:01 2024 UTC
+# Version 2024092800, Last Updated Sat Sep 28 07:07:01 2024 UTC
 AAA
 AARP
 ABB
@@ -297,7 +297,6 @@ CY
 CYMRU
 CYOU
 CZ
-DABUR
 DAD
 DANCE
 DATA

hypothesis-python/tests/cover/test_escalation.py

@@ -70,3 +70,26 @@ def test_handles_groups():
     assert "ExceptionGroup at " in str(origin)
     assert "child exception" in str(origin)
     assert "ValueError at " in str(origin)
+
+
+def make_exceptions_with_cycles():
+    err = ValueError()
+    err.__context__ = err
+    yield err
+
+    err = TypeError()
+    err.__context__ = BaseExceptionGroup("msg", [err])
+    yield err
+
+    inner = LookupError()
+    err = BaseExceptionGroup("msg", [inner])
+    inner.__context__ = err
+    yield err
+
+    inner = OSError()
+    yield BaseExceptionGroup("msg", [inner, inner, inner])
+
+
+@pytest.mark.parametrize("err", list(make_exceptions_with_cycles()))
+def test_handles_cycles(err):
+    esc.InterestingOrigin.from_exception(err)

requirements/coverage.txt

@@ -28,7 +28,7 @@ exceptiongroup==1.2.2 ; python_version < "3.11"
     #   pytest
 execnet==2.1.1
     # via pytest-xdist
-fakeredis==2.24.1
+fakeredis==2.25.0
     # via -r requirements/coverage.in
 iniconfig==2.0.0
     # via pytest
@@ -80,7 +80,7 @@ pytz==2024.2
     #   pandas
 pyyaml==6.0.2
     # via libcst
-redis==5.0.8
+redis==5.1.0
     # via fakeredis
 six==1.16.0
     # via python-dateutil
@@ -98,5 +98,5 @@ typing-extensions==4.12.2
     #   -r requirements/coverage.in
     #   black
     #   fakeredis
-tzdata==2024.1
+tzdata==2024.2
     # via pandas

requirements/fuzzing.txt

@@ -51,11 +51,11 @@ exceptiongroup==1.2.2 ; python_version < "3.11"
     #   pytest
 execnet==2.1.1
     # via pytest-xdist
-fakeredis==2.24.1
+fakeredis==2.25.0
     # via -r requirements/coverage.in
 flask==3.0.3
     # via dash
-hypofuzz==24.2.3
+hypofuzz==24.9.1
     # via -r requirements/fuzzing.in
 hypothesis[cli]==6.112.1
     # via hypofuzz
@@ -139,7 +139,7 @@ pytz==2024.2
     #   pandas
 pyyaml==6.0.2
     # via libcst
-redis==5.0.8
+redis==5.1.0
     # via fakeredis
 requests==2.32.3
     # via
@@ -171,7 +171,7 @@ typing-extensions==4.12.2
     #   black
     #   dash
     #   fakeredis
-tzdata==2024.1
+tzdata==2024.2
     # via pandas
 urllib3==2.2.3
     # via requests

requirements/tools.txt

@@ -105,7 +105,7 @@ jaraco-classes==3.4.0
     # via keyring
 jaraco-context==6.0.1
     # via keyring
-jaraco-functools==4.0.2
+jaraco-functools==4.1.0
     # via keyring
 jedi==0.19.1
     # via ipython
@@ -167,7 +167,7 @@ parso==0.8.4
     # via jedi
 pathspec==0.12.1
     # via black
-pelican[markdown]==4.10.0
+pelican[markdown]==4.10.1
     # via -r requirements/tools.in
 pexpect==4.9.0
     # via ipython
@@ -184,7 +184,7 @@ pluggy==1.5.0
     # via
     #   pytest
     #   tox
-prompt-toolkit==3.0.47
+prompt-toolkit==3.0.48
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
@@ -207,7 +207,7 @@ pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-pyright==1.1.381
+pyright==1.1.382.post1
     # via -r requirements/tools.in
 pytest==8.3.3
     # via -r requirements/tools.in
@@ -242,7 +242,7 @@ rich==13.8.1
     # via
     #   pelican
     #   twine
-ruff==0.6.7
+ruff==0.6.8
     # via -r requirements/tools.in
 secretstorage==3.3.3
     # via keyring
@@ -338,13 +338,14 @@ typing-extensions==4.12.2
     #   black
     #   ipython
     #   mypy
+    #   pyright
 unidecode==1.3.8
     # via pelican
 urllib3==2.2.3
     # via
     #   requests
     #   twine
-virtualenv==20.26.5
+virtualenv==20.26.6
     # via tox
 watchfiles==0.24.0
     # via pelican