Merge pull request #10 from octoenergy/support-django-v4

Support for Django v4

Author: jamesbeith

pytest.ini

@@ -14,17 +14,9 @@
 filterwarnings =
     error::RuntimeWarning
     error::DeprecationWarning
-    error:django.conf.urls.url\(\) is deprecated:django.utils.deprecation.RemovedInDjango40Warning
     ignore:defusedxml.lxml:DeprecationWarning:zeep
     ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3:DeprecationWarning:(graphene|singledispatch)
-    ignore:The DEFAULT_HASHING_ALGORITHM transitional setting is deprecated:django.utils.deprecation.RemovedInDjango40Warning
     ignore:'(elasticsearch_django|pwa|social_django|wagtail).*' defines default_app_config:django.utils.deprecation.RemovedInDjango41Warning:django
-    # Tracking issues (where available):
-    # - https://github.com/wagtail/wagtail/issues/6924
-    # - https://github.com/flavors/django-graphql-jwt/issues/222
-    ignore:The providing_args argument is deprecated.:django.utils.deprecation.RemovedInDjango40Warning:(wagtail|elasticsearch_django)
-    # - https://github.com/silviolleite/django-pwa/issues/68
-    ignore:django.conf.urls.url\(\) is deprecated:django.utils.deprecation.RemovedInDjango40Warning:(pwa|social_django)
     # https://github.com/ktosiek/pytest-freezegun/issues/35
     ignore:distutils Version classes are deprecated:DeprecationWarning:pytest_freezegun
 
@@ -46,4 +38,4 @@ python_files = test_*.py
 #   --capture=fd   -> Capture all output written to the STDOUT and STDERR file descriptors.
 #                     https://docs.pytest.org/en/stable/capture.html
 #
-addopts = --tb=short --verbose --nomigrations --reuse-db --color=auto --capture=fd
+addopts = --tb=short --verbose --nomigrations --reuse-db --color=auto --capture=fd

setup.py

@@ -32,7 +32,7 @@
     zip_safe=False,
     install_requires=[
         "pytz",
-        "django>=3.2,<4.0",
+        "django>=3.2,<5.0",
         "structlog>=20.2.0",
         "python-dateutil>=2.8.2",
     ],

tests/settings.py

@@ -1,5 +1,6 @@
 SECRET_KEY = "x"
 DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3"}}
 INSTALLED_APPS = ["xocto", "django.contrib.auth", "django.contrib.contenttypes"]
+USE_DEPRECATED_PYTZ = True
 USE_TZ = True
 TIME_ZONE = "Europe/London"

tests/test_localtime.py

@@ -326,10 +326,10 @@ def test_conversion_of_bst_dt(self):
 
     def test_converts_utc_to_europe_london(self):
         utc_dt = factories.utc.dt("2018-05-28T23:30")
-        assert utc_dt.tzinfo.zone == "UTC"
+        assert str(utc_dt.tzinfo) == "UTC"
 
         local_dt = localtime.as_localtime(utc_dt)
-        assert local_dt.tzinfo.zone == "Europe/London"
+        assert str(local_dt.tzinfo) == "Europe/London"
 
 
 class TestIsUTC: