Upgrade tests suite

barseghyanartur · Nov 12, 2023 · 5709bd6 · 5709bd6
1 parent d1f6f80
commit 5709bd6
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 166 deletions.
diff --git a/.github/workflows/test.yml b/.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,8 +72,8 @@ 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 }}
       env:

diff --git a/CHANGELOG.rst b/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
 ------

diff --git a/README.rst b/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
 ============

diff --git a/requirements b/requirements
@@ -0,0 +1 @@
+examples/requirements
diff --git a/requirements/django_1_10.txt b/requirements/django_1_10.txt
diff --git a/requirements/django_1_11.txt b/requirements/django_1_11.txt
diff --git a/requirements/django_1_8.txt b/requirements/django_1_8.txt
diff --git a/requirements/django_1_9.txt b/requirements/django_1_9.txt
diff --git a/requirements/django_2_0.txt b/requirements/django_2_0.txt
diff --git a/requirements/django_2_1.txt b/requirements/django_2_1.txt
diff --git a/setup.py b/setup.py
@@ -39,6 +39,9 @@
         "4.1",
         "4.2",
         "5.0",
+        "5.1",
+        "5.2",
+        "6.0",
     )
 
     for v in LOOSE_VERSIONS:
@@ -229,13 +232,6 @@
 tests_require = [
     "selenium",
     "Faker",
-    # 'factory_boy',
-    # 'fake-factory',
-    # 'Pillow',
-    # 'pytest',
-    # 'pytest-django',
-    # 'pytest-cov',
-    # 'tox',
 ]
 
 setup(
@@ -246,22 +242,19 @@
     long_description="{0}{1}".format(readme, screenshots),
     classifiers=[
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Environment :: Web Environment",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "License :: OSI Approved :: GNU Lesser General Public License v2 or "
         "later (LGPLv2+)",
         "Framework :: Django",
-        "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 3.1",
         "Framework :: Django :: 3.2",
-        "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
+        "Framework :: Django :: 4.2",
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Development Status :: 4 - Beta",

diff --git a/tox.ini b/tox.ini
@@ -1,40 +1,18 @@
 [tox]
 envlist = 
-    py{37,38,39}-django{22,30,31,32}
-    py{38,39,310,311}-django{40,41}
-    #flake8,
-    #isort
+    py{38,39}-django{32}
+    py{38,39,310,311}-django{41}
+    py{310,311}-django{42}
 
 [testenv]
 envlogdir=examples/logs/
 passenv = *
 deps =
-    django22: -r{toxinidir}/examples/requirements/django_2_2.txt
-    django30: -r{toxinidir}/examples/requirements/django_3_0.txt
-    django31: -r{toxinidir}/examples/requirements/django_3_1.txt
     django32: -r{toxinidir}/examples/requirements/django_3_2.txt
-    django40: -r{toxinidir}/examples/requirements/django_4_0.txt
     django41: -r{toxinidir}/examples/requirements/django_4_1.txt
+    django41: -r{toxinidir}/examples/requirements/django_4_2.txt
 commands =
-;    {envpython} examples/simple/manage.py test {posargs:fobi} --settings=settings.test --traceback -v 3
-;    {envpython} -m pip install https://github.com/barseghyanartur/get-chromedriver-py/archive/main.tar.gz
     {envpython} -m pip install get-chromedriver-py
     get-chromedriver -vvvv
     {envpython} -m pip install -e .
-;    {envpython} runtests.py
     {envpython} -m pytest
-
-#[testenv:flake8]
-#basepython = python3.5
-#deps =
-#    Django>=1.10,<1.11
-#    -r{toxinidir}/examples/requirements/django_1_9.txt
-#commands = flake8
-##
-#
-#[testenv:isort]
-#basepython = python3.5
-#deps =
-#    Django>=1.10,<1.11
-#    -r{toxinidir}/examples/requirements/django_1_9.txt
-#commands = isort --recursive --check-only fobi tests