From ae8996f68bcf4d029d28686e22b67ec10878ce1b Mon Sep 17 00:00:00 2001 From: awais qureshi Date: Tue, 16 Sep 2025 12:02:43 +0500 Subject: [PATCH 1/4] feat!: Upgrading to `django52`. --- requirements/constraints.txt | 4 -- requirements/edx-sandbox/base.txt | 6 +-- requirements/edx/base.txt | 25 ++++++----- requirements/edx/development.txt | 43 +++++++++---------- requirements/edx/doc.txt | 25 ++++++----- requirements/edx/semgrep.txt | 2 +- requirements/edx/testing.txt | 33 +++++++------- scripts/user_retirement/requirements/base.txt | 23 +++++----- .../user_retirement/requirements/testing.txt | 24 +++++------ 9 files changed, 88 insertions(+), 97 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e0543146ff..4c95925bcc 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -19,10 +19,6 @@ # Issue for unpinning: https://github.com/openedx/edx-platform/issues/35280 celery>=5.2.2,<6.0.0 -# Date: 2024-02-02 -# Stay on LTS version, remove once this is added to common constraint -Django<5.0 - # Date: 2020-02-10 # django-oauth-toolkit version >=2.0.0 has breaking changes. More details # mentioned on this issue https://github.com/openedx/edx-platform/issues/32884 diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 4b5fd28677..d1bb7ca61c 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -60,9 +60,9 @@ packaging==25.0 # via matplotlib pillow==11.3.0 # via matplotlib -pycparser==2.22 +pycparser==2.23 # via cffi -pyparsing==3.2.3 +pyparsing==3.2.4 # via # -r requirements/edx-sandbox/base.in # chem @@ -74,7 +74,7 @@ random2==1.0.2 # via -r requirements/edx-sandbox/base.in regex==2025.9.1 # via nltk -scipy==1.16.1 +scipy==1.16.2 # via # -r requirements/edx-sandbox/base.in # chem diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index c28f8e68cd..e37dd0652e 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -70,14 +70,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/kernel.in -boto3==1.40.26 +boto3==1.40.31 # via # -r requirements/edx/kernel.in # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.26 +botocore==1.40.31 # via # -r requirements/edx/kernel.in # boto3 @@ -169,9 +169,8 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -django==4.2.24 +django==5.2.6 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in # django-appconf # django-autocomplete-light @@ -620,7 +619,7 @@ google-cloud-core==2.4.3 # google-cloud-storage google-cloud-firestore==2.21.0 # via firebase-admin -google-cloud-storage==3.3.1 +google-cloud-storage==3.4.0 # via firebase-admin google-crc32c==1.7.1 # via @@ -898,7 +897,7 @@ proto-plus==1.26.1 # via # google-api-core # google-cloud-firestore -protobuf==6.32.0 +protobuf==6.32.1 # via # google-api-core # google-cloud-firestore @@ -918,14 +917,14 @@ pyasn1-modules==0.4.2 # via google-auth pycountry==24.6.1 # via -r requirements/edx/kernel.in -pycparser==2.22 +pycparser==2.23 # via cffi pycryptodomex==3.23.0 # via # -r requirements/edx/kernel.in # edx-proctoring # lti-consumer-xblock -pydantic==2.11.7 +pydantic==2.11.9 # via camel-converter pydantic-core==2.33.2 # via pydantic @@ -956,15 +955,15 @@ pymongo==4.4.0 # event-tracking # mongoengine # openedx-forum -pynacl==1.5.0 +pynacl==1.6.0 # via # edx-django-utils # paramiko pynliner==0.8.0 # via -r requirements/edx/kernel.in -pyopenssl==25.1.0 +pyopenssl==25.2.0 # via snowflake-connector-python -pyparsing==3.2.3 +pyparsing==3.2.4 # via # chem # openedx-calc @@ -1082,11 +1081,11 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.13.1 +s3transfer==0.14.0 # via boto3 sailthru-client==2.2.3 # via edx-ace -scipy==1.16.1 +scipy==1.16.2 # via chem semantic-version==2.10.0 # via edx-drf-extensions diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 1096e5a455..5ec53a2b1d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -140,7 +140,7 @@ boto==2.49.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -boto3==1.40.26 +boto3==1.40.31 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -148,7 +148,7 @@ boto3==1.40.26 # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.26 +botocore==1.40.31 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -335,9 +335,8 @@ distlib==0.4.0 # via # -r requirements/edx/testing.txt # virtualenv -django==4.2.24 +django==5.2.6 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-appconf @@ -586,12 +585,12 @@ django-storages==1.14.6 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edxval -django-stubs[compatible-mypy]==5.2.2 +django-stubs[compatible-mypy]==5.2.5 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/development.in # djangorestframework-stubs -django-stubs-ext==5.2.2 +django-stubs-ext==5.2.5 # via django-stubs django-user-tasks==3.4.3 # via @@ -899,7 +898,7 @@ execnet==2.1.1 # pytest-xdist factory-boy==3.3.3 # via -r requirements/edx/testing.txt -faker==37.6.0 +faker==37.8.0 # via # -r requirements/edx/testing.txt # factory-boy @@ -985,7 +984,7 @@ google-cloud-firestore==2.21.0 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # firebase-admin -google-cloud-storage==3.3.1 +google-cloud-storage==3.4.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1086,7 +1085,7 @@ imagesize==1.4.1 # via # -r requirements/edx/doc.txt # sphinx -import-linter==2.4 +import-linter==2.5 # via -r requirements/edx/testing.txt importlib-metadata==8.7.0 # via @@ -1302,7 +1301,7 @@ multidict==6.6.4 # -r requirements/edx/testing.txt # aiohttp # yarl -mypy==1.17.1 +mypy==1.18.1 # via # -r requirements/edx/development.in # django-stubs @@ -1513,7 +1512,7 @@ proto-plus==1.26.1 # -r requirements/edx/testing.txt # google-api-core # google-cloud-firestore -protobuf==6.32.0 +protobuf==6.32.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1551,7 +1550,7 @@ pycountry==24.6.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pycparser==2.22 +pycparser==2.23 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1562,7 +1561,7 @@ pycryptodomex==3.23.0 # -r requirements/edx/testing.txt # edx-proctoring # lti-consumer-xblock -pydantic==2.11.7 +pydantic==2.11.9 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1645,7 +1644,7 @@ pymongo==4.4.0 # event-tracking # mongoengine # openedx-forum -pynacl==1.5.0 +pynacl==1.6.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1655,12 +1654,12 @@ pynliner==0.8.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -pyopenssl==25.1.0 +pyopenssl==25.2.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # snowflake-connector-python -pyparsing==3.2.3 +pyparsing==3.2.4 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1700,7 +1699,7 @@ pytest==8.2.0 # pytest-xdist pytest-attrib==0.1.3 # via -r requirements/edx/testing.txt -pytest-cov==6.3.0 +pytest-cov==7.0.0 # via -r requirements/edx/testing.txt pytest-django==4.11.1 # via -r requirements/edx/testing.txt @@ -1710,7 +1709,7 @@ pytest-metadata==3.1.1 # via # -r requirements/edx/testing.txt # pytest-json-report -pytest-randomly==3.16.0 +pytest-randomly==4.0.1 # via -r requirements/edx/testing.txt pytest-xdist[psutil]==3.8.0 # via -r requirements/edx/testing.txt @@ -1870,7 +1869,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.13.1 +s3transfer==0.14.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1880,7 +1879,7 @@ sailthru-client==2.2.3 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-ace -scipy==1.16.1 +scipy==1.16.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -2098,11 +2097,11 @@ tqdm==4.67.1 # -r requirements/edx/testing.txt # nltk # openai -types-pyyaml==6.0.12.20250822 +types-pyyaml==6.0.12.20250915 # via # django-stubs # djangorestframework-stubs -types-requests==2.32.4.20250809 +types-requests==2.32.4.20250913 # via djangorestframework-stubs typing-extensions==4.15.0 # via diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 13dc4c5c26..3a30e50ba4 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -105,14 +105,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.40.26 +boto3==1.40.31 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.26 +botocore==1.40.31 # via # -r requirements/edx/base.txt # boto3 @@ -227,9 +227,8 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -django==4.2.24 +django==5.2.6 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # django-appconf # django-autocomplete-light @@ -725,7 +724,7 @@ google-cloud-firestore==2.21.0 # via # -r requirements/edx/base.txt # firebase-admin -google-cloud-storage==3.3.1 +google-cloud-storage==3.4.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -1090,7 +1089,7 @@ proto-plus==1.26.1 # -r requirements/edx/base.txt # google-api-core # google-cloud-firestore -protobuf==6.32.0 +protobuf==6.32.1 # via # -r requirements/edx/base.txt # google-api-core @@ -1114,7 +1113,7 @@ pyasn1-modules==0.4.2 # google-auth pycountry==24.6.1 # via -r requirements/edx/base.txt -pycparser==2.22 +pycparser==2.23 # via # -r requirements/edx/base.txt # cffi @@ -1123,7 +1122,7 @@ pycryptodomex==3.23.0 # -r requirements/edx/base.txt # edx-proctoring # lti-consumer-xblock -pydantic==2.11.7 +pydantic==2.11.9 # via # -r requirements/edx/base.txt # camel-converter @@ -1168,18 +1167,18 @@ pymongo==4.4.0 # event-tracking # mongoengine # openedx-forum -pynacl==1.5.0 +pynacl==1.6.0 # via # -r requirements/edx/base.txt # edx-django-utils # paramiko pynliner==0.8.0 # via -r requirements/edx/base.txt -pyopenssl==25.1.0 +pyopenssl==25.2.0 # via # -r requirements/edx/base.txt # snowflake-connector-python -pyparsing==3.2.3 +pyparsing==3.2.4 # via # -r requirements/edx/base.txt # chem @@ -1318,7 +1317,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.13.1 +s3transfer==0.14.0 # via # -r requirements/edx/base.txt # boto3 @@ -1326,7 +1325,7 @@ sailthru-client==2.2.3 # via # -r requirements/edx/base.txt # edx-ace -scipy==1.16.1 +scipy==1.16.2 # via # -r requirements/edx/base.txt # chem diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt index e5fe1dc79f..aec4c59acb 100644 --- a/requirements/edx/semgrep.txt +++ b/requirements/edx/semgrep.txt @@ -113,7 +113,7 @@ ruamel-yaml==0.18.15 # via semgrep ruamel-yaml-clib==0.2.12 # via ruamel-yaml -semgrep==1.135.0 +semgrep==1.136.0 # via -r requirements/edx/semgrep.in tomli==2.0.2 # via semgrep diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 29f63b9366..b9a53d6a2a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -102,14 +102,14 @@ bleach[css]==6.2.0 # xblock-poll boto==2.49.0 # via -r requirements/edx/base.txt -boto3==1.40.26 +boto3==1.40.31 # via # -r requirements/edx/base.txt # django-ses # fs-s3fs # ora2 # snowflake-connector-python -botocore==1.40.26 +botocore==1.40.31 # via # -r requirements/edx/base.txt # boto3 @@ -253,9 +253,8 @@ dill==0.4.0 # via pylint distlib==0.4.0 # via virtualenv -django==4.2.24 +django==5.2.6 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # django-appconf # django-autocomplete-light @@ -694,7 +693,7 @@ execnet==2.1.1 # via pytest-xdist factory-boy==3.3.3 # via -r requirements/edx/testing.in -faker==37.6.0 +faker==37.8.0 # via factory-boy fastapi==0.116.1 # via pact-python @@ -756,7 +755,7 @@ google-cloud-firestore==2.21.0 # via # -r requirements/edx/base.txt # firebase-admin -google-cloud-storage==3.3.1 +google-cloud-storage==3.4.0 # via # -r requirements/edx/base.txt # firebase-admin @@ -831,7 +830,7 @@ idna==3.10 # requests # snowflake-connector-python # yarl -import-linter==2.4 +import-linter==2.5 # via -r requirements/edx/testing.in importlib-metadata==8.7.0 # via -r requirements/edx/base.txt @@ -1147,7 +1146,7 @@ proto-plus==1.26.1 # -r requirements/edx/base.txt # google-api-core # google-cloud-firestore -protobuf==6.32.0 +protobuf==6.32.1 # via # -r requirements/edx/base.txt # google-api-core @@ -1179,7 +1178,7 @@ pycodestyle==2.8.0 # -r requirements/edx/testing.in pycountry==24.6.1 # via -r requirements/edx/base.txt -pycparser==2.22 +pycparser==2.23 # via # -r requirements/edx/base.txt # cffi @@ -1188,7 +1187,7 @@ pycryptodomex==3.23.0 # -r requirements/edx/base.txt # edx-proctoring # lti-consumer-xblock -pydantic==2.11.7 +pydantic==2.11.9 # via # -r requirements/edx/base.txt # camel-converter @@ -1247,18 +1246,18 @@ pymongo==4.4.0 # event-tracking # mongoengine # openedx-forum -pynacl==1.5.0 +pynacl==1.6.0 # via # -r requirements/edx/base.txt # edx-django-utils # paramiko pynliner==0.8.0 # via -r requirements/edx/base.txt -pyopenssl==25.1.0 +pyopenssl==25.2.0 # via # -r requirements/edx/base.txt # snowflake-connector-python -pyparsing==3.2.3 +pyparsing==3.2.4 # via # -r requirements/edx/base.txt # chem @@ -1288,7 +1287,7 @@ pytest==8.2.0 # pytest-xdist pytest-attrib==0.1.3 # via -r requirements/edx/testing.in -pytest-cov==6.3.0 +pytest-cov==7.0.0 # via -r requirements/edx/testing.in pytest-django==4.11.1 # via -r requirements/edx/testing.in @@ -1298,7 +1297,7 @@ pytest-metadata==3.1.1 # via # -r requirements/edx/testing.in # pytest-json-report -pytest-randomly==3.16.0 +pytest-randomly==4.0.1 # via -r requirements/edx/testing.in pytest-xdist[psutil]==3.8.0 # via -r requirements/edx/testing.in @@ -1425,7 +1424,7 @@ rules==3.5 # edx-enterprise # edx-proctoring # openedx-learning -s3transfer==0.13.1 +s3transfer==0.14.0 # via # -r requirements/edx/base.txt # boto3 @@ -1433,7 +1432,7 @@ sailthru-client==2.2.3 # via # -r requirements/edx/base.txt # edx-ace -scipy==1.16.1 +scipy==1.16.2 # via # -r requirements/edx/base.txt # chem diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 8b576aead5..205a449ffd 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -10,9 +10,9 @@ attrs==25.3.0 # via zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.in -boto3==1.40.26 +boto3==1.40.31 # via -r scripts/user_retirement/requirements/base.in -botocore==1.40.26 +botocore==1.40.31 # via # boto3 # s3transfer @@ -32,9 +32,8 @@ click==8.2.1 # edx-django-utils cryptography==45.0.7 # via pyjwt -django==4.2.24 +django==5.2.6 # via - # -c scripts/user_retirement/requirements/../../../requirements/constraints.txt # django-crum # django-waffle # edx-django-utils @@ -59,7 +58,7 @@ google-auth-httplib2==0.2.0 # via google-api-python-client googleapis-common-protos==1.70.0 # via google-api-core -httplib2==0.30.0 +httplib2==0.31.0 # via # google-api-python-client # google-auth-httplib2 @@ -67,7 +66,7 @@ idna==3.10 # via requests isodate==0.7.2 # via zeep -jenkinsapi==0.3.15 +jenkinsapi==0.3.16 # via -r scripts/user_retirement/requirements/base.in jmespath==1.0.1 # via @@ -83,7 +82,7 @@ platformdirs==4.4.0 # via zeep proto-plus==1.26.1 # via google-api-core -protobuf==6.32.0 +protobuf==6.32.1 # via # google-api-core # googleapis-common-protos @@ -96,15 +95,15 @@ pyasn1==0.6.1 # rsa pyasn1-modules==0.4.2 # via google-auth -pycparser==2.22 +pycparser==2.23 # via cffi pyjwt[crypto]==2.10.1 # via # edx-rest-api-client # simple-salesforce -pynacl==1.5.0 +pynacl==1.6.0 # via edx-django-utils -pyparsing==3.2.3 +pyparsing==3.2.4 # via httplib2 python-dateutil==2.9.0.post0 # via botocore @@ -130,7 +129,7 @@ requests-toolbelt==1.0.0 # via zeep rsa==4.9.1 # via google-auth -s3transfer==0.13.1 +s3transfer==0.14.0 # via boto3 simple-salesforce==1.12.9 # via -r scripts/user_retirement/requirements/base.in @@ -152,5 +151,5 @@ urllib3==2.5.0 # via # botocore # requests -zeep==4.3.1 +zeep==4.3.2 # via simple-salesforce diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index f5b98650f3..ff8bf18e61 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -14,11 +14,11 @@ attrs==25.3.0 # zeep backoff==2.2.1 # via -r scripts/user_retirement/requirements/base.txt -boto3==1.40.26 +boto3==1.40.31 # via # -r scripts/user_retirement/requirements/base.txt # moto -botocore==1.40.26 +botocore==1.40.31 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -52,7 +52,7 @@ cryptography==45.0.7 # pyjwt ddt==1.7.2 # via -r scripts/user_retirement/requirements/testing.in -django==4.2.24 +django==5.2.6 # via # -r scripts/user_retirement/requirements/base.txt # django-crum @@ -92,7 +92,7 @@ googleapis-common-protos==1.70.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core -httplib2==0.30.0 +httplib2==0.31.0 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client @@ -107,7 +107,7 @@ isodate==0.7.2 # via # -r scripts/user_retirement/requirements/base.txt # zeep -jenkinsapi==0.3.15 +jenkinsapi==0.3.16 # via -r scripts/user_retirement/requirements/base.txt jinja2==3.1.6 # via moto @@ -144,7 +144,7 @@ proto-plus==1.26.1 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core -protobuf==6.32.0 +protobuf==6.32.1 # via # -r scripts/user_retirement/requirements/base.txt # google-api-core @@ -163,7 +163,7 @@ pyasn1-modules==0.4.2 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -pycparser==2.22 +pycparser==2.23 # via # -r scripts/user_retirement/requirements/base.txt # cffi @@ -174,11 +174,11 @@ pyjwt[crypto]==2.10.1 # -r scripts/user_retirement/requirements/base.txt # edx-rest-api-client # simple-salesforce -pynacl==1.5.0 +pynacl==1.6.0 # via # -r scripts/user_retirement/requirements/base.txt # edx-django-utils -pyparsing==3.2.3 +pyparsing==3.2.4 # via # -r scripts/user_retirement/requirements/base.txt # httplib2 @@ -229,7 +229,7 @@ rsa==4.9.1 # via # -r scripts/user_retirement/requirements/base.txt # google-auth -s3transfer==0.13.1 +s3transfer==0.14.0 # via # -r scripts/user_retirement/requirements/base.txt # boto3 @@ -268,9 +268,9 @@ urllib3==2.5.0 # responses werkzeug==3.1.3 # via moto -xmltodict==0.15.1 +xmltodict==1.0.0 # via moto -zeep==4.3.1 +zeep==4.3.2 # via # -r scripts/user_retirement/requirements/base.txt # simple-salesforce From 990f29f9067844712be97db2318a8bc200e482c4 Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Wed, 24 Sep 2025 16:29:56 +0500 Subject: [PATCH 2/4] chore: Run unit tests only pinned which is 5.2 Removed Django version '5.2' from the workflow. --- .github/workflows/unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 81f65eda77..2a2669bc68 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -22,7 +22,6 @@ jobs: - "3.11" django-version: - "pinned" - - "5.2" # When updating the shards, remember to make the same changes in # .github/workflows/unit-tests-gh-hosted.yml shard_name: From 0c8e35415d17776d3bd71ab50ae0cc5845a9b932 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 7 Oct 2025 09:43:50 +0500 Subject: [PATCH 3/4] fix: add Djang<6.0 local constraint --- requirements/constraints.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 292b897f9e..8ae221c9da 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -13,6 +13,10 @@ # This file contains all common constraints for edx-repos -c common_constraints.txt +# Date: 2025-10-07 +# Stay on LTS version, remove once this is added to common constraint +Django<6.0 + # Date: 2020-02-26 # As it is not clarified what exact breaking changes will be introduced as per # the next major release, ensure the installed version is within boundaries. From 9bf7dfa7580c8631aff5af71896906f34f545ec9 Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 7 Oct 2025 09:57:41 +0500 Subject: [PATCH 4/4] chore: python requirements upgrade --- requirements/edx/base.txt | 7 ++++--- requirements/edx/development.txt | 7 ++++--- requirements/edx/doc.txt | 7 ++++--- requirements/edx/testing.txt | 7 ++++--- scripts/user_retirement/requirements/base.txt | 6 ++++-- scripts/user_retirement/requirements/testing.txt | 2 +- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e1d98bce49..be367e3d89 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -167,8 +167,9 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -django==5.2.6 +django==5.2.7 # via + # -c requirements/constraints.txt # -r requirements/edx/kernel.in # django-appconf # django-autocomplete-light @@ -276,7 +277,7 @@ django-fernet-fields-v2==0.9 # via # edx-enterprise # enterprise-integrated-channels -django-filter==25.1 +django-filter==25.2 # via # -r requirements/edx/kernel.in # edx-enterprise @@ -780,7 +781,7 @@ mysqlclient==2.2.7 # via # -r requirements/edx/kernel.in # openedx-forum -nh3==0.3.0 +nh3==0.3.1 # via # -r requirements/edx/kernel.in # xblocks-contrib diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index e13ceca677..136ae43a6f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -331,8 +331,9 @@ distlib==0.4.0 # via # -r requirements/edx/testing.txt # virtualenv -django==5.2.6 +django==5.2.7 # via + # -c requirements/constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # django-appconf @@ -468,7 +469,7 @@ django-fernet-fields-v2==0.9 # -r requirements/edx/testing.txt # edx-enterprise # enterprise-integrated-channels -django-filter==25.1 +django-filter==25.2 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt @@ -1306,7 +1307,7 @@ mysqlclient==2.2.7 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # openedx-forum -nh3==0.3.0 +nh3==0.3.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index f843ead54e..6310ee6cec 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -225,8 +225,9 @@ defusedxml==0.7.1 # ora2 # python3-openid # social-auth-core -django==5.2.6 +django==5.2.7 # via + # -c requirements/constraints.txt # -r requirements/edx/base.txt # django-appconf # django-autocomplete-light @@ -341,7 +342,7 @@ django-fernet-fields-v2==0.9 # -r requirements/edx/base.txt # edx-enterprise # enterprise-integrated-channels -django-filter==25.1 +django-filter==25.2 # via # -r requirements/edx/base.txt # edx-enterprise @@ -949,7 +950,7 @@ mysqlclient==2.2.7 # via # -r requirements/edx/base.txt # openedx-forum -nh3==0.3.0 +nh3==0.3.1 # via # -r requirements/edx/base.txt # xblocks-contrib diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 21946d8e57..895c92da1c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -251,8 +251,9 @@ dill==0.4.0 # via pylint distlib==0.4.0 # via virtualenv -django==5.2.6 +django==5.2.7 # via + # -c requirements/constraints.txt # -r requirements/edx/base.txt # django-appconf # django-autocomplete-light @@ -367,7 +368,7 @@ django-fernet-fields-v2==0.9 # -r requirements/edx/base.txt # edx-enterprise # enterprise-integrated-channels -django-filter==25.1 +django-filter==25.2 # via # -r requirements/edx/base.txt # edx-enterprise @@ -994,7 +995,7 @@ mysqlclient==2.2.7 # via # -r requirements/edx/base.txt # openedx-forum -nh3==0.3.0 +nh3==0.3.1 # via # -r requirements/edx/base.txt # xblocks-contrib diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 7aeb62d428..0507348b22 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -31,8 +31,10 @@ click==8.3.0 # -r scripts/user_retirement/requirements/base.in # edx-django-utils cryptography==45.0.7 - # via pyjwt -django==5.2.6 + # via + # -c requirements/constraints.txt + # pyjwt +django==5.2.7 # via # -c requirements/constraints.txt # django-crum diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index b582e229f8..01ba9d65a4 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -52,7 +52,7 @@ cryptography==45.0.7 # pyjwt ddt==1.7.2 # via -r scripts/user_retirement/requirements/testing.in -django==5.2.6 +django==5.2.7 # via # -r scripts/user_retirement/requirements/base.txt # django-crum