Merge branch 'master' into crosshair-event

Author: Liam-DeVoe

.github/workflows/main.yml

@@ -143,7 +143,7 @@ jobs:
         export TASK=${{ matrix.task }}
         if [[ $TASK == check-crosshair-custom-* ]]; then
           GROUP="${TASK#check-crosshair-custom-}"
-          ./build.sh check-crosshair-custom -- -n auto $(cd hypothesis-python && echo tests/$GROUP | xargs -n1 echo | grep -v "_py312" | xargs)
+          ./build.sh check-crosshair-custom -- -n auto $(cd hypothesis-python && echo tests/$GROUP | xargs -n1 echo | grep -Ev "_py312|_py314" | xargs)
         else
           ./build.sh
         fi
@@ -279,7 +279,7 @@ jobs:
           source .venv-pyodide/bin/activate
           # pyodide can't run multiple processes internally, so parallelize explicitly over
           # discovered test files instead (20 at a time)
-          TEST_FILES=$(ls hypothesis-python/tests/cover/test*.py)
+          TEST_FILES=$(ls hypothesis-python/tests/cover/test*.py | grep -v "_py314")
           echo "test files: $TEST_FILES"
           parallel --max-procs 100% --max-args 20 --keep-order --line-buffer \
             python -m pytest -p no:cacheprovider <<< $TEST_FILES

hypothesis-python/docs/changelog.rst

@@ -3,7 +3,7 @@ Changelog
 =========
 
 This is a record of all past Hypothesis releases and what went into them,
-in reverse chronological order. All previous releases should still be available
+in reverse chronological order. All previous releases are still available
 :pypi:`on PyPI <hypothesis>`.
 
 
@@ -18,6 +18,22 @@ Hypothesis 6.x
 
     .. include:: ../RELEASE.rst
 
+.. _v6.138.1:
+
+--------------------
+6.138.1 - 2025-08-15
+--------------------
+
+Internal refactoring and cleanup. As a result, ``hypothesis[black]`` now requires ``black>=20.8b0`` instead of the previous ``black>=19.10b0``.
+
+.. _v6.138.0:
+
+--------------------
+6.138.0 - 2025-08-13
+--------------------
+
+On Python 3.14, |memoryview| is newly generic. This release adds the ability for |st.from_type| to resolve generic |memoryview| types on 3.14, like ``st.from_type(memoryview[CustomBufferClass])`` . ``CustomBufferClass`` must implement ``__buffer__``, as expected by |memoryview|.
+
 .. _v6.137.3:
 
 --------------------

hypothesis-python/docs/prolog.rst

@@ -181,6 +181,7 @@
 .. |bytes| replace:: :obj:`python:bytes`
 .. |float| replace:: :obj:`python:float`
 .. |assert| replace:: :keyword:`python:assert`
+.. |memoryview| replace:: :class:`python:memoryview`
 .. |dataclasses| replace:: :mod:`python:dataclasses`
 .. |random.random| replace:: :class:`python:random.Random`
 .. |random.Random| replace:: :class:`python:random.Random`

hypothesis-python/pyproject.toml

@@ -100,9 +100,9 @@ documentation = "https://hypothesis.readthedocs.io"
 issues = "https://github.com/HypothesisWorks/hypothesis/issues"
 
 [project.optional-dependencies]
-cli = ["click>=7.0", "black>=19.10b0", "rich>=9.0.0"]
+cli = ["click>=7.0", "black>=20.8b0", "rich>=9.0.0"]
 codemods = ["libcst>=0.3.16"]
-ghostwriter = ["black>=19.10b0"]
+ghostwriter = ["black>=20.8b0"]
 pytz = ["pytz>=2014.1"]
 dateutil = ["python-dateutil>=1.4"]
 lark = ["lark>=0.10.1"]  # probably still works with old `lark-parser` too
@@ -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.93", "django>=4.2", "dpcontracts>=0.4", "hypothesis-crosshair>=0.0.25", "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>=20.8b0", "click>=7.0", "crosshair-tool>=0.0.93", "django>=4.2", "dpcontracts>=0.4", "hypothesis-crosshair>=0.0.25", "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__"}

hypothesis-python/src/hypothesis/core.py

@@ -684,15 +684,16 @@ def execute_explicit_examples(state, wrapped_test, arguments, kwargs, original_s
                     )
 
                 empty_data.freeze()
