fix: Django 4 compatibility + upgrade version

.github/workflows/python-app.yml

@@ -18,14 +18,13 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - '3.7'
           - '3.8'
           - '3.9'
+          - '3.10'
+          - '3.11'
         django-version:
           - '3.0'
-          - '3.1'
-          - '3.2'
-          - 'master'
+          - '4.0'
 
     steps:
     - uses: actions/checkout@v2
@@ -38,7 +37,6 @@ jobs:
         python -m pip install --upgrade pip
         if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        # python -m pip install --upgrade tox tox-gh-actions
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

django_form_builder/models.py

@@ -1,7 +1,7 @@
 import json
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from . dynamic_fields import get_fields_types
 from . forms import BaseDynamicForm

django_form_builder/settings.py

@@ -1,4 +1,4 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 CLASSIFICATION_LIST = (('protocollo', _('Protocollo')),

requirements.txt

@@ -1,4 +1,4 @@
-django>=2.0,<4.0
+django<=3.0,<5.0
 filesig>=0.3
-captcha==0.3
+captcha>=0.3
 cryptography>=2.8

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='django-form-builder',
-    version='0.16.14',
+    version='0.17.0',
     packages=find_packages(),
     package_data={'': ['*.wav']},
     data_files=[
@@ -31,8 +31,8 @@
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',
-        'Framework :: Django :: 2.0',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 4.0',
         'Intended Audience :: Developers',
         "License :: OSI Approved :: Apache Software License",
         'Operating System :: OS Independent',
@@ -41,9 +41,9 @@
     ],
     install_requires=[
         'wheel',
-        'django>=2.0,<4.0',
+        'django>=3.0,<5.0',
         'filesig>=0.3',
         'cryptography>=2.8',
-        'captcha==0.3'
+        'captcha>=0.3'
     ],
 )