Merge remote-tracking branch 'upstream/master' into more-constant-strings

Author: Liam-DeVoe

.github/workflows/main.yml

@@ -254,7 +254,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.3
-      PYODIDE_BUILD_VERSION: 0.32.0
+      PYODIDE_BUILD_VERSION: 0.34.1
       # pyodide 0.29.0 (latest at time of writing) doesn't yet support 3.14
       PYTHON_VERSION: 3.13.2
     steps:
@@ -278,7 +278,7 @@ jobs:
       run: |
         pip install --upgrade setuptools pip wheel build
         python -m build --wheel hypothesis-python --outdir dist/
-        pip download --dest=dist/ hypothesis-python/ pytest tzdata  # fetch all the wheels
+        pip download --dest=dist/ hypothesis-python/ pytest tzdata syrupy  # fetch all the wheels
          rm dist/packaging-*.whl  # fails with `invalid metadata entry 'name'`
          pyodide venv .venv-pyodide
         source .venv-pyodide/bin/activate

build.sh

@@ -19,7 +19,7 @@ SCRIPTS="$ROOT/tooling/scripts"
 # shellcheck source=tooling/scripts/common.sh
 source "$SCRIPTS/common.sh"
 
-PYTHON_VERSION="3.14.3"
+PYTHON_VERSION="3.14.4"
 
 if [ -n "${GITHUB_ACTIONS-}" ] || [ -n "${CODESPACES-}" ] || [ -n "${CLAUDECODE-}" ] ; then
     # We're on GitHub Actions, Codespaces, or Claude Code and already have a suitable Python

hypothesis-python/docs/changelog.rst

@@ -18,6 +18,53 @@ Hypothesis 6.x
 
     .. include:: ../RELEASE.rst
 
+.. _v6.151.13:
+
+---------------------
+6.151.13 - 2026-04-13
+---------------------
+
+This patch removes some newly unnecessary ``# type: ignore`` comments.
+
+.. _v6.151.12:
+
+---------------------
+6.151.12 - 2026-04-08
+---------------------
+
+This release improves |Phase.explain| output by excluding pytest-related :pypi:`syrupy` files as a possible source of variation.
+
+.. _v6.151.11:
+
+---------------------
+6.151.11 - 2026-04-05
+---------------------
+
+This patch improves printing of primitive values generated from complex
+strategies, particularly for :func:`~hypothesis.strategies.from_regex`.
+Previously, these would often be printed as function calls desctribing
+how to construct them. Now they will always be printed as a literal value.
+
+.. _v6.151.10:
+
+---------------------
+6.151.10 - 2026-03-29
+---------------------
+
+When shrinking takes more than five minutes, Hypothesis now prints the
+``@seed`` decorator alongside the slow-shrinking warning so you can
+reproduce the failure.
+
+Thanks to Ian Hunt-Isaak for this contribution!
+
+.. _v6.151.9:
+
+--------------------
+6.151.9 - 2026-02-16
+--------------------
+
+Remove some old unused code.
+
 .. _v6.151.8:
 
 --------------------

hypothesis-python/docs/community.rst

@@ -7,7 +7,7 @@ The Hypothesis community is full of excellent people who can answer your questio
 * You can post a question on Stack Overflow using the `python-hypothesis <https://stackoverflow.com/questions/tagged/python-hypothesis>`__ tag.
 * We also have `a mailing list <https://groups.google.com/forum/#!forum/hypothesis-users>`_. Feel free to use it to ask for help, provide feedback, or discuss anything remotely Hypothesis related at all.
 
-Note that the :gh-file:`Hypothesis code of conduct <CODE_OF_CONDUCT.rst>` applies in all Hypothesis community spaces!
+Note that the :gh-file:`Hypothesis code of conduct <.github/CODE_OF_CONDUCT.rst>` applies in all Hypothesis community spaces!
 
 If you would like to cite Hypothesis, please consider :gh-file:`our suggested citation <CITATION.cff>`.
 

hypothesis-python/docs/conf.py

@@ -173,7 +173,7 @@ def process_signature(app, what, name, obj, options, signature, return_annotatio
 intersphinx_mapping = {
     "python": ("https://docs.python.org/3/", None),
     "numpy": ("https://numpy.org/doc/stable/", None),
-    "pandas": ("https://pandas.pydata.org/pandas-docs/stable/", None),
+    "pandas": ("https://pandas.pydata.org/docs/", None),
     "pytest": ("https://docs.pytest.org/en/stable/", None),
     "django": (
         "http://docs.djangoproject.com/en/stable/",

hypothesis-python/pyproject.toml

@@ -116,15 +116,15 @@ dpcontracts = ["dpcontracts>=0.4"]
 redis = ["redis>=3.0.0"]
 crosshair = ["hypothesis-crosshair>=0.0.27", "crosshair-tool>=0.0.102"]
 # zoneinfo is an odd one: every dependency is platform-conditional.
-zoneinfo = ["tzdata>=2025.3; sys_platform == 'win32' or sys_platform == 'emscripten'"]
+zoneinfo = ["tzdata>=2026.1; sys_platform == 'win32' or sys_platform == 'emscripten'"]
 # We only support Django versions with upstream support - see
 # https://www.djangoproject.com/download/#supported-versions
 # We also leave the choice of timezone library to the user, since it
 # might be zoneinfo or pytz depending on version and configuration.
 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>=20.8b0", "click>=7.0", "crosshair-tool>=0.0.102", "django>=4.2", "dpcontracts>=0.4", "hypothesis-crosshair>=0.0.27", "lark>=0.10.1", "libcst>=0.3.16", "numpy>=1.21.6", "pandas>=1.1", "pytest>=4.6", "python-dateutil>=1.4", "pytz>=2014.1", "redis>=3.0.0", "rich>=9.0.0", "tzdata>=2025.3; sys_platform == 'win32' or sys_platform == 'emscripten'", "watchdog>=4.0.0"]
+all = ["black>=20.8b0", "click>=7.0", "crosshair-tool>=0.0.102", "django>=4.2", "dpcontracts>=0.4", "hypothesis-crosshair>=0.0.27", "lark>=0.10.1", "libcst>=0.3.16", "numpy>=1.21.6", "pandas>=1.1", "pytest>=4.6", "python-dateutil>=1.4", "pytz>=2014.1", "redis>=3.0.0", "rich>=9.0.0", "tzdata>=2026.1; 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

@@ -2217,19 +2217,37 @@ def wrapped_test(*arguments, **kwargs):
                     generated_seed = (
                         wrapped_test._hypothesis_internal_use_generated_seed
                     )
+                    assert state._runner is not None
+                    stopped_because_slow_shrinking = (
+                        state._runner.statistics.get("stopped-because")
+                        == "shrinking was very slow"
+                    )
                     with local_settings(settings):
-                        if not (state.failed_normally or generated_seed is None):
-                            if running_under_pytest:
-                                report(
-                                    f"You can add @seed({generated_seed}) to this test or "
-                                    f"run pytest with --hypothesis-seed={generated_seed} "
-                                    "to reproduce this failure."
+                        if generated_seed is not None and (
+                            not state.failed_normally or stopped_because_slow_shrinking
+                        ):
+                            pytest_extra_msg = (
+                                (
+                                    ", or by running pytest with "
+                                    f"--hypothesis-seed={generated_seed}"
+                                )
+                                if running_under_pytest
+                                else ""
+                            )
+                            if stopped_because_slow_shrinking:
+                                msg = (
+                                    "\nThis test function exited early because"
+                                    " it took too long to shrink. If desired for debugging, "
+                                    f"you can reproduce this by adding @seed({generated_seed}) "
+                                    f"to this test{pytest_extra_msg}."
                                 )
                             else:
-                                report(
-                                    f"You can add @seed({generated_seed}) to this test to "
-                                    "reproduce this failure."
+                                msg = (
+                                    "You can reproduce this failure by adding "
+                                    f"@seed({generated_seed}) to this test"
+                                    f"{pytest_extra_msg}."
                                 )
+                            report(msg)
                         # The dance here is to avoid showing users long tracebacks
                         # full of Hypothesis internals they don't care about.
                         # We have to do this inline, to avoid adding another