From ea361314a59594b5ff0ad7865dbd1d70a7b2491a Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 19 Sep 2025 11:44:27 +0500 Subject: [PATCH 1/8] feat!: upgrading to django52. --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- requirements/all.txt | 31 ++++++++++++++++------------- requirements/base.txt | 17 ++++++++-------- requirements/common_constraints.txt | 2 +- requirements/dev.txt | 25 +++++++++++++---------- requirements/django.txt | 2 +- requirements/docs.txt | 2 +- requirements/pip.txt | 2 +- requirements/pip_tools.txt | 4 ++-- requirements/production.txt | 23 ++++++++++----------- requirements/test.txt | 19 +++++++++--------- requirements/translations.txt | 8 +++----- tox.ini | 5 ++--- 14 files changed, 73 insertions(+), 71 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dce39dfcb..45385a632 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/Makefile b/Makefile index c3ab5a1cd..7c404b64a 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/requirements/all.txt b/requirements/all.txt index 3b42fcaf0..b63298d52 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -31,17 +31,17 @@ backoff==2.2.1 # -r requirements/dev.txt # -r requirements/production.txt # segment-analytics-python -black==25.1.0 +black==25.9.0 # via -r requirements/dev.txt bleach==6.2.0 # via # -r requirements/dev.txt # -r requirements/production.txt -boto3==1.40.31 +boto3==1.40.34 # via # -r requirements/production.txt # django-ses -botocore==1.40.31 +botocore==1.40.34 # via # -r requirements/production.txt # boto3 @@ -79,7 +79,7 @@ charset-normalizer==3.4.3 # -r requirements/dev.txt # -r requirements/production.txt # requests -click==8.2.1 +click==8.3.0 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -115,7 +115,7 @@ coreschema==0.0.4 # coreapi coverage==7.10.6 # via -r requirements/dev.txt -cryptography==45.0.7 +cryptography==46.0.1 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -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 @@ -188,7 +187,7 @@ django-config-models==2.9.0 # via # -r requirements/dev.txt # -r requirements/production.txt -django-cors-headers==4.8.0 +django-cors-headers==4.9.0 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -379,7 +378,7 @@ firebase-admin==7.1.0 # -r requirements/dev.txt # -r requirements/production.txt # edx-ace -gevent==25.8.2 +gevent==25.9.1 # via -r requirements/production.txt google-api-core[grpc]==2.25.1 # via @@ -545,7 +544,7 @@ msgpack==1.1.1 # -r requirements/dev.txt # -r requirements/production.txt # cachecontrol -mypy==1.18.1 +mypy==1.18.2 # via -r requirements/dev.txt mypy-extensions==1.1.0 # via @@ -635,7 +634,7 @@ protobuf==6.32.1 # googleapis-common-protos # grpcio-status # proto-plus -psutil==7.0.0 +psutil==7.1.0 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -696,7 +695,7 @@ pymemcache==4.0.0 # via # -r requirements/dev.txt # -r requirements/production.txt -pymongo==4.15.0 +pymongo==4.15.1 # via # -r requirements/dev.txt # -r requirements/production.txt @@ -737,6 +736,10 @@ python3-openid==3.2.0 # -r requirements/dev.txt # -r requirements/production.txt # social-auth-core +pytokens==0.1.10 + # via + # -r requirements/dev.txt + # black pytz==2025.2 # via # -r requirements/dev.txt @@ -828,7 +831,7 @@ sniffio==1.3.1 # -r requirements/dev.txt # -r requirements/production.txt # anyio -social-auth-app-django==5.4.3 +social-auth-app-django==5.5.1 # via # -r requirements/dev.txt # -r requirements/production.txt diff --git a/requirements/base.txt b/requirements/base.txt index b611e8f42..91d54e1db 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -33,7 +33,7 @@ cffi==2.0.0 # pynacl charset-normalizer==3.4.3 # via requests -click==8.2.1 +click==8.3.0 # via # code-annotations # edx-django-utils @@ -46,7 +46,7 @@ coreapi==2.3.3 # openapi-codec coreschema==0.0.4 # via coreapi -cryptography==45.0.7 +cryptography==46.0.1 # via # pyjwt # social-auth-core @@ -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 @@ -93,7 +92,7 @@ django-appconf==1.1.0 # via django-statici18n django-config-models==2.9.0 # via -r requirements/base.in -django-cors-headers==4.8.0 +django-cors-headers==4.9.0 # via -r requirements/base.in django-crum==0.7.9 # via @@ -299,7 +298,7 @@ protobuf==6.32.1 # googleapis-common-protos # grpcio-status # proto-plus -psutil==7.0.0 +psutil==7.1.0 # via edx-django-utils pyasn1==0.6.1 # via @@ -322,7 +321,7 @@ pyjwt[crypto]==2.10.1 # social-auth-core pymemcache==4.0.0 # via -r requirements/base.in -pymongo==4.15.0 +pymongo==4.15.1 # via edx-opaque-keys pynacl==1.6.0 # via edx-django-utils @@ -386,7 +385,7 @@ six==1.17.0 # python-dateutil sniffio==1.3.1 # via anyio -social-auth-app-django==5.4.3 +social-auth-app-django==5.5.1 # via # -r requirements/base.in # edx-auth-backends diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b0a74ba95..e5182012d 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -17,7 +17,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 diff --git a/requirements/dev.txt b/requirements/dev.txt index d0ffb0a66..c995874d8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -27,7 +27,7 @@ backoff==2.2.1 # via # -r requirements/test.txt # segment-analytics-python -black==25.1.0 +black==25.9.0 # via -r requirements/test.txt bleach==6.2.0 # via -r requirements/test.txt @@ -59,7 +59,7 @@ charset-normalizer==3.4.3 # via # -r requirements/test.txt # requests -click==8.2.1 +click==8.3.0 # via # -r requirements/test.txt # black @@ -91,7 +91,7 @@ coreschema==0.0.4 # coreapi coverage==7.10.6 # via -r requirements/test.txt -cryptography==45.0.7 +cryptography==46.0.1 # via # -r requirements/test.txt # pyjwt @@ -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 @@ -155,7 +154,7 @@ django-appconf==1.1.0 # django-statici18n django-config-models==2.9.0 # via -r requirements/test.txt -django-cors-headers==4.8.0 +django-cors-headers==4.9.0 # via -r requirements/test.txt django-crum==0.7.9 # via @@ -415,7 +414,7 @@ msgpack==1.1.1 # via # -r requirements/test.txt # cachecontrol -mypy==1.18.1 +mypy==1.18.2 # via -r requirements/dev.in mypy-extensions==1.1.0 # via @@ -488,7 +487,7 @@ protobuf==6.32.1 # googleapis-common-protos # grpcio-status # proto-plus -psutil==7.0.0 +psutil==7.1.0 # via # -r requirements/test.txt # edx-django-utils @@ -541,7 +540,7 @@ pylint-plugin-utils==0.9.0 # pylint-django pymemcache==4.0.0 # via -r requirements/test.txt -pymongo==4.15.0 +pymongo==4.15.1 # via # -r requirements/test.txt # edx-opaque-keys @@ -574,6 +573,10 @@ python3-openid==3.2.0 # via # -r requirements/test.txt # social-auth-core +pytokens==0.1.10 + # via + # -r requirements/test.txt + # black pytz==2025.2 # via # -r requirements/test.txt @@ -646,7 +649,7 @@ sniffio==1.3.1 # via # -r requirements/test.txt # anyio -social-auth-app-django==5.4.3 +social-auth-app-django==5.5.1 # via # -r requirements/test.txt # edx-auth-backends diff --git a/requirements/django.txt b/requirements/django.txt index e864a899a..5a2807f82 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==4.2.24 +django==5.2.6 diff --git a/requirements/docs.txt b/requirements/docs.txt index 94f325d16..cf1cecdc3 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/pip.txt b/requirements/pip.txt index 476adfba8..dabfa8f0e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index a8620ab4d..514a5f658 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # build==1.3.0 # via pip-tools -click==8.2.1 +click==8.3.0 # via pip-tools packaging==25.0 # via build diff --git a/requirements/production.txt b/requirements/production.txt index f8f879057..5718a88d4 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -24,9 +24,9 @@ backoff==2.2.1 # segment-analytics-python bleach==6.2.0 # via -r requirements/base.txt -boto3==1.40.31 +boto3==1.40.34 # via django-ses -botocore==1.40.31 +botocore==1.40.34 # via # boto3 # s3transfer @@ -53,7 +53,7 @@ charset-normalizer==3.4.3 # via # -r requirements/base.txt # requests -click==8.2.1 +click==8.3.0 # via # -r requirements/base.txt # code-annotations @@ -71,7 +71,7 @@ coreschema==0.0.4 # via # -r requirements/base.txt # coreapi -cryptography==45.0.7 +cryptography==46.0.1 # via # -r requirements/base.txt # pyjwt @@ -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 @@ -123,7 +122,7 @@ django-appconf==1.1.0 # django-statici18n django-config-models==2.9.0 # via -r requirements/base.txt -django-cors-headers==4.8.0 +django-cors-headers==4.9.0 # via -r requirements/base.txt django-crum==0.7.9 # via @@ -238,7 +237,7 @@ firebase-admin==7.1.0 # via # -r requirements/base.txt # edx-ace -gevent==25.8.2 +gevent==25.9.1 # via -r requirements/production.in google-api-core[grpc]==2.25.1 # via @@ -409,7 +408,7 @@ protobuf==6.32.1 # googleapis-common-protos # grpcio-status # proto-plus -psutil==7.0.0 +psutil==7.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -440,7 +439,7 @@ pyjwt[crypto]==2.10.1 # social-auth-core pymemcache==4.0.0 # via -r requirements/base.txt -pymongo==4.15.0 +pymongo==4.15.1 # via # -r requirements/base.txt # edx-opaque-keys @@ -532,7 +531,7 @@ sniffio==1.3.1 # via # -r requirements/base.txt # anyio -social-auth-app-django==5.4.3 +social-auth-app-django==5.5.1 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/test.txt b/requirements/test.txt index aa1176462..b6b313ba9 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -26,7 +26,7 @@ backoff==2.2.1 # via # -r requirements/base.txt # segment-analytics-python -black==25.1.0 +black==25.9.0 # via -r requirements/test.in bleach==6.2.0 # via -r requirements/base.txt @@ -56,7 +56,7 @@ charset-normalizer==3.4.3 # via # -r requirements/base.txt # requests -click==8.2.1 +click==8.3.0 # via # -r requirements/base.txt # black @@ -85,7 +85,7 @@ coreschema==0.0.4 # coreapi coverage==7.10.6 # via -r requirements/test.in -cryptography==45.0.7 +cryptography==46.0.1 # via # -r requirements/base.txt # pyjwt @@ -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 @@ -141,7 +140,7 @@ django-appconf==1.1.0 # django-statici18n django-config-models==2.9.0 # via -r requirements/base.txt -django-cors-headers==4.8.0 +django-cors-headers==4.9.0 # via -r requirements/base.txt django-crum==0.7.9 # via @@ -450,7 +449,7 @@ protobuf==6.32.1 # googleapis-common-protos # grpcio-status # proto-plus -psutil==7.0.0 +psutil==7.1.0 # via # -r requirements/base.txt # edx-django-utils @@ -497,7 +496,7 @@ pylint-plugin-utils==0.9.0 # pylint-django pymemcache==4.0.0 # via -r requirements/base.txt -pymongo==4.15.0 +pymongo==4.15.1 # via # -r requirements/base.txt # edx-opaque-keys @@ -528,6 +527,8 @@ python3-openid==3.2.0 # via # -r requirements/base.txt # social-auth-core +pytokens==0.1.10 + # via black pytz==2025.2 # via # -r requirements/base.txt @@ -598,7 +599,7 @@ sniffio==1.3.1 # via # -r requirements/base.txt # anyio -social-auth-app-django==5.4.3 +social-auth-app-django==5.5.1 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/translations.txt b/requirements/translations.txt index a4e7b02c6..141492983 100644 --- a/requirements/translations.txt +++ b/requirements/translations.txt @@ -1,15 +1,13 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade # 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.1 diff --git a/tox.ini b/tox.ini index 4fbf9e18e..b41b5163a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{3.12}-django{42,52} +envlist = py{3.12}-django{52} skipsdist = true [pytest] @@ -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 From 05159090ac388e89cb5dd2dfc3e45ad6f32c651b Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 19 Sep 2025 12:22:57 +0500 Subject: [PATCH 2/8] feat!: upgrading to django52. --- requirements/all.txt | 3 ++- requirements/base.txt | 3 ++- requirements/constraints.txt | 4 ++++ requirements/dev.txt | 3 ++- requirements/production.txt | 3 ++- requirements/test.txt | 3 ++- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index b63298d52..7628a10c6 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -831,8 +831,9 @@ sniffio==1.3.1 # -r requirements/dev.txt # -r requirements/production.txt # anyio -social-auth-app-django==5.5.1 +social-auth-app-django==5.4.3 # via + # -c requirements/constraints.txt # -r requirements/dev.txt # -r requirements/production.txt # edx-auth-backends diff --git a/requirements/base.txt b/requirements/base.txt index 91d54e1db..1463d1ab9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -385,8 +385,9 @@ six==1.17.0 # python-dateutil sniffio==1.3.1 # via anyio -social-auth-app-django==5.5.1 +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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ab0e09256..4ce49bee9 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index c995874d8..b5b343487 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -649,8 +649,9 @@ sniffio==1.3.1 # via # -r requirements/test.txt # anyio -social-auth-app-django==5.5.1 +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 diff --git a/requirements/production.txt b/requirements/production.txt index 5718a88d4..c17d567f1 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -531,8 +531,9 @@ sniffio==1.3.1 # via # -r requirements/base.txt # anyio -social-auth-app-django==5.5.1 +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 diff --git a/requirements/test.txt b/requirements/test.txt index b6b313ba9..de6daa551 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -599,8 +599,9 @@ sniffio==1.3.1 # via # -r requirements/base.txt # anyio -social-auth-app-django==5.5.1 +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 From 16c5a3d0a84d8793a7e02f87ba1f1d814fef8d8b Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 19 Sep 2025 12:54:02 +0500 Subject: [PATCH 3/8] feat!: upgrading to django52. --- requirements/all.txt | 2 -- requirements/common_constraints.txt | 15 +++++++++++++++ requirements/dev.txt | 2 -- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index 7628a10c6..e2776b89e 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -745,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 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index e5182012d..b211022f8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,6 +3,21 @@ # 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. # diff --git a/requirements/dev.txt b/requirements/dev.txt index b5b343487..aae3431ef 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -581,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 From 0fa910c1148e5c03d7f78094376e000c682917d9 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 19 Sep 2025 12:59:50 +0500 Subject: [PATCH 4/8] feat!: upgrading to django52. --- requirements/all.txt | 2 +- requirements/base.txt | 2 +- requirements/common_constraints.txt | 5 +++++ requirements/dev.txt | 2 +- requirements/docs.txt | 2 +- requirements/pip.txt | 2 +- requirements/pip_tools.txt | 2 +- requirements/production.txt | 2 +- requirements/test.txt | 2 +- requirements/translations.txt | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index e2776b89e..f4ec536ce 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/base.txt b/requirements/base.txt index 1463d1ab9..d09646766 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b211022f8..a1e5bb7f8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -18,6 +18,11 @@ # 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. # diff --git a/requirements/dev.txt b/requirements/dev.txt index aae3431ef..d04b77acf 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/docs.txt b/requirements/docs.txt index cf1cecdc3..94f325d16 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/pip.txt b/requirements/pip.txt index dabfa8f0e..476adfba8 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 514a5f658..89f06c28a 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/production.txt b/requirements/production.txt index c17d567f1..a63080a78 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/test.txt b/requirements/test.txt index de6daa551..9cd6b8fac 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/translations.txt b/requirements/translations.txt index 141492983..eee807b4a 100644 --- a/requirements/translations.txt +++ b/requirements/translations.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade From bb70d1a014b84349a6f751089cddcc543e857317 Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 19 Sep 2025 13:06:54 +0500 Subject: [PATCH 5/8] feat!: upgrading to django52. --- requirements/all.txt | 2 +- requirements/base.txt | 2 +- requirements/common_constraints.txt | 5 +++++ requirements/dev.txt | 2 +- requirements/docs.txt | 2 +- requirements/pip.txt | 2 +- requirements/pip_tools.txt | 2 +- requirements/production.txt | 2 +- requirements/test.txt | 2 +- requirements/translations.txt | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index f4ec536ce..e2776b89e 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/base.txt b/requirements/base.txt index d09646766..1463d1ab9 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index a1e5bb7f8..51e412c1d 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -23,6 +23,11 @@ # 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. # diff --git a/requirements/dev.txt b/requirements/dev.txt index d04b77acf..aae3431ef 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/docs.txt b/requirements/docs.txt index 94f325d16..cf1cecdc3 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/pip.txt b/requirements/pip.txt index 476adfba8..dabfa8f0e 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 89f06c28a..514a5f658 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/production.txt b/requirements/production.txt index a63080a78..c17d567f1 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/test.txt b/requirements/test.txt index 9cd6b8fac..de6daa551 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade diff --git a/requirements/translations.txt b/requirements/translations.txt index eee807b4a..141492983 100644 --- a/requirements/translations.txt +++ b/requirements/translations.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.12 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade From 73760dff24f3b8febb0bddc162f3bb2fc58dd2cf Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Fri, 19 Sep 2025 13:14:04 +0500 Subject: [PATCH 6/8] feat!: upgrading to django52. --- requirements/all.txt | 2 +- requirements/base.txt | 2 +- requirements/common_constraints.txt | 5 +++++ requirements/dev.txt | 2 +- requirements/docs.txt | 2 +- requirements/pip.txt | 2 +- requirements/pip_tools.txt | 2 +- requirements/production.txt | 2 +- requirements/test.txt | 2 +- requirements/translations.txt | 2 +- 10 files changed, 14 insertions(+), 9 deletions(-) diff --git a/requirements/all.txt b/requirements/all.txt index e2776b89e..f4ec536ce 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/base.txt b/requirements/base.txt index 1463d1ab9..d09646766 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 51e412c1d..81a796996 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -28,6 +28,11 @@ # 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. # diff --git a/requirements/dev.txt b/requirements/dev.txt index aae3431ef..d04b77acf 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/docs.txt b/requirements/docs.txt index cf1cecdc3..94f325d16 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/pip.txt b/requirements/pip.txt index dabfa8f0e..476adfba8 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 514a5f658..89f06c28a 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/production.txt b/requirements/production.txt index c17d567f1..a63080a78 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/test.txt b/requirements/test.txt index de6daa551..9cd6b8fac 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/translations.txt b/requirements/translations.txt index 141492983..eee807b4a 100644 --- a/requirements/translations.txt +++ b/requirements/translations.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade From 1e47bb734f77e99ffbd82f434f492e8c28c940c1 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Mon, 6 Oct 2025 16:07:28 +0500 Subject: [PATCH 7/8] chore: fix the comments in constraint file. Removed redundant comments regarding the temporary solution for overriding common_constraints.txt. --- requirements/common_constraints.txt | 30 ----------------------------- 1 file changed, 30 deletions(-) diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index 81a796996..e5182012d 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,36 +3,6 @@ # 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 - -# 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. # From 4bcf4a5a96966b77f99b8c38db2df5c650a8dc38 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Wed, 8 Oct 2025 16:18:01 +0500 Subject: [PATCH 8/8] docs: add follow up ticket in constraints Co-authored-by: Feanil Patel --- requirements/constraints.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 4ce49bee9..a9b6ba6c7 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -13,4 +13,5 @@ # greater versions are breaking 2 tests which need further investigation. +# https://github.com/openedx/credentials/issues/2873 social-auth-app-django<=5.4.3