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

Update pinned dependencies

Author: Zac-HD

.github/workflows/main.yml

@@ -49,6 +49,9 @@ jobs:
           - check-py313-cover
           - check-py313-nocover
           - check-py313-niche
+          # - check-py314-cover
+          # - check-py314-nocover
+          # - check-py314-niche
           - check-quality
           ## Skip all the (inactive/old) Rust and Ruby tests pending fixes
           # - lint-ruby
@@ -247,7 +250,7 @@ jobs:
       - name: Run tests
         run: |
           source .venv-pyodide/bin/activate
-          python -m pytest hypothesis-python/tests/cover
+          python -m pytest -p no:cacheprovider hypothesis-python/tests/cover
 
   deploy:
     if: "github.event_name == 'push' && github.repository == 'HypothesisWorks/hypothesis'"

.gitignore

@@ -34,7 +34,7 @@ htmlcov
 build
 dist
 .doctrees/
-.venv/
+.v*/
 
 # encrypted files
 secrets.tar

hypothesis-python/RELEASE.rst

@@ -0,0 +1,4 @@
+RELEASE_TYPE: patch
+
+This patch fixes some introspection errors new in Python 3.11.9 and
+3.13.0b1, for the Ghostwriter and :func:`~hypothesis.strategies.from_type`.

hypothesis-python/setup.py

@@ -60,7 +60,7 @@ def local_file(name):
     "pytest": ["pytest>=4.6"],
     "dpcontracts": ["dpcontracts>=0.4"],
     "redis": ["redis>=3.0.0"],
-    "crosshair": ["hypothesis-crosshair>=0.0.2", "crosshair-tool>=0.0.54"],
+    "crosshair": ["hypothesis-crosshair>=0.0.4", "crosshair-tool>=0.0.54"],
     # 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": [

hypothesis-python/src/hypothesis/extra/ghostwriter.py

@@ -452,54 +452,72 @@ def _guess_strategy_by_argname(name: str) -> st.SearchStrategy:
     return st.nothing()
 
 
+def _get_params_builtin_fn(func: Callable) -> List[inspect.Parameter]:
+    if (
+        isinstance(func, (types.BuiltinFunctionType, types.BuiltinMethodType))
+        and hasattr(func, "__doc__")
+        and isinstance(func.__doc__, str)
+    ):
+        # inspect.signature doesn't work on all builtin functions or methods.
+        # In such cases, we can try to reconstruct simple signatures from the docstring.
+        match = re.match(rf"^{func.__name__}\((.+?)\)", func.__doc__)
+        if match is None:
+            return []
+        args = match.group(1).replace("[", "").replace("]", "")
+        params = []
+        # Even if the signature doesn't contain a /, we assume that arguments
+        # are positional-only until shown otherwise - the / is often omitted.
+        kind: inspect._ParameterKind = inspect.Parameter.POSITIONAL_ONLY
+        for arg in args.split(", "):
+            arg, *_ = arg.partition("=")
+            arg = arg.strip()
+            if arg == "/":
+                kind = inspect.Parameter.POSITIONAL_OR_KEYWORD
+                continue
+            if arg.startswith("*") or arg == "...":
+                kind = inspect.Parameter.KEYWORD_ONLY
+                continue  # we omit *varargs, if there are any
+            if _iskeyword(arg.lstrip("*")) or not arg.lstrip("*").isidentifier():
+                break  # skip all subsequent params if this name is invalid
+            params.append(inspect.Parameter(name=arg, kind=kind))
+        return params
+    return []
+
+
+def _get_params_ufunc(func: Callable) -> List[inspect.Parameter]:
+    if _is_probably_ufunc(func):
+        # `inspect.signature` results vary for ufunc objects, but we can work out
+        # what the required parameters would look like if it was reliable.
+        # Note that we use args named a, b, c... to match the `operator` module,
+        # rather than x1, x2, x3... like the Numpy docs.  Because they're pos-only
+        # this doesn't make a runtime difference, and it's much nicer for use-cases
+        # like `equivalent(numpy.add, operator.add)`.
+        return [
+            inspect.Parameter(name=name, kind=inspect.Parameter.POSITIONAL_ONLY)
+            for name in ascii_lowercase[: func.nin]  # type: ignore
+        ]
+    return []
+
+
 def _get_params(func: Callable) -> Dict[str, inspect.Parameter]:
     """Get non-vararg parameters of `func` as an ordered dict."""
     try:
         params = list(get_signature(func).parameters.values())
     except Exception:
