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 df3e56072..b6ebe83ca 100644 --- a/requirements/all.txt +++ b/requirements/all.txt @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/base.txt b/requirements/base.txt index 435968519..5f00a33c0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 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/constraints.txt b/requirements/constraints.txt index ab0e09256..a9b6ba6c7 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,8 @@ # Common constraints for edx repos -c common_constraints.txt + + +# greater versions are breaking 2 tests which need further investigation. +# https://github.com/openedx/credentials/issues/2873 +social-auth-app-django<=5.4.3 diff --git a/requirements/dev.txt b/requirements/dev.txt index 1a0d261dc..326d5495a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 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/production.txt b/requirements/production.txt index d30a60ca8..4a4d1cee8 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -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 @@ -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 @@ -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 diff --git a/requirements/test.txt b/requirements/test.txt index 6e337acaf..7a351bd6f 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -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 @@ -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 diff --git a/requirements/translations.txt b/requirements/translations.txt index ca7cff819..edeb012be 100644 --- a/requirements/translations.txt +++ b/requirements/translations.txt @@ -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 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