Upgrade to modern versions of python and django 2023

.github/workflows/test.yml

@@ -27,83 +27,35 @@ jobs:
       max-parallel: 4
       matrix:
         include:
-#          - python-version: 3.6
-#            requirements: django_2_2
-#            tox_env: py36-django22
-          - python-version: 3.7
-            requirements: django_2_2
-            tox_env: py37-django22
-          - python-version: 3.8
-            requirements: django_2_2
-            tox_env: py38-django22
-          - python-version: 3.9
-            requirements: django_2_2
-            tox_env: py39-django22
-
-#          - python-version: 3.6
-#            requirements: django_3_0
-#            tox_env: py36-django30
-          - python-version: 3.7
-            requirements: django_3_0
-            tox_env: py37-django30
-          - python-version: 3.8
-            requirements: django_3_0
-            tox_env: py38-django30
-          - python-version: 3.9
-            requirements: django_3_0
-            tox_env: py39-django30
-
-#          - python-version: 3.6
-#            requirements: django_3_1
-#            tox_env: py36-django31
-          - python-version: 3.7
-            requirements: django_3_1
-            tox_env: py37-django31
-          - python-version: 3.8
-            requirements: django_3_1
-            tox_env: py38-django31
-          - python-version: 3.9
-            requirements: django_3_1
-            tox_env: py39-django31
-
-#          - python-version: 3.6
-#            requirements: django_3_2
-#            tox_env: py36-django32
-          - python-version: 3.7
-            requirements: django_3_2
-            tox_env: py37-django32
+          # Django 3.2
           - python-version: 3.8
             requirements: django_3_2
             tox_env: py38-django32
           - python-version: 3.9
             requirements: django_3_2
             tox_env: py39-django32
 
-          - python-version: 3.8
-            requirements: django_4_0
-            tox_env: py38-django40
-          - python-version: 3.9
-            requirements: django_4_0
-            tox_env: py39-django40
-          - python-version: '3.10'
-            requirements: django_4_0
-            tox_env: py310-django40
-#          - python-version: '3.11'
-#            requirements: django_4_0
-#            tox_env: py311-django40
-
+          # Django 4.1
           - python-version: 3.8
             requirements: django_4_1
             tox_env: py38-django41
           - python-version: 3.9
             requirements: django_4_1
             tox_env: py39-django41
-          - python-version: '3.10'
+          - python-version: 3.10
             requirements: django_4_1
             tox_env: py310-django41
-#          - python-version: '3.11'
-#            requirements: django_4_1
-#            tox_env: py311-django41
+          - python-version: 3.11
+            requirements: django_4_1
+            tox_env: py311-django41
+
+          # Django 4.2
+          - python-version: 3.10
+            requirements: django_4_2
+            tox_env: py310-django42
+          - python-version: 3.11
+            requirements: django_4_2
+            tox_env: py311-django42
 
     steps:
     - name: Install libxml2 and libxslt
@@ -120,10 +72,10 @@ jobs:
         pip install pip-tools
         pip-compile examples/requirements/${{ matrix.requirements }}.in
         pip install -r examples/requirements/${{ matrix.requirements }}.txt
-        pip-compile examples/requirements/test.in
-        pip install -r examples/requirements/test.txt
+#        pip-compile examples/requirements/test.in
+#        pip install -r examples/requirements/test.txt
     - name: Run Tests
-      run: tox -e ${{ matrix.tox_env }}
+      run: python -m pytest -vrx
       env:
         POSTGRES_HOST: localhost
         POSTGRES_PORT: 5432

CHANGELOG.rst

@@ -20,6 +20,8 @@ are used for versioning (schema follows below):
 2023-11-??
 
 - Fixes in the ``select_checkbox_multiple`` plugin.
+- Stop testing against Django 2.2, 3.0, 3.1 and 4.0.
+- Stop testing against Python 3.6 and 3.7.
 
 0.19.9
 ------

Dockerfile

@@ -0,0 +1 @@
+docker/backend/Dockerfile

Makefile

@@ -111,11 +111,11 @@ pip-compile:
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile demo.in
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile deployment.in
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile dev.in
-	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_2_2.in
-	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_3_0.in
-	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_3_1.in
+#	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_2_2.in
+#	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_3_0.in
+#	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_3_1.in
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_3_2.in
-	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_4_0.in
+#	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_4_0.in
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_4_1.in
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile django_4_2.in
 	docker-compose -f docker-compose.yml exec -w /backend/examples/requirements/ backend pip-compile djangocms_3_4_3.in

README.rst

@@ -34,8 +34,8 @@ handling the submitted form data).
 
 Prerequisites
 =============
-- Django 2.2, 3.0, 3.1, 3.2, 4.0 and 4.1.
-- Python 3.6, 3.7, 3.8, 3.9, 3.10 and 3.11.
+- Django 3.2, 4.1 and 4.2.
+- Python 3.8, 3.9, 3.10, 3.11 and 3.12.
 
 Key concepts
 ============

docker/backend/Dockerfile

@@ -16,6 +16,7 @@ RUN apt-get update && \
 
 RUN pip install pip --upgrade
 RUN pip install virtualenv
+RUN pip install pip-tools
 
 RUN mkdir /backend
 WORKDIR /backend

examples/requirements/captcha.txt

@@ -1,24 +1,20 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile captcha.in
 #
-asgiref==3.3.4
+asgiref==3.7.2
     # via django
-django==3.2.4
+django==4.2.7
     # via
     #   django-ranged-response
     #   django-simple-captcha
 django-ranged-response==0.2.0
     # via django-simple-captcha
-django-simple-captcha==0.5.14
+django-simple-captcha==0.5.20
     # via -r captcha.in
-pillow==8.2.0
+pillow==10.1.0
     # via django-simple-captcha
-pytz==2021.1
-    # via django
-six==1.16.0
-    # via django-simple-captcha
-sqlparse==0.4.1
+sqlparse==0.4.4
     # via django

examples/requirements/common.in

@@ -1,33 +1,41 @@
-alabaster>=0.7.6
+#MySQL-python
+#Unidecode==0.4.18
+#requests==2.8.1
+#vishap>=0.1.5
 Babel>=2.1.1
+Jinja2>=2.8
+MarkupSafe>=0.23
+Pillow>=2.0.0
+Pillow>=4.2.1
+Pygments>=2.0.2
+Sphinx>=1.3.1
+Unidecode>=0.04.1
+alabaster>=0.7.6
+bleach
 bleach>=2.1.2
 decorator>=4.0.4
+django-nine>=0.2.3
+django-nonefield>=0.1
 docopt>=0.4.0
 docutils>=0.12
 importlib-metadata<5.0.0
-Jinja2>=2.8
 mailchimp>=2.0.9
 markdown
-MarkupSafe>=0.23
-#MySQL-python
 ordereddict==1.1
 path.py>=8.1.2
 pexpect>=4.0.1
 pickleshare>=0.5
-Pillow>=4.2.1
 pluggy>=0.7.1
-ptyprocess>=0.5
 psycopg2-binary
-Pygments>=2.0.2
+ptyprocess>=0.5
 pytz>=2019.1
-#requests==2.8.1
+requests>=1.0.0
 simplegeneric>=0.8.1
 six>=1.10.0
+six>=1.9
 snowballstemmer>=1.2.0
-Sphinx>=1.3.1
 sphinx-rtd-theme>=0.1.9
 traitlets>=4.0.0
-#Unidecode==0.4.18
 virtualenv>=13.1.2
-#vishap>=0.1.5
+vishap>=0.1.5,<2.0
 wheel>=0.24.0