Skip to content
Open
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fi
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
# Make sure to compile files after any other files they include!
sed 's/Django<4.0//g' requirements/common_constraints.txt > tmp_con; cat tmp_con > requirements/common_constraints.txt; rm tmp_con
sed 's/Django<5.0//g' requirements/common_constraints.txt > tmp_con; cat tmp_con > requirements/common_constraints.txt; rm tmp_con
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
Expand Down
4 changes: 2 additions & 2 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.4.1
# Generated by edx-lint version: 5.6.0
# ------------------------------
[MASTER]
ignore = ,migrations, settings, wsgi.py
Expand Down Expand Up @@ -401,4 +401,4 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = builtins.Exception

# 3efa0bd414ae95120c9d8ac2ed13b2b5e1ed1e69
# 292413428ff48e23413cd9c4c12c0535a9127bb1
26 changes: 12 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ amqp==5.3.1
# via kombu
analytics-python==1.4.post1
# via -r requirements/base.in
asgiref==3.9.2
asgiref==3.10.0
# via
# django
# django-cors-headers
attrs==25.3.0
attrs==25.4.0
# via
# jsonschema
# referencing
Expand All @@ -24,9 +24,9 @@ billiard==4.2.2
# via celery
bleach[css]==6.2.0
# via -r requirements/base.in
boto3==1.40.44
boto3==1.40.49
# via django-ses
botocore==1.40.44
botocore==1.40.49
# via
# boto3
# s3transfer
Expand All @@ -35,7 +35,7 @@ celery==5.5.3
# -r requirements/base.in
# django-celery-results
# edx-celeryutils
certifi==2025.8.3
certifi==2025.10.5
# via requests
cffi==2.0.0
# via
Expand All @@ -60,16 +60,14 @@ click-repl==0.3.0
code-annotations==2.3.0
# via edx-toggles
cryptography==46.0.2
# via
# pyjwt
# social-auth-core
# via pyjwt
defusedxml==0.7.1
# via
# python3-openid
# social-auth-core
django==4.2.25
django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-autocomplete-light
# django-celery-results
Expand Down Expand Up @@ -110,7 +108,7 @@ django-durationwidget==1.0.5
# via -r requirements/base.in
django-extensions==4.1
# via -r requirements/base.in
django-filter==25.1
django-filter==25.2
# via -r requirements/base.in
django-log-request-id==2.1.0
# via -r requirements/base.in
Expand Down Expand Up @@ -223,7 +221,7 @@ pyjwt[crypto]==2.10.1
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pymongo==4.15.2
pymongo==4.15.3
# via edx-opaque-keys
pynacl==1.6.0
# via edx-django-utils
Expand Down Expand Up @@ -275,9 +273,9 @@ six==1.17.0
# edx-auth-backends
# edx-rbac
# python-dateutil
social-auth-app-django==5.4.3
social-auth-app-django==5.6.0
# via edx-auth-backends
social-auth-core==4.7.0
social-auth-core==4.8.1
# via
# edx-auth-backends
# social-auth-app-django
Expand Down
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@

-c common_constraints.txt

# Upgrade to django 5.2
Django<5.3

