some fixes?

Author: Liam-DeVoe

.github/workflows/main.yml

@@ -252,7 +252,7 @@ jobs:
       # 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.29.0
-      PYODIDE_BUILD_VERSION: 0.30.9
+      PYODIDE_BUILD_VERSION: 0.31.1
       PYTHON_VERSION: 3.13.2
     steps:
     - uses: actions/checkout@v3

build.sh

@@ -34,7 +34,7 @@ fi
 TOOL_REQUIREMENTS="$ROOT/requirements/tools.txt"
 
 # append PYTHON_VERSION to bust caches when we upgrade versions
-TOOL_HASH=$((cat "$TOOL_REQUIREMENTS" && echo "$PYTHON_VERSION") | "$PYTHON" "$SCRIPTS/tool-hash.py")
+TOOL_HASH=$( (cat "$TOOL_REQUIREMENTS" && echo "$PYTHON_VERSION") | "$PYTHON" "$SCRIPTS/tool-hash.py")
 
 TOOL_VIRTUALENV="$VIRTUALENVS/build-$TOOL_HASH"
 TOOL_PYTHON="$TOOL_VIRTUALENV/bin/python"

hypothesis-python/RELEASE.rst

@@ -1,3 +1,3 @@
 RELEASE_TYPE: patch
 
-Removes some internal ``# type: ignore`` comments as a result of bumping CI packages.
+Update some internal type hints.

hypothesis-python/src/hypothesis/database.py

@@ -134,16 +134,26 @@ def __call__(self, *args: Any, **kwargs: Any) -> "ExampleDatabase":
 # downstream ExampleDatabase subclasses too.
 if "sphinx" in sys.modules:
     try:
+        from types import ModuleType
+
         import sphinx.ext.autodoc
 
         signature = "hypothesis.database._EDMeta.__call__"
+        _module: ModuleType  # make mypy happy
+
+        # _METACLASS_CALL_BLACKLIST moved in newer sphinx versions
+        try:
+            import sphinx.ext.autodoc._dynamic._signatures as _module
+        except ImportError:
+            _module = sphinx.ext.autodoc
+
         # _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}
+        if isinstance(_module._METACLASS_CALL_BLACKLIST, frozenset):
+            _module._METACLASS_CALL_BLACKLIST = (  # type: ignore
+                _module._METACLASS_CALL_BLACKLIST | {signature}
             )
         else:
-            sphinx.ext.autodoc._METACLASS_CALL_BLACKLIST.append(signature)
+            _module._METACLASS_CALL_BLACKLIST.append(signature)
     except Exception:
         pass
 

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

@@ -27,10 +27,10 @@
     get_args,
 )
 
-try:
-    BaseExceptionGroup = BaseExceptionGroup
-    ExceptionGroup = ExceptionGroup  # pragma: no cover
-except NameError:
+if sys.version_info >= (3, 11):
+    BaseExceptionGroup = BaseExceptionGroup  # noqa: F821
+    ExceptionGroup = ExceptionGroup  # noqa: F821
+else:
     from exceptiongroup import (
         BaseExceptionGroup as BaseExceptionGroup,
         ExceptionGroup as ExceptionGroup,

hypothesis-python/src/hypothesis/strategies/_internal/core.py

@@ -2499,6 +2499,7 @@ def register_type_strategy(
         )
     if (
         "pydantic.generics" in sys.modules
+        and isinstance(custom_type, type)
         and issubclass(custom_type, sys.modules["pydantic.generics"].GenericModel)
         and not re.search(r"[A-Za-z_]+\[.+\]", repr(custom_type))
         and callable(strategy)

hypothesis-python/src/hypothesis/strategies/_internal/types.py

@@ -717,8 +717,13 @@ def _networks(bits):
 # exposed for it, and NotImplemented itself is typed as Any so that it can be
 # returned without being listed in a function signature:
 # https://github.com/python/mypy/issues/6710#issuecomment-485580032
+if sys.version_info < (3, 12):
+    _RegistryKeyT: typing.TypeAlias = type
+else:  # pragma: no cover
+    _RegistryKeyT: typing.TypeAlias = type | typing.TypeAliasType
+
 _global_type_lookup: dict[
-    type, st.SearchStrategy | typing.Callable[[type], st.SearchStrategy]
+    _RegistryKeyT, st.SearchStrategy | typing.Callable[[type], st.SearchStrategy]
 ] = {
     type(None): st.none(),
     bool: st.booleans(),

hypothesis-python/tests/conjecture/test_provider.py

@@ -795,8 +795,8 @@ def test_provider_conformance(provider):
         # emitted by available_timezones() from st.timezone_keys() on 3.11+
         # with tzdata installed. see https://github.com/python/cpython/issues/137841.
         # Once cpython fixes this, we can remove this.
-        if sys.version_info >= (3, 10):
-            warnings.simplefilter("ignore", EncodingWarning)  # noqa: F821
+        if sys.version_info >= (3, 11):
+            warnings.simplefilter("ignore", EncodingWarning)
         run_conformance_test(
             provider, settings=settings(max_examples=20, stateful_step_count=20)
         )

requirements/tools.in

@@ -29,5 +29,6 @@ typing-extensions
 watchdog # for typing
 build
 sortedcontainers-stubs # for typing
+attrs # for typing
 tomli # for update_pyproject_toml
 -r test.in

requirements/tools.txt

@@ -14,6 +14,8 @@ asgiref==3.11.0
     # via django
 asttokens==3.0.1
     # via stack-data
+attrs==25.4.0
+    # via -r requirements/tools.in
 autoflake==2.3.1
     # via shed
 babel==2.17.0
@@ -60,7 +62,7 @@ decorator==5.2.1
     # via ipython
 distlib==0.4.0
     # via virtualenv
-django==6.0.1
+django==5.2.10
     # via -r requirements/tools.in
 docutils==0.22.4
     # via
@@ -268,7 +270,7 @@ sortedcontainers-stubs==2.4.3
     # via -r requirements/tools.in
 soupsieve==2.8.1
     # via beautifulsoup4
-sphinx==9.1.0
+sphinx==9.0.4
     # via
     #   -r requirements/tools.in
     #   furo