Merge pull request #4485 from tybug/liam-update-deps

Liam-DeVoe · web-flow · commit cc0c813fe0c4 · 2025-07-27T18:59:12.000-04:00
Update pinned dependencies (manual)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -239,8 +239,8 @@ jobs:
       NODE_VERSION: 22
       # Note that the versions below are updated by `update_pyodide_versions()` in our weekly cronjob.
       # The versions of pyodide-build and the Pyodide runtime may differ.
-      PYODIDE_VERSION: 0.27.5
-      PYODIDE_BUILD_VERSION: 0.30.0
+      PYODIDE_VERSION: 0.27.7
+      PYODIDE_BUILD_VERSION: 0.30.5
       PYTHON_VERSION: 3.12.7
     steps:
       - uses: actions/checkout@v3
diff --git a/build.sh b/build.sh
@@ -25,8 +25,8 @@ if [ -n "${GITHUB_ACTIONS-}" ] || [ -n "${CODESPACES-}" ] ; then
 else
     # Otherwise, we install it from scratch
     # NOTE: tooling keeps this version in sync with ci_version in tooling
-    "$SCRIPTS/ensure-python.sh" 3.10.17
-    PYTHON=$(pythonloc 3.10.17)/bin/python
+    "$SCRIPTS/ensure-python.sh" 3.10.18
+    PYTHON=$(pythonloc 3.10.18)/bin/python
 fi
 
 TOOL_REQUIREMENTS="$ROOT/requirements/tools.txt"
diff --git a/hypothesis-python/RELEASE.rst b/hypothesis-python/RELEASE.rst
@@ -0,0 +1,4 @@
+RELEASE_TYPE: patch
+
+This patch updates our vendored `list of top-level domains <https://www.iana.org/domains/root/db>`__,
+which is used by the provisional :func:`~hypothesis.provisional.domains` strategy.
diff --git a/hypothesis-python/pyproject.toml b/hypothesis-python/pyproject.toml
@@ -111,7 +111,7 @@ pandas = ["pandas>=1.1"]
 pytest = ["pytest>=4.6"]
 dpcontracts = ["dpcontracts>=0.4"]
 redis = ["redis>=3.0.0"]
-crosshair = ["hypothesis-crosshair>=0.0.23", "crosshair-tool>=0.0.88"]
+crosshair = ["hypothesis-crosshair>=0.0.24", "crosshair-tool>=0.0.93"]
 # zoneinfo is an odd one: every dependency is platform-conditional.
 zoneinfo = ["tzdata>=2025.2; sys_platform == 'win32' or sys_platform == 'emscripten'"]
 # We only support Django versions with upstream support - see
