Updated test matrix for circa Django 4.1. (#1508)

carltongibson · Jun 16, 2022 · c455f22 · c455f22
1 parent 3dfed5d
commit c455f22
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,14 +1,19 @@
 ---
 name: Tests
-on: [push, pull_request]
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
@@ -44,7 +49,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: "3.10"
       - name: Ensure latest setuptools
         run: |
           python -m pip install --upgrade pip setuptools
@@ -65,7 +70,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: "3.10"
       - name: Ensure latest setuptools
         run: |
           python -m pip install --upgrade pip setuptools

diff --git a/setup.py b/setup.py
@@ -52,21 +52,19 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        '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',
     ],
     zip_safe=False,
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=[
-        'Django>=2.2',
+        'Django>=3.2',
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
-       {py36,py37}-django22,
-       {py36,py37,py38,py39,py310}-{django31,django32},
+       {py37,py38,py39,py310}-django32,
        {py38,py39,py310}-{django40,latest},
        isort,lint,docs,warnings,
 
@@ -16,10 +15,9 @@ commands = coverage run --parallel-mode --source django_filters ./runtests.py --
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-    django22: django~=2.2.0
-    django31: django~=3.1.0
     django32: django~=3.2.0
-    django40: Django>=4.0a1,<5.0
+    django40: Django>=4.0,<4.1
+    django41: Django>=4.1a1,<4.2
     !latest: djangorestframework~=3.12.0
     latest: {[latest]deps}
     -rrequirements/test-ci.txt