Add tests for newer django-versions

fusionbox · Mar 18, 2024 · 4765c96 · 4765c96
1 parent cc21028
commit 4765c96
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,62 +9,88 @@ jobs:
       matrix:
         include:
           # Django 2.2
-          - django-version: "2.2.0"
+          - django-version: "2.2"
             python-version: "3.5"
-          - django-version: "2.2.0"
+          - django-version: "2.2"
             python-version: "3.6"
-          - django-version: "2.2.0"
+          - django-version: "2.2"
             python-version: "3.7"
-          - django-version: "2.2.0"
+          - django-version: "2.2"
             python-version: "3.8"
-          - django-version: "2.2.0"
+          - django-version: "2.2"
             python-version: "3.9"
 
           # Django 3.0
-          - django-version: "3.0.0"
+          - django-version: "3.0"
             python-version: "3.6"
-          - django-version: "3.0.0"
+          - django-version: "3.0"
             python-version: "3.7"
-          - django-version: "3.0.0"
+          - django-version: "3.0"
             python-version: "3.8"
-          - django-version: "3.0.0"
+          - django-version: "3.0"
             python-version: "3.9"
 
           # Django 3.1
-          - django-version: "3.1.0"
+          - django-version: "3.1"
             python-version: "3.6"
-          - django-version: "3.1.0"
+          - django-version: "3.1"
             python-version: "3.7"
-          - django-version: "3.1.0"
+          - django-version: "3.1"
             python-version: "3.8"
-          - django-version: "3.1.0"
+          - django-version: "3.1"
             python-version: "3.9"
 
           # Django 3.2
-          - django-version: "3.2.0"
+          - django-version: "3.2"
             python-version: "3.6"
-          - django-version: "3.2.0"
+          - django-version: "3.2"
             python-version: "3.7"
-          - django-version: "3.2.0"
+          - django-version: "3.2"
             python-version: "3.8"
-          - django-version: "3.2.0"
+          - django-version: "3.2"
             python-version: "3.9"
-          - django-version: "3.2.0"
+          - django-version: "3.2"
             python-version: "3.10"
 
           # Django 4.0
-          - django-version: "4.0.0"
+          - django-version: "4.0"
             python-version: "3.8"
-          - django-version: "4.0.0"
+          - django-version: "4.0"
             python-version: "3.9"
-          - django-version: "4.0.0"
+          - django-version: "4.0"
             python-version: "3.10"
 
+          # Django 4.1
+          - django-version: "4.1"
+            python-version: "3.8"
+          - django-version: "4.1"
+            python-version: "3.9"
+          - django-version: "4.1"
+            python-version: "3.10"
+
+          # Django 4.2
+          - django-version: "4.2"
+            python-version: "3.8"
+          - django-version: "4.2"
+            python-version: "3.9"
+          - django-version: "4.2"
+            python-version: "3.10"
+          - django-version: "4.2"
+            python-version: "3.11"
+
+          # Django 5.0
+          - django-version: "5.0"
+            python-version: "3.10"
+          - django-version: "5.0"
+            python-version: "3.11"
+          - django-version: "5.0"
+            python-version: "3.12"
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

diff --git a/authtools/__init__.py b/authtools/__init__.py
@@ -1,3 +1,3 @@
-import pkg_resources
+from importlib.metadata import version
 
-__version__ = pkg_resources.get_distribution('django-authtools').version
+__version__ = version('django-authtools')
diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,16 @@
 [tox]
 envlist=
-    py39-dj{22,30,31,32,40}
+    py{38,39}-dj{22,30,31,32,40,41,42}
+    py{10}-dj{32,40,41,42,50}
+    py{11,12}-dj{42,50}
 [testenv]
 python=
+  py37: python3.7
+  py38: python3.8
   py39: python3.9
+  py310: python3.10
+  py311: python3.11
+  py312: python3.12
 commands=
   /usr/bin/env
   make test
@@ -13,6 +20,9 @@ deps=
   dj31: Django>=3.1,<3.2
   dj32: Django>=3.2,<3.3
   dj40: Django>=4.0,<4.1
+  dj41: Django>=4.1,<4.2
+  dj42: Django>=4.2,<4.3
+  dj50: Django>=5.0,<5.1
 whitelist_externals=
   env
   make