Skip to content

feat!: upgrading to django52. #2861

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
UsamaSadiq merged 9 commits into from
Oct 8, 2025
Merged

feat!: upgrading to django52. #2861

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea36131
feat!: upgrading to django52.
awais786 Sep 19, 2025
0515909
feat!: upgrading to django52.
awais786 Sep 19, 2025
16c5a3d
feat!: upgrading to django52.
awais786 Sep 19, 2025
0fa910c
feat!: upgrading to django52.
awais786 Sep 19, 2025
bb70d1a
feat!: upgrading to django52.
awais786 Sep 19, 2025
73760df
feat!: upgrading to django52.
awais786 Sep 19, 2025
e53e752
Merge branch 'master' into upgrading-django52
awais786 Sep 29, 2025
1e47bb7
chore: fix the comments in constraint file.
awais786 Oct 6, 2025
4bcf4a5
docs: add follow up ticket in constraints
UsamaSadiq Oct 8, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
strategy:
matrix:
python-version: ["3.12"]
django-version: ["django42", "django52"]
django-version: ["django52"]
steps:
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export CUSTOM_COMPILE_COMMAND = make upgrade
upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
sed '/^django-simple-history==/d' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
sed 's/Django<5.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
Expand Down
10 changes: 4 additions & 6 deletions requirements/all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ bleach==6.2.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
boto3==1.40.36
boto3==1.40.34
# via
# -r requirements/production.txt
# django-ses
botocore==1.40.36
botocore==1.40.34
# via
# -r requirements/production.txt
# boto3
Expand Down Expand Up @@ -141,9 +141,8 @@ distlib==0.4.0
# via
# -r requirements/dev.txt
# virtualenv
django==4.2.24
django==5.2.6
# via
# -c requirements/common_constraints.txt
# -r requirements/dev.txt
# -r requirements/production.txt
# django-appconf
Expand Down Expand Up @@ -746,8 +745,6 @@ pytz==2025.2
# -r requirements/dev.txt
# -r requirements/production.txt
# drf-yasg
pywatchman==3.0.0 ; "linux" in sys_platform
# via -r requirements/dev.txt
pyyaml==6.0.2
# via
# -r requirements/dev.txt
Expand Down Expand Up @@ -834,6 +831,7 @@ sniffio==1.3.1
# anyio
social-auth-app-django==5.4.3
# via
# -c requirements/constraints.txt
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-auth-backends
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ defusedxml==0.7.1
# social-auth-core
didkit==0.3.3
# via -r requirements/base.in
django==4.2.24
django==5.2.6
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
# django-appconf
# django-config-models
Expand Down Expand Up @@ -388,6 +387,7 @@ sniffio==1.3.1
# via anyio
social-auth-app-django==5.4.3
# via
# -c requirements/constraints.txt
# -r requirements/base.in
# edx-auth-backends
social-auth-core==4.7.0
Expand Down
32 changes: 31 additions & 1 deletion requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,36 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

Copy link
Contributor

@feanil feanil Oct 3, 2025

Choose a reason for hiding this comment

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

Why is this message in here so many times?

Copy link
Contributor Author

@awais786 awais786 Oct 6, 2025

Choose a reason for hiding this comment

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

fixed

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand All @@ -17,7 +47,7 @@
# this file from Github directly. It does not require packaging in edx-lint.

# using LTS django version
Django<5.0


# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
Expand Down
4 changes: 4 additions & 0 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@

# Common constraints for edx repos
-c common_constraints.txt


# greater versions are breaking 2 tests which need further investigation.
social-auth-app-django<=5.4.3
6 changes: 2 additions & 4 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,8 @@ distlib==0.4.0
# via
# -r requirements/test.txt
# virtualenv
django==4.2.24
django==5.2.6
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
# django-appconf
# django-config-models
Expand Down Expand Up @@ -582,8 +581,6 @@ pytz==2025.2
# via
# -r requirements/test.txt
# drf-yasg
pywatchman==3.0.0 ; "linux" in sys_platform
# via -r requirements/dev.in
pyyaml==6.0.2
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -652,6 +649,7 @@ sniffio==1.3.1
# anyio
social-auth-app-django==5.4.3
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# edx-auth-backends
social-auth-core==4.7.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/django.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==4.2.24
django==5.2.6
8 changes: 4 additions & 4 deletions requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ backoff==2.2.1
# segment-analytics-python
bleach==6.2.0
# via -r requirements/base.txt
boto3==1.40.36
boto3==1.40.34
# via django-ses
botocore==1.40.36
botocore==1.40.34
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -83,9 +83,8 @@ defusedxml==0.7.1
# social-auth-core
didkit==0.3.3
# via -r requirements/base.txt
django==4.2.24
django==5.2.6
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
# django-appconf
# django-config-models
Expand Down Expand Up @@ -534,6 +533,7 @@ sniffio==1.3.1
# anyio
social-auth-app-django==5.4.3
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# edx-auth-backends
social-auth-core==4.7.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ dill==0.4.0
distlib==0.4.0
# via virtualenv
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
# django-appconf
# django-config-models
Expand Down Expand Up @@ -602,6 +601,7 @@ sniffio==1.3.1
# anyio
social-auth-app-django==5.4.3
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# edx-auth-backends
social-auth-core==4.7.0
Expand Down
6 changes: 2 additions & 4 deletions requirements/translations.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
#
asgiref==3.9.1
# via django
django==4.2.24
# via
# -c requirements/common_constraints.txt
# edx-i18n-tools
django==5.2.6
# via edx-i18n-tools
edx-i18n-tools==1.9.0
# via -r requirements/translations.in
lxml[html-clean]==6.0.2
Expand Down
5 changes: 2 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{3.12}-django{42,52}
envlist = py{3.12}-django{52}
skipsdist = true

[pytest]
Expand All @@ -8,8 +8,7 @@ testpaths = credentials/apps

[testenv]
deps =
django42: -r requirements/django.txt
django52: Django>=5.2,<5.3
django52: -r requirements/django.txt
-r {toxinidir}/requirements/test.txt
allowlist_externals:
make
Expand Down