Skip to content

feat: Adding django6 support. #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auvipy merged 7 commits into from
Mar 25, 2026
Merged

feat: Adding django6 support. #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4707051
feat: Adding django6 support.
awais786 Mar 2, 2026
7088326
Update requirements/test-django.txt
auvipy Mar 2, 2026
147ebc0
Update requirements/test-django60.txt
auvipy Mar 2, 2026
d8a1b06
feat: Adding django6 support.
awais786 Mar 2, 2026
0b707d5
Merge branch 'main' into feat/django-6-support
awais786 Mar 2, 2026
2143090
fix: resolve Django 6.0 CI dependency issue
awais786 Mar 10, 2026
1bf52d1
fix: resolve Django 6.0 CI dependency issue
awais786 Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.10" ]
django: [ "32", "42", "51", "52" ]
django: [ "32", "42", "51", "52", "60" ]
exclude:
- python-version: "3.13"
django: "32"
Expand All @@ -28,6 +28,16 @@ jobs:
django: "51"
- python-version: "3.12"
django: "32"
- python-version: "3.9"
django: "60"
- python-version: "3.10"
django: "60"
- python-version: "3.11"
django: "60"
- python-version: "pypy3.10"
django: "51"
- python-version: "pypy3.10"
django: "60"

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion requirements/default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
celery>=5.2.7,<6.0
celery>=5.2.7
Django>=3.2.25
Comment on lines +1 to 2
Copy link

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR is titled/descried as adding Django 6 support, but this hunk also removes the upper bound on Celery (previously <6.0). Since requirements/default.txt feeds install_requires in setup.py, this broadens the supported/runtime dependency range and may allow Celery 6+ to be installed without any corresponding compatibility/testing updates (and requirements/docs.txt still caps Celery at <6.0). If the intent is to support Celery 6, please update the PR description and align constraints across requirement files; otherwise, consider restoring an upper bound (or choosing a new tested range, e.g. <7.0).

Copilot uses AI. Check for mistakes.
2 changes: 1 addition & 1 deletion requirements/test-django.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django>=3.2,<6.0
Django>=3.2,<6.1
psycopg>=3.1.8
1 change: 1 addition & 0 deletions requirements/test-django60.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django>=6.0.0a1,<6.1
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def _pyimp():
Framework :: Django :: 5.0
Framework :: Django :: 5.1
Framework :: Django :: 5.2
Framework :: Django :: 6.0
Operating System :: OS Independent
Topic :: Communications
Topic :: System :: Distributed Computing
Expand Down
6 changes: 4 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
envlist =
py313-django{51,52}
py312-django{51,52,42}
py313-django{51,52,60}
py312-django{51,52,60,42}
Comment on lines +3 to +4
Copy link

Copilot AI Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The GitHub Actions unittest matrix currently only runs Django {32,42,51,52} and does not include the new django60 tox environments. As a result, the newly added Django 6.0 support won’t be exercised in CI; please update the CI matrix (e.g., .github/workflows/test.yaml) to add the appropriate Django=60 combinations (likely py312/py313 only, matching tox envlist).

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Member

@auvipy auvipy Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@awais786 please cross check this, this might be missing

py311-django{51,52,42}
py310-django{51,52,42,32}
py39-django{42,32}
Expand All @@ -21,6 +21,7 @@ DJANGO =
5.0: django50
5.1: django51
5.2: django52
6.0: django60

[testenv]
passenv =
Expand All @@ -35,6 +36,7 @@ deps=
django50: -r{toxinidir}/requirements/test-django50.txt
django51: -r{toxinidir}/requirements/test-django51.txt
django52: -r{toxinidir}/requirements/test-django52.txt
django60: -r{toxinidir}/requirements/test-django60.txt

cov,integration: -r{toxinidir}/requirements/test-django.txt

Expand Down
Loading