Updated dependencies; dropped django<3.x support; added support for d…

…jango<5.x

setup.py

@@ -7,8 +7,8 @@
     version=__version__,
     packages=find_packages(exclude=['tests']),
     install_requires=[
-        'django>=2.0,<4.0',
-        'django-polymorphic>=2.1.2<3.0',
+        'django>=2.0,<5.0',
+        'django-polymorphic>=2.1.2,<3.2',
         'holidays==0.9.10',
     ],
     include_package_data=True,
@@ -21,18 +21,21 @@
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 2.1',
-        'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
+        'Framework :: Django :: 3.2',
+        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

tests/requirements/django-3.0.txt

@@ -1,4 +1,4 @@
 -r base.txt
 
-django>=3.0
+django>=3.0,<3.1
 django-polymorphic>=2.0

tests/requirements/django-2.2.txt → tests/requirements/django-3.1.txt

@@ -1,4 +1,4 @@
 -r base.txt
 
-django>=2.2,<3.0
+django>=3.1,<3.2
 django-polymorphic>=2.0

tests/requirements/django-3.2.txt

@@ -0,0 +1,4 @@
+-r base.txt
+
+django>=3.2,<3.3
+django-polymorphic>=2.0

tests/requirements/django-4.0.txt

@@ -0,0 +1,4 @@
+-r base.txt
+
+django>=4.0,<4.1
+django-polymorphic>=2.0

tests/requirements/django-4.1.txt

@@ -0,0 +1,4 @@
+-r base.txt
+
+django>=4.1,<4.2
+django-polymorphic>=2.0

time_wizard/models/abstract.py

@@ -3,7 +3,7 @@
 import holidays
 from django.db import models
 from django.utils.timezone import now
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from time_wizard.conf import TIME_WIZARD_COUNTRIES
 

time_wizard/models/time_wizard.py

@@ -1,6 +1,6 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from time_wizard.mixins import TimeWizardInlineMixin
 

time_wizard/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import path
 
 from time_wizard import views
 
 urlpatterns = [
-    url(r'^load-holidays', views.load_holidays, name='ajax-load-holidays'),
-    url(r'^load-provinces', views.load_provinces, name='ajax-load-provinces'),
+    path('load-holidays', views.load_holidays, name='ajax-load-holidays'),
+    path('load-provinces', views.load_provinces, name='ajax-load-provinces'),
 ]

tox.ini

@@ -3,9 +3,10 @@
 envlist =
     flake8
     isort
-    py{35,36,37}-dj{21,22}
-    py{36,37,38}-dj{30}
-    py{36,37}-dj{master}
+    py{36,37,38,39}-dj{30,31}
+    py{36,37,38,39,310}-dj{32}
+    py{38,39,310}-dj{40,41,master}
+    py{310}-dj{master}
 
 skip_missing_interpreters=True
 
@@ -24,9 +25,11 @@ skip = migrations
 
 [testenv]
 deps =
-    dj21: -r tests/requirements/django-2.1.txt
-    dj22: -r tests/requirements/django-2.2.txt
     dj30: -r tests/requirements/django-3.0.txt
+    dj31: -r tests/requirements/django-3.1.txt
+    dj32: -r tests/requirements/django-3.2.txt
+    dj40: -r tests/requirements/django-4.0.txt
+    dj41: -r tests/requirements/django-4.1.txt
     djmaster: -r tests/requirements/django-master.txt
 commands =
     {env:COMMAND:coverage} erase