-        if (
-            isinstance(func, (types.BuiltinFunctionType, types.BuiltinMethodType))
-            and hasattr(func, "__doc__")
-            and isinstance(func.__doc__, str)
-        ):
-            # inspect.signature doesn't work on all builtin functions or methods.
-            # In such cases, we can try to reconstruct simple signatures from the docstring.
-            match = re.match(rf"^{func.__name__}\((.+?)\)", func.__doc__)
-            if match is None:
-                raise
-            args = match.group(1).replace("[", "").replace("]", "")
-            params = []
-            # Even if the signature doesn't contain a /, we assume that arguments
-            # are positional-only until shown otherwise - the / is often omitted.
-            kind: inspect._ParameterKind = inspect.Parameter.POSITIONAL_ONLY
-            for arg in args.split(", "):
-                arg, *_ = arg.partition("=")
-                arg = arg.strip()
-                if arg == "/":
-                    kind = inspect.Parameter.POSITIONAL_OR_KEYWORD
-                    continue
-                if arg.startswith("*") or arg == "...":
-                    kind = inspect.Parameter.KEYWORD_ONLY
-                    continue  # we omit *varargs, if there are any
-                if _iskeyword(arg.lstrip("*")) or not arg.lstrip("*").isidentifier():
-                    break  # skip all subsequent params if this name is invalid
-                params.append(inspect.Parameter(name=arg, kind=kind))
-
-        elif _is_probably_ufunc(func):
-            # `inspect.signature` doesn't work on ufunc objects, but we can work out
-            # what the required parameters would look like if it did.
-            # Note that we use args named a, b, c... to match the `operator` module,
-            # rather than x1, x2, x3... like the Numpy docs.  Because they're pos-only
-            # this doesn't make a runtime difference, and it's much nicer for use-cases
-            # like `equivalent(numpy.add, operator.add)`.
-            params = [
-                inspect.Parameter(name=name, kind=inspect.Parameter.POSITIONAL_ONLY)
-                for name in ascii_lowercase[: func.nin]  # type: ignore
-            ]
+        if params := _get_params_ufunc(func):
+            pass
+        elif params := _get_params_builtin_fn(func):
+            pass
         else:
             # If we haven't managed to recover a signature through the tricks above,
             # we're out of ideas and should just re-raise the exception.
             raise
+    else:
+        # If the params we got look like an uninformative placeholder, try fallbacks.
+        P = inspect.Parameter
+        placeholder = [("args", P.VAR_POSITIONAL), ("kwargs", P.VAR_KEYWORD)]
+        if [(p.name, p.kind) for p in params] == placeholder:
+            params = _get_params_ufunc(func) or _get_params_builtin_fn(func) or params
     return _params_to_dict(params)
 
 

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

@@ -388,7 +388,12 @@ def is_generic_type(type_):
     )
 
 
-def _try_import_forward_ref(thing, bound):  # pragma: no cover
+__EVAL_TYPE_TAKES_TYPE_PARAMS = (
+    "type_params" in inspect.signature(typing._eval_type).parameters  # type: ignore
+)
+
+
+def _try_import_forward_ref(thing, bound, *, type_params):  # pragma: no cover
     """
     Tries to import a real bound type from ``TypeVar`` bound to a ``ForwardRef``.
 
@@ -397,7 +402,10 @@ def _try_import_forward_ref(thing, bound):  # pragma: no cover
     because we can only cover each path in a separate python version.
     """
     try:
-        return typing._eval_type(bound, vars(sys.modules[thing.__module__]), None)
+        kw = {"globalns": vars(sys.modules[thing.__module__]), "localns": None}
+        if __EVAL_TYPE_TAKES_TYPE_PARAMS:
+            kw["type_params"] = type_params
+        return typing._eval_type(bound, **kw)
     except (KeyError, AttributeError, NameError):
         # We fallback to `ForwardRef` instance, you can register it as a type as well:
         # >>> from typing import ForwardRef
@@ -1030,7 +1038,9 @@ def resolve_TypeVar(thing):
     if getattr(thing, "__bound__", None) is not None:
         bound = thing.__bound__
         if isinstance(bound, typing.ForwardRef):
-            bound = _try_import_forward_ref(thing, bound)
+            # TODO: on Python 3.13 and later, we should work out what type_params
+            #       could be part of this type, and pass them in here.
+            bound = _try_import_forward_ref(thing, bound, type_params=())
         strat = unwrap_strategies(st.from_type(bound))
         if not isinstance(strat, OneOfStrategy):
             return strat

hypothesis-python/tests/cover/test_interactive_example.py