@@ -121,7 +121,7 @@ zoneinfo = ["tzdata>=2025.2; sys_platform == 'win32' or sys_platform == 'emscrip
 django = ["django>=4.2"]
 watchdog = ["watchdog>=4.0.0"]
 # Avoid changing this by hand. This is automatically updated by update_changelog_and_version
-all = ["black>=19.10b0", "click>=7.0", "crosshair-tool>=0.0.88", "django>=4.2", "dpcontracts>=0.4", "hypothesis-crosshair>=0.0.23", "lark>=0.10.1", "libcst>=0.3.16", "numpy>=1.19.3", "pandas>=1.1", "pytest>=4.6", "python-dateutil>=1.4", "pytz>=2014.1", "redis>=3.0.0", "rich>=9.0.0", "tzdata>=2025.2; sys_platform == 'win32' or sys_platform == 'emscripten'", "watchdog>=4.0.0"]
+all = ["black>=19.10b0", "click>=7.0", "crosshair-tool>=0.0.93", "django>=4.2", "dpcontracts>=0.4", "hypothesis-crosshair>=0.0.24", "lark>=0.10.1", "libcst>=0.3.16", "numpy>=1.19.3", "pandas>=1.1", "pytest>=4.6", "python-dateutil>=1.4", "pytz>=2014.1", "redis>=3.0.0", "rich>=9.0.0", "tzdata>=2025.2; sys_platform == 'win32' or sys_platform == 'emscripten'", "watchdog>=4.0.0"]
 
 [tool.setuptools.dynamic]
 version = {attr = "hypothesis.version.__version__"}
diff --git a/hypothesis-python/scripts/other-tests.sh b/hypothesis-python/scripts/other-tests.sh
@@ -33,8 +33,8 @@ $PYTEST tests/redis/
 pip uninstall -y redis fakeredis
 
 $PYTEST tests/typing_extensions/
-if [[ "$HYPOTHESIS_PROFILE" != "crosshair" ]]; then
-  pip uninstall -y typing_extensions
+if [ "$HYPOTHESIS_PROFILE" != "crosshair" ] && [ "$(python -c 'import sys; print(sys.version_info[:2] > (3, 10))')" = "True" ]; then
+  pip uninstall -y typing-extensions
 fi
 
 pip install "$(grep 'annotated-types==' ../requirements/coverage.txt)"
diff --git a/hypothesis-python/src/hypothesis/_settings.py b/hypothesis-python/src/hypothesis/_settings.py
@@ -460,7 +460,7 @@ class settings(metaclass=settingsMeta):
             "default",
             max_examples=100,
             derandomize=False,
-            database=not_set,  # see settings.database for details
+            database=not_set,  # see settings.database for the default database
             verbosity=Verbosity.normal,
             phases=tuple(Phase),
             stateful_step_count=50,
diff --git a/hypothesis-python/src/hypothesis/database.py b/hypothesis-python/src/hypothesis/database.py
@@ -138,9 +138,16 @@ def __call__(self, *args: Any, **kwargs: Any) -> "ExampleDatabase":
 # downstream ExampleDatabase subclasses too.
 if "sphinx" in sys.modules:
     try:
-        from sphinx.ext.autodoc import _METACLASS_CALL_BLACKLIST
+        import sphinx.ext.autodoc
 
-        _METACLASS_CALL_BLACKLIST.append("hypothesis.database._EDMeta.__call__")
+        signature = "hypothesis.database._EDMeta.__call__"
+        # _METACLASS_CALL_BLACKLIST is a frozenset in later sphinx versions
+        if isinstance(sphinx.ext.autodoc._METACLASS_CALL_BLACKLIST, frozenset):
+            sphinx.ext.autodoc._METACLASS_CALL_BLACKLIST = (
+                sphinx.ext.autodoc._METACLASS_CALL_BLACKLIST | {signature}
+            )
+        else:
+            sphinx.ext.autodoc._METACLASS_CALL_BLACKLIST.append(signature)
     except Exception:
         pass
 
diff --git a/hypothesis-python/src/hypothesis/extra/ghostwriter.py b/hypothesis-python/src/hypothesis/extra/ghostwriter.py
@@ -90,7 +90,6 @@
 from typing import (
     Any,
     Callable,
-    DefaultDict,
     ForwardRef,
     NamedTuple,
     Optional,
@@ -886,7 +885,7 @@ def _make_test_body(
 def _annotate_args(
     argnames: Iterable[str], funcs: Iterable[Callable], imports: ImportSet
 ) -> Iterable[str]:
-    arg_parameters: DefaultDict[str, set[Any]] = defaultdict(set)
+    arg_parameters: defaultdict[str, set[Any]] = defaultdict(set)
     for func in funcs:
         try:
             params = tuple(get_signature(func, eval_str=True).parameters.values())
diff --git a/hypothesis-python/src/hypothesis/internal/conjecture/datatree.py b/hypothesis-python/src/hypothesis/internal/conjecture/datatree.py
@@ -9,9 +9,9 @@
 # obtain one at https://mozilla.org/MPL/2.0/.
 
 import math
-from collections.abc import Generator
+from collections.abc import Generator, Set
 from random import Random
-from typing import TYPE_CHECKING, AbstractSet, Final, Optional, Union, cast
+from typing import TYPE_CHECKING, Final, Optional, Union, cast
 
 import attr
 
@@ -431,7 +431,7 @@ class TreeNode:
     is_exhausted: bool = attr.ib(default=False, init=False)
 
     @property
-    def forced(self) -> AbstractSet[int]:
+    def forced(self) -> Set[int]:
         if not self.__forced:
             return EMPTY
         return self.__forced
diff --git a/hypothesis-python/src/hypothesis/internal/conjecture/engine.py b/hypothesis-python/src/hypothesis/internal/conjecture/engine.py
@@ -19,7 +19,7 @@
 from datetime import timedelta
 from enum import Enum
 from random import Random, getrandbits
-from typing import Callable, Final, List, Literal, NoReturn, Optional, Union, cast
+from typing import Callable, Final, Literal, NoReturn, Optional, Union, cast
 
 from hypothesis import HealthCheck, Phase, Verbosity, settings as Settings
 from hypothesis._settings import local_settings, note_deprecation
@@ -108,7 +108,7 @@ class HealthCheckState:
     valid_examples: int = field(default=0)
     invalid_examples: int = field(default=0)
     overrun_examples: int = field(default=0)
-    draw_times: "defaultdict[str, List[float]]" = field(
+    draw_times: defaultdict[str, list[float]] = field(
         default_factory=lambda: defaultdict(list)
     )
 
diff --git a/hypothesis-python/src/hypothesis/internal/conjecture/utils.py b/hypothesis-python/src/hypothesis/internal/conjecture/utils.py
@@ -87,7 +87,9 @@ def check_sample(
             "Hypothesis treats earlier values as simpler."
         )
     if isinstance(values, range):
-        return values
+        # Pyright is unhappy with every way I've tried to type-annotate this
+        # function, so fine, we'll just ignore the analysis error.
+        return values  # type: ignore
     return tuple(values)
 
 
diff --git a/hypothesis-python/src/hypothesis/strategies/_internal/core.py b/hypothesis-python/src/hypothesis/strategies/_internal/core.py
@@ -330,15 +330,12 @@ def lists(
         # Note that lazy strategies automatically unwrap when passed to a defines_strategy
         # function.
         tuple_suffixes = None
-        # the type: ignores in the TupleStrategy and IntegersStrategy cases are
-        # for a mypy bug, which incorrectly narrows `elements` to Never.
-        # https://github.com/python/mypy/issues/16494
         if (
             # We're generating a list of tuples unique by the first element, perhaps
             # via st.dictionaries(), and this will be more efficient if we rearrange
             # our strategy somewhat to draw the first element then draw add the rest.
             isinstance(elements, TupleStrategy)
-            and len(elements.element_strategies) >= 1  # type: ignore
+            and len(elements.element_strategies) >= 1
             and len(unique_by) == 1
             and (
                 # Introspection for either `itemgetter(0)`, or `lambda x: x[0]`
@@ -356,22 +353,24 @@ def lists(
             )
         ):
             unique_by = (identity,)
-            tuple_suffixes = TupleStrategy(elements.element_strategies[1:])  # type: ignore
-            elements = elements.element_strategies[0]  # type: ignore
+            tuple_suffixes = TupleStrategy(elements.element_strategies[1:])
+            elements = elements.element_strategies[0]
 
         # UniqueSampledListStrategy offers a substantial performance improvement for
         # unique arrays with few possible elements, e.g. of eight-bit integer types.
         if (
             isinstance(elements, IntegersStrategy)
-            and elements.start is not None  # type: ignore
-            and elements.end is not None  # type: ignore
-            and (elements.end - elements.start) <= 255  # type: ignore
+            and elements.start is not None
+            and elements.end is not None
+            and (elements.end - elements.start) <= 255
         ):
             elements = SampledFromStrategy(
                 sorted(range(elements.start, elements.end + 1), key=abs)  # type: ignore
-                if elements.end < 0 or elements.start > 0  # type: ignore
-                else list(range(elements.end + 1))  # type: ignore
-                + list(range(-1, elements.start - 1, -1))  # type: ignore
+                if elements.end < 0 or elements.start > 0
+                else (
+                    list(range(elements.end + 1))
+                    + list(range(-1, elements.start - 1, -1))
+                )
             )
 
         if isinstance(elements, SampledFromStrategy):
diff --git a/hypothesis-python/src/hypothesis/strategies/_internal/types.py b/hypothesis-python/src/hypothesis/strategies/_internal/types.py
@@ -949,25 +949,25 @@ def resolve_Iterator(thing):
     return st.iterables(st.from_type(thing.__args__[0]))
 
 
-@register(typing.Counter, st.builds(collections.Counter))
+@register(collections.Counter, st.builds(collections.Counter))
 def resolve_Counter(thing):
     return st.dictionaries(
         keys=st.from_type(thing.__args__[0]),
         values=st.integers(),
     ).map(collections.Counter)
 
 
-@register(typing.Deque, st.builds(collections.deque))
+@register(collections.deque, st.builds(collections.deque))
 def resolve_deque(thing):
     return st.lists(st.from_type(thing.__args__[0])).map(collections.deque)
 
 
-@register(typing.ChainMap, st.builds(dict).map(collections.ChainMap))
+@register(collections.ChainMap, st.builds(dict).map(collections.ChainMap))
 def resolve_ChainMap(thing):
     return resolve_Dict(thing).map(collections.ChainMap)
 
 
-@register(typing.OrderedDict, st.builds(dict).map(collections.OrderedDict))
+@register(collections.OrderedDict, st.builds(dict).map(collections.OrderedDict))
 def resolve_OrderedDict(thing):
     return resolve_Dict(thing).map(collections.OrderedDict)
 
diff --git a/hypothesis-python/src/hypothesis/vendor/tlds-alpha-by-domain.txt b/hypothesis-python/src/hypothesis/vendor/tlds-alpha-by-domain.txt
@@ -1,4 +1,4 @@
-# Version 2025030100, Last Updated Sat Mar  1 07:07:02 2025 UTC
+# Version 2025062100, Last Updated Sat Jun 21 07:07:01 2025 UTC
 AAA
 AARP
 ABB
@@ -118,7 +118,6 @@ BE
 BEATS
 BEAUTY
 BEER
-BENTLEY
 BERLIN
 BEST
 BESTBUY
@@ -658,7 +657,6 @@ LA
 LACAIXA
 LAMBORGHINI
 LAMER
-LANCASTER
 LAND
 LANDROVER
 LANXESS
@@ -914,7 +912,6 @@ POLITIE
 PORN
 POST
 PR
-PRAMERICA
 PRAXI
 PRESS
 PRIME
diff --git a/hypothesis-python/tests/common/debug.py b/hypothesis-python/tests/common/debug.py
@@ -13,14 +13,20 @@
 from hypothesis import HealthCheck, Phase, Verbosity, given, settings as Settings
 from hypothesis._settings import local_settings
 from hypothesis.control import _current_build_context
-from hypothesis.errors import Found, NoSuchExample, Unsatisfiable
+from hypothesis.errors import NoSuchExample, Unsatisfiable
 from hypothesis.internal.reflection import get_pretty_function_description
 
 from tests.common.utils import no_shrink
 
 TIME_INCREMENT = 0.00001
 
 
+# don't use hypothesis.errors.Found, which inherits from HypothesisException
+# and therefore has weird semantics around e.g. backend="crosshair".
+class Found(Exception):
+    pass
+
+
 def minimal(definition, condition=lambda x: True, settings=None):
     from tests.conftest import in_shrinking_benchmark
 
diff --git a/hypothesis-python/tests/cover/test_lookup.py b/hypothesis-python/tests/cover/test_lookup.py
@@ -54,6 +54,9 @@
 )
 from tests.common.utils import fails_with, temp_registered
 
+# we'll continue testing the typing variants until their removal from the stdlib
+# ruff: noqa: UP006, UP035
+
 sentinel = object()
 BUILTIN_TYPES = tuple(
     v
diff --git a/hypothesis-python/tests/cover/test_type_lookup.py b/hypothesis-python/tests/cover/test_type_lookup.py
@@ -35,6 +35,9 @@
 )
 from tests.common.utils import Why, fails_with, temp_registered, xfail_on_crosshair
 
+# we'll continue testing the typing variants until their removal from the stdlib
+# ruff: noqa: UP006, UP035
+
 types_with_core_strat = {
     type_
     for type_, strat in _global_type_lookup.items()
diff --git a/hypothesis-python/tests/cover/test_validation.py b/hypothesis-python/tests/cover/test_validation.py
@@ -172,13 +172,13 @@ def test_recursion_validates_recursive_step():
 
 @fails_with(InvalidArgument)
 @given(x=integers())
-def test_stuff_keyword(x=1):
+def test_stuff_keyword(x=1):  # noqa: PT028
     pass
 
 
 @fails_with(InvalidArgument)
 @given(integers())
-def test_stuff_positional(x=1):
+def test_stuff_positional(x=1):  # noqa: PT028
     pass
 
 
diff --git a/hypothesis-python/tests/nocover/test_simple_numbers.py b/hypothesis-python/tests/nocover/test_simple_numbers.py
@@ -118,7 +118,7 @@ def test_can_minimal_infinite_negative_float():
 
 
 # Flakey under CrossHair; see https://github.com/pschanely/hypothesis-crosshair/issues/28
-@xfail_on_crosshair(Why.undiscovered)
+@xfail_on_crosshair(Why.undiscovered, strict=False)
 def test_can_minimal_float_on_boundary_of_representable():
     minimal(floats(), lambda x: x + 1 == x and not math.isinf(x))
 
diff --git a/hypothesis-python/tests/nocover/test_type_lookup_forward_ref.py b/hypothesis-python/tests/nocover/test_type_lookup_forward_ref.py
@@ -17,6 +17,9 @@
 
 from tests.common import utils
 
+# error only occurs with typing variants
+# ruff: noqa: UP006, UP035
+
 # Mutually-recursive types
 # See https://github.com/HypothesisWorks/hypothesis/issues/2722
 
diff --git a/hypothesis-python/tests/typing_extensions/test_backported_types.py b/hypothesis-python/tests/typing_extensions/test_backported_types.py
@@ -37,6 +37,9 @@
     find_any,
 )
 
+# we'll continue testing the typing variants until their removal from the stdlib
+# ruff: noqa: UP035, UP006
+
 # See also nocover/test_type_lookup.py
 
 
@@ -96,7 +99,7 @@ def test_resolves_NewType():
     find_any(from_type(uni), lambda x: isinstance(x, type(None)))
 
 
-@given(from_type(DefaultDict[int, int]))
+@given(from_type(DefaultDict[int, int]) | from_type(collections.defaultdict[int, int]))
 def test_defaultdict(ex):
     assert isinstance(ex, collections.defaultdict)
     assume(ex)
diff --git a/hypothesis-python/tox.ini b/hypothesis-python/tox.ini
@@ -173,8 +173,8 @@ setenv=
     nocontrib: DJANGO_SETTINGS_MODULE=tests.django.toys.settings.settings_no_contrib
 deps=
     -r../requirements/test.txt
-    django42: django==4.2.22
-    django51: django==5.1.8
+    django42: django==4.2.23
+    django51: django==5.1.11
     django52: django==5.2.3
     django-nocontrib: django==5.2.3
 commands =
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements/coverage.txt b/requirements/coverage.txt
diff --git a/requirements/crosshair.txt b/requirements/crosshair.txt
diff --git a/requirements/tools.txt b/requirements/tools.txt
diff --git a/tooling/src/hypothesistooling/__main__.py b/tooling/src/hypothesistooling/__main__.py
diff --git a/tooling/src/hypothesistooling/projects/hypothesispython.py b/tooling/src/hypothesistooling/projects/hypothesispython.py
diff --git a/whole_repo_tests/test_documentation.py b/whole_repo_tests/test_documentation.py
