Skip to content

Commit c7cc0ed

Browse files
authored
Merge pull request AltSchool#369 from AltSchool/update-compat-matrix-mar2024
drop support for dj2, dj3.1, drf311, drf312. add support for drf315, py311
2 parents 3063dfb + 0f5290f commit c7cc0ed

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,18 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: [3.7, 3.8, 3.9, "3.10"]
16-
dj-version: ["2.2.*", "3.0.*", "3.1.*", "3.2.*", "4.0.*", "4.1.*"]
17-
drf-version: ["3.11.*", "3.12.*", "3.13.*"]
15+
python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
16+
dj-version: ["3.2.*", "4.0.*", "4.1.*", "4.2.*"]
17+
drf-version: ["3.13.*", "3.14.*", "3.15.*"]
1818
exclude:
1919
- python-version: 3.7
2020
dj-version: '4.0.*'
2121
- python-version: 3.7
2222
dj-version: '4.1.*'
23-
- dj-version: '4.0.*'
24-
drf-version: '3.11.*'
25-
- dj-version: '4.1.*'
26-
drf-version: '3.11.*'
27-
- dj-version: '4.0.*'
28-
drf-version: '3.12.*'
29-
- dj-version: '4.1.*'
30-
drf-version: '3.12.*'
23+
- python-version: 3.7
24+
dj-version: '4.2.*'
25+
- dj-version: '4.2.*'
26+
drf-version: '3.13.*'
3127

3228
steps:
3329
- uses: actions/checkout@v2

install_requires.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Django>=2.2,<4.3
2-
djangorestframework>=3.11.2,<3.15
1+
Django>=3.2,<4.3
2+
djangorestframework>=3.13,<3.16
33
inflection>=0.4.0
44
requests
55
hashids>=1.3.1

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
NAME = 'dynamic-rest'
44
DESCRIPTION = 'Dynamic API support to Django REST Framework.'
55
URL = 'http://github.com/AltSchool/dynamic-rest'
6-
VERSION = '2.2.1'
6+
VERSION = '2.3.0'
77
SCRIPTS = ['manage.py']
88

99
setup(
@@ -26,6 +26,7 @@
2626
'Programming Language :: Python :: 3.8',
2727
'Programming Language :: Python :: 3.9',
2828
'Programming Language :: Python :: 3.10',
29+
'Programming Language :: Python :: 3.11',
2930
'Topic :: Software Development :: Libraries :: Python Modules',
3031
],
3132
)

tox.ini

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@ addopts=--tb=short
44
[tox]
55
envlist =
66
py310-lint,
7-
{py37,py38,py39,py310}-django{22,31,32,40,41,42}-drf{311,312,313,314},
7+
{py37,py38,py39,py310}-django{32}-drf{313,314},
8+
{py37,py38,py39,py310}-django{40,41,42}-drf{314,315},
89

910
[testenv]
1011
commands = ./runtests.py --fast {posargs} --coverage -rw
1112
setenv =
1213
PYTHONDONTWRITEBYTECODE=1
1314
deps =
14-
django22: Django>=2.2,<2.3
15-
django31: Django>=3.1,<3.2
1615
django32: Django>=3.2,<3.3
1716
django40: Django>=4.0,<4.1
1817
django41: Django>=4.1,<4.2
1918
django42: Django>=4.2,<4.3
20-
drf311: djangorestframework>=3.11.2,<3.12
21-
drf312: djangorestframework>=3.12,<3.13
2219
drf313: djangorestframework>=3.13,<3.14
2320
drf314: djangorestframework>=3.14,<3.15
21+
drf315: djangorestframework>=3.15,<3.16
2422
-rrequirements.txt
2523

2624
[testenv:py310-lint]
@@ -30,6 +28,6 @@ deps = -rrequirements.txt
3028
[testenv:py310-drf314-benchmarks]
3129
commands = ./runtests.py --benchmarks
3230
deps =
33-
Django==4.2.1
34-
djangorestframework==3.14
31+
Django==4.2.11
32+
djangorestframework==3.15.1
3533
-rrequirements.benchmark.txt

0 commit comments

Comments
 (0)