Update Django versions

Author: Zac-HD

.github/workflows/main.yml

@@ -44,8 +44,8 @@ jobs:
           - lint-conjecture-rust
           - check-nose
           - check-pytest46
+          - check-django40
           - check-django32
-          - check-django31
           - check-django22
           - check-pandas13
           - check-pandas12

hypothesis-python/RELEASE.rst

@@ -0,0 +1,5 @@
+RELEASE_TYPE: minor
+
+This release makes us compatible with :pypi:`Django` 4.0, in particular by adding
+support for use of :mod:`zoneinfo` timezones (though we respect the new
+``USE_DEPRECATED_PYTZ`` setting if you need it).

hypothesis-python/docs/supported.rst

@@ -79,7 +79,7 @@ In terms of what's actually *known* to work:
     and avoid poor interactions with Pytest fixtures.
   * Nose works fine with Hypothesis, and this is tested as part of the CI. ``yield`` based
     tests simply won't work.
-  * Integration with Django's testing requires use of the :ref:`hypothesis-django` package.
+  * Integration with Django's testing requires use of the :ref:`hypothesis-django` extra.
     The issue is that in Django's tests' normal mode of execution it will reset the
     database once per test rather than once per example, which is not what you want.
   * :pypi:`Coverage` works out of the box with Hypothesis; our own test suite has

hypothesis-python/setup.py

@@ -77,7 +77,9 @@ def local_file(name):
     ],
     # We only support Django versions with upstream support - see
     # https://www.djangoproject.com/download/#supported-versions
-    "django": ["pytz>=2014.1", "django>=2.2"],
+    # 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>=2.2"],
 }
 
 extras["all"] = sorted(

hypothesis-python/src/hypothesis/extra/django/_fields.py

@@ -17,6 +17,7 @@
 import string
 from datetime import timedelta
 from decimal import Decimal
+from functools import lru_cache
 from typing import Any, Callable, Dict, Type, TypeVar, Union
 
 import django
@@ -30,7 +31,6 @@
 
 from hypothesis import strategies as st
 from hypothesis.errors import InvalidArgument, ResolutionFailed
-from hypothesis.extra.pytz import timezones
 from hypothesis.internal.validation import check_type
 from hypothesis.provisional import urls
 from hypothesis.strategies import emails
@@ -57,6 +57,18 @@ def inner(field):
     return inner
 
 
+@lru_cache()
+def timezones():
+    # From Django 4.0, the default is to use zoneinfo instead of pytz.
+    assert getattr(django.conf.settings, "USE_TZ", False)
+    if getattr(django.conf.settings, "USE_DEPRECATED_PYTZ", True):
+        from hypothesis.extra.pytz import timezones
+    else:
+        from hypothesis.strategies import timezones
+
+    return timezones()
+
+
 # Mapping of field types, to strategy objects or functions of (type) -> strategy
 _FieldLookUpType = Dict[
     Type[AnyField],

hypothesis-python/tests/django/manage.py

@@ -38,4 +38,11 @@
         warnings.simplefilter("ignore", category=DeprecationWarning)
         from django.core.management import execute_from_command_line
 
-    execute_from_command_line(sys.argv)
+    try:
+        from django.utils.deprecation import RemovedInDjango50Warning
+    except ImportError:
+        RemovedInDjango50Warning = ()
+
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", category=RemovedInDjango50Warning)
+        execute_from_command_line(sys.argv)

hypothesis-python/tests/django/toys/urls.py

@@ -13,8 +13,8 @@
 #
 # END HEADER
 
-from django.conf.urls import include, re_path
 from django.contrib import admin
+from django.urls import include, re_path
 
 patterns, namespace, name = admin.site.urls
 

hypothesis-python/tox.ini

@@ -83,19 +83,18 @@ commands =
 [testenv:django22]
 commands =
     pip install .[pytz]
-    pip install django~=2.2.24
+    pip install django~=2.2.25
     python -m tests.django.manage test tests.django
 
-[testenv:django31]
+[testenv:django32]
 commands =
     pip install .[pytz]
-    pip install django~=3.1.13
+    pip install django~=3.2.10
     python -m tests.django.manage test tests.django
 
-[testenv:django32]
+[testenv:django40]
 commands =
-    pip install .[pytz]
-    pip install django~=3.2.9
+    pip install django~=4.0.0
     python -m tests.django.manage test tests.django
 
 [testenv:nose]

tooling/src/hypothesistooling/__main__.py

@@ -475,7 +475,7 @@ def standard_tox_task(name):
 standard_tox_task("nose")
 standard_tox_task("pytest46")
 
-for n in [22, 31, 32]:
+for n in [22, 32, 40]:
     standard_tox_task(f"django{n}")
 for n in [25, 10, 11, 12, 13]:
     standard_tox_task(f"pandas{n}")