# diff-cover latest requires (pluggy>=0.13.1,<0.14.0)
# which conflicts with pytest(pluggy>=0.12,<2.0.0) and tox(pluggy>0.12) both of these fetch pluggy==1.0.0
# but diff-cover latest has a pin (pluggy<1.0.0a1)
Expand Down
29 changes: 14 additions & 15 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ amqp==5.3.1
# kombu
analytics-python==1.4.post1
# via -r requirements/validation.txt
asgiref==3.9.2
asgiref==3.10.0
# via
# -r requirements/validation.txt
# django
Expand All @@ -20,7 +20,7 @@ astroid==3.3.11
# -r requirements/validation.txt
# pylint
# pylint-celery
attrs==25.3.0
attrs==25.4.0
# via
# -r requirements/validation.txt
# jsonschema
Expand All @@ -35,11 +35,11 @@ billiard==4.2.2
# celery
bleach[css]==6.2.0
# via -r requirements/validation.txt
boto3==1.40.44
boto3==1.40.49
# via
# -r requirements/validation.txt
# django-ses
botocore==1.40.44
botocore==1.40.49
# via
# -r requirements/validation.txt
# boto3
Expand All @@ -53,7 +53,7 @@ celery==5.5.3
# -r requirements/validation.txt
# django-celery-results
# edx-celeryutils
certifi==2025.8.3
certifi==2025.10.5
# via
# -r requirements/validation.txt
# requests
Expand Down Expand Up @@ -108,7 +108,6 @@ cryptography==46.0.2
# via
# -r requirements/validation.txt
# pyjwt
# social-auth-core
ddt==1.7.2
# via
# -r requirements/dev.in
Expand All @@ -126,9 +125,9 @@ dill==0.4.0
# via
# -r requirements/validation.txt
# pylint
django==4.2.25
django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/validation.txt
# django-autocomplete-light
# django-celery-results
Expand Down Expand Up @@ -178,7 +177,7 @@ django-extensions==4.1
# via
# -r requirements/dev.in
# -r requirements/validation.txt
django-filter==25.1
django-filter==25.2
# via -r requirements/validation.txt
django-log-request-id==2.1.0
# via -r requirements/validation.txt
Expand Down Expand Up @@ -258,7 +257,7 @@ edx-toggles==5.4.1
# edx-auth-backends
factory-boy==3.3.3
# via -r requirements/validation.txt
faker==37.8.0
faker==37.11.0
# via
# -r requirements/validation.txt
# factory-boy
Expand Down Expand Up @@ -362,7 +361,7 @@ pathlib2==2.3.7.post1
# via -r requirements/validation.txt
pip-tools==7.5.1
# via -r requirements/pip-tools.txt
platformdirs==4.4.0
platformdirs==4.5.0
# via
# -r requirements/validation.txt
# pylint
Expand Down Expand Up @@ -409,7 +408,7 @@ pyjwt[crypto]==2.10.1
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==3.3.8
pylint==3.3.9
# via
# -r requirements/validation.txt
# edx-lint
Expand All @@ -429,7 +428,7 @@ pylint-plugin-utils==0.9.0
# -r requirements/validation.txt
# pylint-celery
# pylint-django
pymongo==4.15.2
pymongo==4.15.3
# via
# -r requirements/validation.txt
# edx-opaque-keys
Expand Down Expand Up @@ -525,11 +524,11 @@ snowballstemmer==3.0.1
# via
# -r requirements/validation.txt
# pydocstyle
social-auth-app-django==5.4.3
social-auth-app-django==5.6.0
# via
# -r requirements/validation.txt
# edx-auth-backends
social-auth-core==4.7.0
social-auth-core==4.8.1
# via
# -r requirements/validation.txt
# edx-auth-backends
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.25
django==5.2.7
31 changes: 15 additions & 16 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ amqp==5.3.1
# kombu
analytics-python==1.4.post1
# via -r requirements/test.txt
asgiref==3.9.2
asgiref==3.10.0
# via
# -r requirements/test.txt
# django
Expand All @@ -24,7 +24,7 @@ astroid==3.3.11
# -r requirements/test.txt
# pylint
# pylint-celery
attrs==25.3.0
attrs==25.4.0
# via
# -r requirements/test.txt
# jsonschema
Expand All @@ -45,11 +45,11 @@ billiard==4.2.2
# celery
bleach[css]==6.2.0
# via -r requirements/test.txt
boto3==1.40.44
boto3==1.40.49
# via
# -r requirements/test.txt
# django-ses
botocore==1.40.44
botocore==1.40.49
# via
# -r requirements/test.txt
# boto3
Expand All @@ -59,7 +59,7 @@ celery==5.5.3
# -r requirements/test.txt
# django-celery-results
# edx-celeryutils
certifi==2025.8.3
certifi==2025.10.5
# via
# -r requirements/test.txt
# requests
Expand Down Expand Up @@ -112,7 +112,6 @@ cryptography==46.0.2
# via
# -r requirements/test.txt
# pyjwt
# social-auth-core
ddt==1.7.2
# via -r requirements/test.txt
defusedxml==0.7.1
Expand All @@ -124,9 +123,9 @@ dill==0.4.0
# via
# -r requirements/test.txt
# pylint
django==4.2.25
django==5.2.7
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/test.txt
# django-autocomplete-light
# django-celery-results
Expand Down Expand Up @@ -170,7 +169,7 @@ django-dynamic-fixture==4.0.1
# via -r requirements/test.txt
django-extensions==4.1
# via -r requirements/test.txt
django-filter==25.1
django-filter==25.2
# via -r requirements/test.txt
django-log-request-id==2.1.0
# via -r requirements/test.txt
Expand Down Expand Up @@ -257,7 +256,7 @@ edx-toggles==5.4.1
# edx-auth-backends
factory-boy==3.3.3
# via -r requirements/test.txt
faker==37.8.0
faker==37.11.0
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -321,7 +320,7 @@ monotonic==1.6
# analytics-python
mysqlclient==2.2.7
# via -r requirements/test.txt
nh3==0.3.0
nh3==0.3.1
# via readme-renderer
oauthlib==3.3.1
# via
Expand All @@ -335,7 +334,7 @@ packaging==25.0
# pydata-sphinx-theme
# pytest
# sphinx
platformdirs==4.4.0
platformdirs==4.5.0
# via
# -r requirements/test.txt
# pylint
Expand Down Expand Up @@ -379,7 +378,7 @@ pyjwt[crypto]==2.10.1
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==3.3.8
pylint==3.3.9
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -399,7 +398,7 @@ pylint-plugin-utils==0.9.0
# -r requirements/test.txt
# pylint-celery
# pylint-django
pymongo==4.15.2
pymongo==4.15.3
# via
# -r requirements/test.txt
# edx-opaque-keys
Expand Down Expand Up @@ -491,11 +490,11 @@ six==1.17.0
# python-dateutil
snowballstemmer==3.0.1
# via sphinx
social-auth-app-django==5.4.3
social-auth-app-django==5.6.0
# via
# -r requirements/test.txt
# edx-auth-backends
social-auth-core==4.7.0
social-auth-core==4.8.1
# via
# -r requirements/test.txt
# edx-auth-backends
Expand Down
Loading