Merge pull request #306 from adamchainz/django_5.0

Test on Django 5.0
jsocol · Dec 5, 2023 · e113045 · e113045
2 parents 5af8854 + 83b5857
commit e113045
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,21 +15,46 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django: ['3.2', '4.0', '4.1', '4.2', 'main']
+        python-version:
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        django:
+        - '3.2'
+        - '4.0'
+        - '4.1'
+        - '4.2'
+        - '5.0'
+        - 'main'
         exclude:
           - python-version: '3.7'
             django: '4.0'
           - python-version: '3.7'
             django: '4.1'
           - python-version: '3.7'
             django: '4.2'
+          - python-version: '3.7'
+            django: '5.0'
           - python-version: '3.7'
             django: 'main'
+          - python-version: '3.8'
+            django: '5.0'
+          - python-version: '3.9'
+            django: '5.0'
           - python-version: '3.11'
             django: '3.2'
           - python-version: '3.11'
             django: '4.0'
+          - python-version: '3.12'
+            django: '3.2'
+          - python-version: '3.12'
+            django: '4.0'
+          - python-version: '3.12'
+            django: '4.1'
+          - python-version: '3.12'
+            django: '4.2'
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,13 +11,46 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        django: ['3.2', '4.0', '4.1']
+        python-version:
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        django:
+        - '3.2'
+        - '4.0'
+        - '4.1'
+        - '4.2'
+        - '5.0'
+        - 'main'
         exclude:
           - python-version: '3.7'
             django: '4.0'
           - python-version: '3.7'
             django: '4.1'
+          - python-version: '3.7'
+            django: '4.2'
+          - python-version: '3.7'
+            django: '5.0'
+          - python-version: '3.7'
+            django: 'main'
+          - python-version: '3.8'
+            django: '5.0'
+          - python-version: '3.9'
+            django: '5.0'
+          - python-version: '3.11'
+            django: '3.2'
+          - python-version: '3.11'
+            django: '4.0'
+          - python-version: '3.12'
+            django: '3.2'
+          - python-version: '3.12'
+            django: '4.0'
+          - python-version: '3.12'
+            django: '4.1'
+          - python-version: '3.12'
+            django: '4.2'
 
     steps:
     - uses: actions/checkout@v4

diff --git a/tox.ini b/tox.ini
@@ -3,8 +3,9 @@ envlist =
     py37-django32,
     py38-django{32,40,41,42,main},
     py39-django{32,40,41,42,main},
-    py310-django{32,40,41,42,main},
-    py311-django{41,42,main},
+    py310-django{32,40,41,42,50,main},
+    py311-django{41,42,50,main},
+    py312-django{50,main},
     pypy39-django{32,40,41,main},
 
 [testenv]
@@ -14,6 +15,7 @@ deps =
     django40: Django>=4.0,<4.1
     django41: Django>=4.1,<4.2
     django42: Django>=4.2,<4.3
+    django50: Django>=5.0a1,<5.1
     djangomain: https://github.com/django/django/archive/main.tar.gz
     pymemcache>=4.0,<5.0
     django-redis>=5.2,<6.0