Merge pull request #369 from AltSchool/update-compat-matrix-mar2024

drop support for dj2, dj3.1, drf311, drf312. add support for drf315, py311
AltSchool · Mar 26, 2024 · c7cc0ed · c7cc0ed
2 parents 3063dfb + 0f5290f
commit c7cc0ed
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,22 +12,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10"]
-        dj-version: ["2.2.*", "3.0.*", "3.1.*", "3.2.*", "4.0.*", "4.1.*"]
-        drf-version: ["3.11.*", "3.12.*", "3.13.*"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
+        dj-version: ["3.2.*", "4.0.*", "4.1.*", "4.2.*"]
+        drf-version: ["3.13.*", "3.14.*", "3.15.*"]
         exclude:
         - python-version: 3.7
           dj-version: '4.0.*'
         - python-version: 3.7
           dj-version: '4.1.*'
-        - dj-version: '4.0.*'
-          drf-version: '3.11.*'
-        - dj-version: '4.1.*'
-          drf-version: '3.11.*'
-        - dj-version: '4.0.*'
-          drf-version: '3.12.*'
-        - dj-version: '4.1.*'
-          drf-version: '3.12.*'
+        - python-version: 3.7
+          dj-version: '4.2.*'
+        - dj-version: '4.2.*'
+          drf-version: '3.13.*'
 
     steps:
     - uses: actions/checkout@v2

diff --git a/install_requires.txt b/install_requires.txt
@@ -1,5 +1,5 @@
-Django>=2.2,<4.3
-djangorestframework>=3.11.2,<3.15
+Django>=3.2,<4.3
+djangorestframework>=3.13,<3.16
 inflection>=0.4.0
 requests
 hashids>=1.3.1

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 NAME = 'dynamic-rest'
 DESCRIPTION = 'Dynamic API support to Django REST Framework.'
 URL = 'http://github.com/AltSchool/dynamic-rest'
-VERSION = '2.2.1'
+VERSION = '2.3.0'
 SCRIPTS = ['manage.py']
 
 setup(
@@ -26,6 +26,7 @@
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
 )
diff --git a/tox.ini b/tox.ini
@@ -4,23 +4,21 @@ addopts=--tb=short
 [tox]
 envlist =
        py310-lint,
-       {py37,py38,py39,py310}-django{22,31,32,40,41,42}-drf{311,312,313,314},
+       {py37,py38,py39,py310}-django{32}-drf{313,314},
+       {py37,py38,py39,py310}-django{40,41,42}-drf{314,315},
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --coverage -rw
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =
-        django22: Django>=2.2,<2.3
-        django31: Django>=3.1,<3.2
         django32: Django>=3.2,<3.3
         django40: Django>=4.0,<4.1
         django41: Django>=4.1,<4.2
         django42: Django>=4.2,<4.3
-        drf311: djangorestframework>=3.11.2,<3.12
-        drf312: djangorestframework>=3.12,<3.13
         drf313: djangorestframework>=3.13,<3.14
         drf314: djangorestframework>=3.14,<3.15
+        drf315: djangorestframework>=3.15,<3.16
         -rrequirements.txt
 
 [testenv:py310-lint]
@@ -30,6 +28,6 @@ deps = -rrequirements.txt
 [testenv:py310-drf314-benchmarks]
 commands = ./runtests.py --benchmarks
 deps =
-        Django==4.2.1
-        djangorestframework==3.14
+        Django==4.2.11
+        djangorestframework==3.15.1
         -rrequirements.benchmark.txt