@@ -101,7 +101,7 @@ def test_selftests_exception_contains_note(pytester):
 
         pytester.makeconftest("from tests.conftest import *")
         result = pytester.runpytest_inprocess(
-            pytester.makepyfile(EXAMPLE_GENERATING_TEST)
+            pytester.makepyfile(EXAMPLE_GENERATING_TEST), "-p", "no:cacheprovider"
         )
         assert "helper methods in tests.common.debug" in "\n".join(result.outlines)
 

hypothesis-python/tests/cover/test_settings.py

@@ -230,13 +230,13 @@ def test_settings_alone():
 """
 
 
-def test_settings_alone(testdir):
-    script = testdir.makepyfile(TEST_SETTINGS_ALONE)
-    result = testdir.runpytest_inprocess(script)
+def test_settings_alone(pytester):
+    # Disable cacheprovider, since we don't need it and it's flaky on pyodide
+    script = pytester.makepyfile(TEST_SETTINGS_ALONE)
+    result = pytester.runpytest_inprocess(script, "-p", "no:cacheprovider")
     out = "\n".join(result.stdout.lines)
-    assert (
-        "Using `@settings` on a test without `@given` is completely pointless." in out
-    )
+    msg = "Using `@settings` on a test without `@given` is completely pointless."
+    assert msg in out
     assert "InvalidArgument" in out
     assert result.ret == 1
 

hypothesis-python/tests/ghostwriter/recorded/magic_builtins.txt

@@ -11,6 +11,11 @@ def test_fuzz_abs(x):
     abs(x)
 
 
+@given(async_iterable=st.nothing())
+def test_fuzz_aiter(async_iterable):
+    aiter(async_iterable)
+
+
 @given(iterable=st.one_of(st.iterables(st.integers()), st.iterables(st.text())))
 def test_fuzz_all(iterable):
     all(iterable)
@@ -147,7 +152,7 @@ def test_fuzz_id(obj):
     id(obj)
 
 
-@given(prompt=st.none())
+@given(prompt=st.just(""))
 def test_fuzz_input(prompt):
     input(prompt)
 

hypothesis-python/tests/ghostwriter/test_expected_output.py

@@ -269,8 +269,8 @@ def sequence_from_collections(items: CollectionsSequence[int]) -> int:
             ("magic_builtins", ghostwriter.magic(builtins)),
             marks=[
                 pytest.mark.skipif(
-                    sys.version_info[:2] not in [(3, 8), (3, 9)],
-                    reason="compile arg new in 3.8, aiter and anext new in 3.10",
+                    sys.version_info[:2] != (3, 10),
+                    reason="often small changes",
                 )
             ],
         ),

requirements/coverage.txt

@@ -16,7 +16,7 @@ click==8.1.7
     # via
     #   -r requirements/coverage.in
     #   black
-coverage[toml]==7.5.0
+coverage[toml]==7.5.1
     # via pytest-cov
 dpcontracts==0.6.0
     # via -r requirements/coverage.in
@@ -26,7 +26,7 @@ exceptiongroup==1.2.1 ; python_version < "3.11"
     #   pytest
 execnet==2.1.1
     # via pytest-xdist
-fakeredis==2.22.0
+fakeredis==2.23.2
     # via -r requirements/coverage.in
 iniconfig==2.0.0
     # via pytest
@@ -51,13 +51,13 @@ pathspec==0.12.1
     # via black
 pexpect==4.9.0
     # via -r requirements/test.in
-platformdirs==4.2.1
+platformdirs==4.2.2
     # via black
 pluggy==1.5.0
     # via pytest
 ptyprocess==0.7.0
     # via pexpect
-pyarrow==16.0.0
+pyarrow==16.1.0
     # via -r requirements/coverage.in
 pytest==8.2.0
     # via
@@ -66,7 +66,7 @@ pytest==8.2.0
     #   pytest-xdist
 pytest-cov @ git+https://github.com/pytest-dev/pytest-cov.git@9757222e2e044361e70125ebdd96e5eb87395983
     # via -r requirements/coverage.in
-pytest-xdist==3.5.0
+pytest-xdist==3.6.1
     # via -r requirements/test.in
 python-dateutil==2.9.0.post0
     # via
@@ -91,9 +91,10 @@ tomli==2.0.1
     #   black
     #   coverage
     #   pytest
-typing-extensions==4.11.0
+typing-extensions==4.12.0rc1
     # via
     #   -r requirements/coverage.in
     #   black
+    #   fakeredis
 tzdata==2024.1
     # via pandas