Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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
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
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 2 additions & 4 deletions requirements/dev.txt
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
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
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
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
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
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