Skip to content

Commit

Permalink
Merge pull request #214 from revsys/upgrade-django-5-1
Browse files Browse the repository at this point in the history
⬆️ Adds support for Django 5.1
  • Loading branch information
frankwiles authored Aug 11, 2024
2 parents 537fb08 + 17a31fc commit 1292d17
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- "3.2" # LTS
- "4.2" # LTS
- "5.0"
- "5.1"
drf-version:
- ""
- "3.14" # only testing latest version for now
Expand All @@ -43,6 +44,11 @@ jobs:
django-version: "5.0"
- python-version: "3.9"
django-version: "5.0"
# Django 5.1 is compatible with Python 3.10+
- python-version: "3.8"
django-version: "5.1"
- python-version: "3.9"
django-version: "5.1"

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ to help your team dramatically improve your productivity.

Supports: Python 3.8, 3.9, 3.10, 3.11, and 3.12.

Supports Django Versions: 3.2, 4.2, and 5.0.
Supports Django Versions: 3.2, 4.2, 5.0, and 5.1.

## Documentation

Expand Down
12 changes: 8 additions & 4 deletions noxfile.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
import nox

DJANGO_VERSIONS = ["3.2", "4.2", "5.0"]
DRF_VERSIONS = ["3.11", "3.12", "3.13", "3.14"]
DJANGO_VERSIONS = ["3.2", "4.2", "5.0", "5.1"]
DRF_VERSIONS = ["3.11", "3.12", "3.13", "3.14", ]
PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12"]

INVALID_PYTHON_DJANGO_SESSIONS = [
("3.8", "5.0"),
("3.9", "5.0"),
("3.8", "5.1"),
("3.9", "5.1"),
("3.11", "3.2"),
("3.12", "3.2"),
]

nox.options.default_venv_backend = "uv|venv"
nox.options.reuse_existing_virtualenvs = True


@nox.session(python=PYTHON_VERSIONS, tags=["django"], venv_backend="uv")
@nox.parametrize("django", DJANGO_VERSIONS)
Expand All @@ -23,7 +27,7 @@ def tests(session: nox.Session, django: str) -> None:


@nox.session(python=["3.10"], tags=["drf"], venv_backend="uv")
@nox.parametrize("django", ["3.2"])
@nox.parametrize("django", ["4.2"])
@nox.parametrize("drf", DRF_VERSIONS)
def tests_drf(session: nox.Session, django: str, drf: str) -> None:
session.install(".[test]")
Expand Down
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ classifiers =
Environment :: Web Environment
Framework :: Django
Framework :: Django :: 3.2
Framework :: Django :: 4.0
Framework :: Django :: 4.1
Framework :: Django :: 4.2
Framework :: Django :: 5.0
Framework :: Django :: 5.1
Framework :: Pytest
Intended Audience :: Developers
License :: OSI Approved :: BSD License
Expand Down
1 change: 0 additions & 1 deletion test_project/test_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,3 @@
REST_FRAMEWORK = {
'TEST_REQUEST_DEFAULT_FORMAT': 'json',
}

0 comments on commit 1292d17

Please sign in to comment.