-                tc = make_testcase(
-                    run_start=state._start_timestamp,
-                    property=state.test_identifier,
-                    data=empty_data,
-                    how_generated="explicit example",
-                    representation=state._string_repr,
-                    timing=state._timing_features,
-                )
-                deliver_observation(tc)
+                if observability_enabled():
+                    tc = make_testcase(
+                        run_start=state._start_timestamp,
+                        property=state.test_identifier,
+                        data=empty_data,
+                        how_generated="explicit example",
+                        representation=state._string_repr,
+                        timing=state._timing_features,
+                    )
+                    deliver_observation(tc)
 
             if fragments_reported:
                 verbose_report(fragments_reported[0].replace("Falsifying", "Trying", 1))
@@ -846,21 +847,23 @@ def execute(data, function):
     return default_executor
 
 
+# This function is a crude solution, a better way of resolving it would probably
+# be to rewrite a bunch of exception handlers to use except*.
+T = TypeVar("T", bound=BaseException)
+
+
+def _flatten_group(excgroup: BaseExceptionGroup[T]) -> list[T]:
+    found_exceptions: list[T] = []
+    for exc in excgroup.exceptions:
+        if isinstance(exc, BaseExceptionGroup):
+            found_exceptions.extend(_flatten_group(exc))
+        else:
+            found_exceptions.append(exc)
+    return found_exceptions
+
+
 @contextlib.contextmanager
 def unwrap_markers_from_group() -> Generator[None, None, None]:
-    # This function is a crude solution, a better way of resolving it would probably
-    # be to rewrite a bunch of exception handlers to use except*.
-    T = TypeVar("T", bound=BaseException)
-
-    def _flatten_group(excgroup: BaseExceptionGroup[T]) -> list[T]:
-        found_exceptions: list[T] = []
-        for exc in excgroup.exceptions:
-            if isinstance(exc, BaseExceptionGroup):
-                found_exceptions.extend(_flatten_group(exc))
-            else:
-                found_exceptions.append(exc)
-        return found_exceptions
-
     try:
         yield
     except BaseExceptionGroup as excgroup:
@@ -1111,8 +1114,8 @@ def run(data: ConjectureData) -> None:
                     add_note(e, msg.format(format_arg))
                 raise
             finally:
-                if parts := getattr(data, "_stateful_repr_parts", None):
-                    self._string_repr = "\n".join(parts)
+                if data._stateful_repr_parts is not None:
+                    self._string_repr = "\n".join(data._stateful_repr_parts)
 
                 if observability_enabled():
                     printer = RepresentationPrinter(context=context)
@@ -1294,7 +1297,7 @@ def _execute_once_for_engine(self, data: ConjectureData) -> None:
                 if trace:  # pragma: no cover
                     # Trace collection is explicitly disabled under coverage.
                     self.explain_traces[interesting_origin].add(frozenset(trace))
-                if interesting_origin[0] == DeadlineExceeded:
+                if interesting_origin.exc_type == DeadlineExceeded:
                     self.failed_due_to_deadline = True
                     self.explain_traces.clear()
                 try:
@@ -1353,6 +1356,7 @@ def _execute_once_for_engine(self, data: ConjectureData) -> None:
                     backend_metadata=data.provider.observe_test_case(),
                 )
                 deliver_observation(tc)
+
                 for msg in data.provider.observe_information_messages(
                     lifetime="test_case"
                 ):
@@ -1538,21 +1542,23 @@ def run_engine(self):
                 raise NotImplementedError("This should be unreachable")
             finally:
                 ran_example.freeze()
-                # log our observability line for the final failing example
-                tc = make_testcase(
-                    run_start=self._start_timestamp,
-                    property=self.test_identifier,
-                    data=ran_example,
-                    how_generated="minimal failing example",
-                    representation=self._string_repr,
-                    arguments=ran_example._observability_args,
-                    timing=self._timing_features,
-                    coverage=None,  # Not recorded when we're replaying the MFE
-                    status="passed" if sys.exc_info()[0] else "failed",
-                    status_reason=str(origin or "unexpected/flaky pass"),
-                    metadata={"traceback": tb},
-                )
-                deliver_observation(tc)
+                if observability_enabled():
+                    # log our observability line for the final failing example
+                    tc = make_testcase(
+                        run_start=self._start_timestamp,
+                        property=self.test_identifier,
+                        data=ran_example,
+                        how_generated="minimal failing example",
+                        representation=self._string_repr,
+                        arguments=ran_example._observability_args,
+                        timing=self._timing_features,
+                        coverage=None,  # Not recorded when we're replaying the MFE
+                        status="passed" if sys.exc_info()[0] else "failed",
+                        status_reason=str(origin or "unexpected/flaky pass"),
+                        metadata={"traceback": tb},
+                    )
+                    deliver_observation(tc)
+
                 # Whether or not replay actually raised the exception again, we want
                 # to print the reproduce_failure decorator for the failing example.
                 if self.settings.print_blob:

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

