Merge branch 'main' into pr/adamchainz/438

SmileyChris · Mar 27, 2024 · 4d3d7b5 · 4d3d7b5
2 parents 04662d1 + 851ecd0
commit 4d3d7b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -45,7 +45,7 @@ maintainer =
     zest.releaser[recommended]
     django
 dev =
-    tox
+    tox==4.*
     black
     django
     pytest

diff --git a/tox.ini b/tox.ini
@@ -31,12 +31,12 @@ setenv =
 deps =
     coverage
     legacy: djangorestframework==3.11.*
-    previous: djangorestframework==3.13.*
-    latest: djangorestframework==3.14.*
+    previous: djangorestframework==3.14.*
+    latest: djangorestframework==3.15.*
     pyuca,legacy: pyuca
     legacy: Django==3.2.*
-    previous: Django==4.0.*
-    latest: Django~=5.0b1
+    previous: Django==4.2.*
+    latest: Django==5.*
     latest: graphene-django==3.0.*
 depends = coverage_setup
 commands = coverage run -m pytest {posargs}
@@ -73,11 +73,9 @@ commands = coverage erase
 skip_install = True
 parallel_show_output = True
 depends =
-    py310-latest{-pyuca}
-    noi18n
-    py36-django32-drf312
-    py39-django{32,40}-drf313
-    py36-legacy
+    py311-latest{-pyuca,-noi18n}
+    py310-previous
+    py37-legacy
 commands =
   coverage combine
   coverage html