Merge branch 'master' into next2

Author: Liam-DeVoe

hypothesis-python/RELEASE.rst

@@ -18,6 +18,22 @@ Hypothesis 6.x
 
     .. include:: ../RELEASE.rst
 
+.. _v6.138.15:
+
+---------------------
+6.138.15 - 2025-09-08
+---------------------
+
+Refactor some stateful testing internals for easier use by third-party libraries.
+
+.. _v6.138.14:
+
+---------------------
+6.138.14 - 2025-09-02
+---------------------
+
+Patch files written by hypothesis now use a deterministic ordering when multiple |@example| decorators are present.
+
 .. _v6.138.13:
 
 ---------------------

hypothesis-python/docs/changelog.rst

@@ -112,9 +112,9 @@ def get_state_machine_test(state_machine_factory, *, settings=None, _min_steps=0
 
     @settings
     @given(st.data())
-    def run_state_machine(factory, data):
+    def run_state_machine(data):
         cd = data.conjecture_data
-        machine: RuleBasedStateMachine = factory()
+        machine: RuleBasedStateMachine = state_machine_factory()
         check_type(RuleBasedStateMachine, machine, "state_machine_factory()")
         cd.hypothesis_runner = machine
         machine._observability_predicates = cd._observability_predicates  # alias
@@ -254,7 +254,7 @@ def run_state_machine_as_test(state_machine_factory, *, settings=None, _min_step
     state_machine_test = get_state_machine_test(
         state_machine_factory, settings=settings, _min_steps=_min_steps
     )
-    state_machine_test(state_machine_factory)
+    state_machine_test()
 
 
 class StateMachineMeta(type):

hypothesis-python/src/hypothesis/stateful.py

@@ -8,5 +8,5 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-__version_info__ = (6, 138, 13)
+__version_info__ = (6, 138, 15)
 __version__ = ".".join(map(str, __version_info__))

hypothesis-python/src/hypothesis/version.py

@@ -22,7 +22,7 @@
 )
 from hypothesis.internal.compat import WINDOWS
 
-from tests.common.utils import skipif_threading, wait_for
+from tests.common.utils import flaky, skipif_threading, wait_for
 from tests.cover.test_database_backend import _database_conforms_to_listener_api
 
 # e.g.
@@ -180,6 +180,7 @@ def listener(event):
         raise NotImplementedError(f"unknown platform {sys.platform}")
 
 
+@flaky(max_runs=5, min_passes=1)  # time_sleep(0.1) probably isn't enough here
 @skipif_threading  # add_listener is not thread safe because watchdog is not
 def test_database_listener_directory_move(tmp_path):
     db = DirectoryBasedExampleDatabase(tmp_path)

hypothesis-python/tests/watchdog/test_database.py

@@ -175,10 +175,10 @@ setenv=
     nocontrib: DJANGO_SETTINGS_MODULE=tests.django.toys.settings.settings_no_contrib
 deps=
     -r../requirements/test.txt
-    django42: django==4.2.23
-    django51: django==5.1.11
-    django52: django==5.2.5
-    django-nocontrib: django==5.2.5
+    django42: django==4.2.24
+    django51: django==5.1.12
+    django52: django==5.2.6
+    django-nocontrib: django==5.2.6
 commands =
     python -bb -X dev -m tests.django.manage test tests.django {posargs}
 

hypothesis-python/tox.ini

@@ -26,7 +26,7 @@ exceptiongroup==1.3.0 ; python_version < "3.11"
     #   pytest
 execnet==2.1.1
     # via pytest-xdist
-fakeredis==2.31.0
+fakeredis==2.31.1
     # via -r requirements/coverage.in
 iniconfig==2.1.0
     # via pytest
@@ -62,12 +62,12 @@ pyarrow==21.0.0
     # via -r requirements/coverage.in
 pygments==2.19.2
     # via pytest
-pytest==8.4.1
+pytest==8.4.2
     # via
     #   -r requirements/test.in
     #   pytest-cov
     #   pytest-xdist
-pytest-cov==6.2.1
+pytest-cov==6.3.0
     # via -r requirements/coverage.in
 pytest-xdist==3.8.0
     # via -r requirements/test.in

requirements/coverage.txt

@@ -10,7 +10,7 @@ attrs==25.3.0
     #   hypothesis
     #   hypothesis (hypothesis-python/pyproject.toml)
     #   lsprotocol
-cattrs==25.1.1
+cattrs==25.2.0
     # via
     #   lsprotocol
     #   pygls
@@ -26,7 +26,7 @@ exceptiongroup==1.3.0 ; python_version < "3.11"
     #   pytest
 execnet==2.1.1
     # via pytest-xdist
-hypothesis==6.138.8
+hypothesis==6.138.14
     # via hypothesis-crosshair
 hypothesis-crosshair==0.0.25
     # via -r requirements/crosshair.in
@@ -54,7 +54,7 @@ pygls==1.3.1
     # via crosshair-tool
 pygments==2.19.2
     # via pytest
-pytest==8.4.1
+pytest==8.4.2
     # via
     #   -r requirements/test.in
     #   pytest-xdist

requirements/crosshair.txt

@@ -43,7 +43,7 @@ exceptiongroup==1.3.0 ; python_version < "3.11"
     #   trio
 execnet==2.1.1
     # via pytest-xdist
-fakeredis==2.31.0
+fakeredis==2.31.1
     # via -r requirements/coverage.in
 h11==0.16.0
     # via
@@ -57,9 +57,9 @@ hypercorn==0.17.3
     # via hypofuzz
 hyperframe==6.1.0
     # via h2
-hypofuzz==25.8.2
+hypofuzz==25.9.1
     # via -r requirements/fuzzing.in
-hypothesis[cli,watchdog]==6.138.8
+hypothesis[cli,watchdog]==6.138.14
     # via hypofuzz
 idna==3.10
     # via
@@ -113,13 +113,13 @@ pygments==2.19.2
     # via
     #   pytest
     #   rich
-pytest==8.4.1
+pytest==8.4.2
     # via
     #   -r requirements/test.in
     #   hypofuzz
     #   pytest-cov
     #   pytest-xdist
-pytest-cov==6.2.1
+pytest-cov==6.3.0
     # via -r requirements/coverage.in
 pytest-xdist==3.8.0
     # via -r requirements/test.in

requirements/fuzzing.txt

@@ -24,7 +24,7 @@ ptyprocess==0.7.0
     # via pexpect
 pygments==2.19.2
     # via pytest
-pytest==8.4.1
+pytest==8.4.2
     # via
     #   -r requirements/test.in
     #   pytest-xdist