@@ -241,7 +241,7 @@ def broadcastable_shapes(
             if s < min_side and s != 1:
                 max_dims = n
                 break
-            elif not (min_side <= 1 <= max_side or s <= max_side):
+            if not (min_side <= 1 <= max_side or s <= max_side):
                 max_dims = n
                 break
 
@@ -466,7 +466,7 @@ def mutually_broadcastable_shapes(
             if s < min_side and s != 1:
                 max_dims = n
                 break
-            elif not (min_side <= 1 <= max_side or s <= max_side):
+            if not (min_side <= 1 <= max_side or s <= max_side):
                 max_dims = n
                 break
 

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

@@ -137,7 +137,7 @@ def __call_node_to_example_dec(
             try:
                 pretty = black.format_str(
                     cst.Module([]).code_for_node(via),
-                    mode=black.FileMode(line_length=self.line_length),
+                    mode=black.Mode(line_length=self.line_length),
                 )
             except (ImportError, AttributeError):  # pragma: no cover
                 return None  # See https://github.com/psf/black/pull/4224

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

@@ -426,8 +426,8 @@ def do_draw(self, data):
                     if val in seen:
                         elements.reject("chose an element we've already used")
                         continue
-                    else:
-                        seen.add(val)
+                    seen.add(val)
+
                 result_obj[i] = val
                 assigned.add(i)
                 fill_mask[i] = False

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

@@ -266,10 +266,7 @@ def _strategy_for(param: inspect.Parameter, docstring: str) -> st.SearchStrategy
         if match is None:
             continue
         doc_type = match.group(1)
-        if doc_type.endswith(", optional"):
-            # Convention to describe "argument may be omitted"
-            doc_type = doc_type[: -len(", optional")]
-        doc_type = doc_type.strip("}{")
+        doc_type = doc_type.removesuffix(", optional").strip("}{")
         elements = []
         types = []
         for token in re.split(r",? +or +| *, *", doc_type):
@@ -1083,13 +1080,21 @@ def _make_test(imports: ImportSet, body: str) -> str:
         header += "# TODO: replace st.nothing() with an appropriate strategy\n\n"
     elif nothings >= 1:
         header += "# TODO: replace st.nothing() with appropriate strategies\n\n"
-    return black.format_str(header + body, mode=black.FileMode())
+    return black.format_str(header + body, mode=black.Mode())
 
 
 def _is_probably_ufunc(obj):
     # See https://numpy.org/doc/stable/reference/ufuncs.html - there doesn't seem
     # to be an upstream function to detect this, so we just guess.
-    has_attributes = "nin nout nargs ntypes types identity signature".split()
+    has_attributes = [
+        "nin",
+        "nout",
+        "nargs",
+        "ntypes",
+        "types",
+        "identity",
+        "signature",
+    ]
     return callable(obj) and all(hasattr(obj, name) for name in has_attributes)
 
 

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

@@ -90,7 +90,7 @@ def _try_import(mod_name: str, attr_name: str) -> Any:
     "valid_tuple_axes",
 ]
 
-TIME_RESOLUTIONS = tuple("Y  M  D  h  m  s  ms  us  ns  ps  fs  as".split())
+TIME_RESOLUTIONS = ("Y", "M", "D", "h", "m", "s", "ms", "us", "ns", "ps", "fs", "as")
 
 # See https://github.com/HypothesisWorks/hypothesis/pull/3394 and linked discussion.
 NP_FIXED_UNICODE = tuple(int(x) for x in np.__version__.split(".")[:2]) >= (1, 19)
@@ -349,8 +349,8 @@ def do_draw(self, data):
                     if result[i] in seen:
                         elements.reject()
                         continue
-                    else:
-                        seen.add(result[i])
+                    seen.add(result[i])
+
                 needs_fill[i] = False
             if needs_fill.any():
                 # We didn't fill all of the indices in the early loop, so we