From 4709584fbca8d07546d28af21db69a35b514793c Mon Sep 17 00:00:00 2001 From: Savinay Nangalia Date: Tue, 26 Mar 2024 01:18:15 -0700 Subject: [PATCH 1/4] drop support for dj2, dj3.1, drf311, drf312. add support for drf 315 --- .github/workflows/test.yml | 14 ++++---------- install_requires.txt | 4 ++-- tox.ini | 12 +++++------- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ce91c5f..484d5cfb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,21 +13,15 @@ jobs: 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.*"] + 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.*' steps: - uses: actions/checkout@v2 diff --git a/install_requires.txt b/install_requires.txt index 1447d2f1..099316c0 100644 --- 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/tox.ini b/tox.ini index 342fd09e..a6c72580 100644 --- 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{313,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 From 90933354fc7a75ef43386e9ea3af37ab2f7e66e0 Mon Sep 17 00:00:00 2001 From: Savinay Nangalia Date: Tue, 26 Mar 2024 01:30:09 -0700 Subject: [PATCH 2/4] dj42 incompat with drf313 --- .github/workflows/test.yml | 2 ++ tox.ini | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 484d5cfb..a5cc64d8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,6 +22,8 @@ jobs: dj-version: '4.1.*' - python-version: 3.7 dj-version: '4.2.*' + - dj-version: '4.2.*' + drf-version: '3.13.*' steps: - uses: actions/checkout@v2 diff --git a/tox.ini b/tox.ini index a6c72580..d56e5cb8 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ addopts=--tb=short envlist = py310-lint, {py37,py38,py39,py310}-django{32}-drf{313,314}, - {py37,py38,py39,py310}-django{40,41,42}-drf{313,314,315}, + {py37,py38,py39,py310}-django{40,41,42}-drf{314,315}, [testenv] commands = ./runtests.py --fast {posargs} --coverage -rw From 93399716d73eb7756b327e3ff8077c0cb11c56c7 Mon Sep 17 00:00:00 2001 From: Savinay Nangalia Date: Tue, 26 Mar 2024 01:32:34 -0700 Subject: [PATCH 3/4] version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3f4448e0..dcc00f9e 100644 --- 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( From 0f5290f3ea8be0350eb56be5399d9aaab578dfb9 Mon Sep 17 00:00:00 2001 From: Savinay Nangalia Date: Tue, 26 Mar 2024 10:58:41 -0700 Subject: [PATCH 4/4] py311 tests --- .github/workflows/test.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a5cc64d8..5528e6e0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8, 3.9, "3.10"] + 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: diff --git a/setup.py b/setup.py index dcc00f9e..a45477fb 100644 --- a/setup.py +++ b/setup.py @@ -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', ], )