get tests passing

Zac-HD · Zac-HD · commit 7f80a9990738 · 2025-12-22T14:57:17.000-08:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -90,7 +90,7 @@ jobs:
           - check-quality
           - check-pytest62
           - check-pytest62
-          - check-django51
+          - check-django60
           - check-django42
           - check-pandas22
           - check-pandas21
diff --git a/hypothesis-python/docs/changelog.rst b/hypothesis-python/docs/changelog.rst
@@ -2744,7 +2744,7 @@ This patch fixes a significant slowdown when using the :func:`~hypothesis.statef
 6.100.2 - 2024-04-28
 --------------------
 
-Explicitly cast :obj:`numpy.finfo.smallest_normal` to builtin `float` in
+Explicitly cast :obj:`numpy.finfo.smallest_normal <numpy.finfo>` to builtin `float` in
 preparation for the :pypi:`numpy==2.0 <numpy>` release (:issue:`3950`)
 
 .. _v6.100.1:
diff --git a/hypothesis-python/src/hypothesis/strategies/_internal/datetime.py b/hypothesis-python/src/hypothesis/strategies/_internal/datetime.py
@@ -10,6 +10,7 @@
 
 import datetime as dt
 import operator as op
+import warnings
 import zoneinfo
 from calendar import monthrange
 from functools import cache, partial
@@ -420,7 +421,14 @@ def timezone_keys(
     # check_type(bool, allow_deprecated, "allow_deprecated")
     check_type(bool, allow_prefix, "allow_prefix")
 
-    available_timezones = ("UTC", *sorted(zoneinfo.available_timezones()))
+    with warnings.catch_warnings():
+        try:
+            warnings.simplefilter("ignore", EncodingWarning)
+        except NameError:
+            pass
+        # On Python 3.12 (and others?), `available_timezones()` opens files
+        # without specifying an encoding - which our selftests make an error.
+        available_timezones = ("UTC", *sorted(zoneinfo.available_timezones()))
 
     # TODO: filter out alias and deprecated names if disallowed
 
diff --git a/hypothesis-python/tests/crosshair/test_crosshair.py b/hypothesis-python/tests/crosshair/test_crosshair.py
@@ -28,7 +28,14 @@ def test_crosshair_works_for_all_verbosities(verbosity):
     # check that we aren't realizing symbolics early in debug prints and killing
     # test effectiveness.
     @given(st.integers())
-    @settings(backend="crosshair", deadline=1000, verbosity=verbosity, database=None)
+    @settings(
+        backend="crosshair",
+        deadline=1000,
+        verbosity=verbosity,
+        derandomize=True,
+        max_examples=1000,
+        phases=[Phase.generate],
+    )
     def f(n):
         assert n != 123456
 
@@ -40,7 +47,13 @@ def f(n):
 def test_crosshair_works_for_all_verbosities_data(verbosity):
     # data draws have their own print path
     @given(st.data())
-    @settings(backend="crosshair", verbosity=verbosity, database=None)
+    @settings(
+        backend="crosshair",
+        verbosity=verbosity,
+        derandomize=True,
+        max_examples=1000,
+        phases=[Phase.generate],
+    )
     def f(data):
         n = data.draw(st.integers())
         assert n != 123456
diff --git a/hypothesis-python/tests/nocover/test_recursive.py b/hypothesis-python/tests/nocover/test_recursive.py
@@ -163,6 +163,7 @@ def test_self_ref_regression(_):
     pass
 
 
+@pytest.mark.skipif(sys.version_info >= (3, 14), reason="gc changes")
 @xfail_if_gil_disabled
 @flaky(min_passes=1, max_runs=2)
 def test_gc_hooks_do_not_cause_unraisable_recursionerror(testdir):
diff --git a/hypothesis-python/tox.ini b/hypothesis-python/tox.ini
@@ -182,17 +182,17 @@ commands =
     niche: bash scripts/other-tests.sh
     custom: python -bb -X dev -m pytest {posargs}
 
-[testenv:django{42,51,52,-nocontrib}]
+[testenv:django{42,52,60,-nocontrib}]
 setenv=
     PYTHONWARNDEFAULTENCODING=1
     DJANGO_SETTINGS_MODULE=tests.django.toys.settings.settings
     nocontrib: DJANGO_SETTINGS_MODULE=tests.django.toys.settings.settings_no_contrib
 deps=
     -r../requirements/test.txt
     django42: django==4.2.27
-    django51: django==5.1.14
     django52: django==5.2.9
-    django-nocontrib: django==5.2.9
+    django60: django==6.0.0
+    django-nocontrib: django==6.0.0
 commands =
     python -bb -X dev -m tests.django.manage test tests.django {posargs}
 
diff --git a/tooling/src/hypothesistooling/__main__.py b/tooling/src/hypothesistooling/__main__.py
@@ -687,10 +687,11 @@ def standard_tox_task(name, py=ci_version):
 # standard_tox_task("py310-pytest46", py="3.10")
 standard_tox_task("pytest62")
 
+dj_version = max(ci_version, "3.12")
 for n in DJANGO_VERSIONS:
-    standard_tox_task(f"django{n.replace('.', '')}")
+    standard_tox_task(f"django{n.replace('.', '')}", py=dj_version)
 # we also test no-contrib on the latest django version
-standard_tox_task("django-nocontrib")
+standard_tox_task("django-nocontrib", py=dj_version)
 
 for n in [13, 14, 15, 20, 21, 22]:
     standard_tox_task(f"pandas{n}")
