diff --git a/Makefile b/Makefile index 7cc7af86..42d39ce0 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/pylintrc b/pylintrc index 290f0fb3..06c46572 100644 --- a/pylintrc +++ b/pylintrc @@ -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 @@ -401,4 +401,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = builtins.Exception -# 3efa0bd414ae95120c9d8ac2ed13b2b5e1ed1e69 +# 292413428ff48e23413cd9c4c12c0535a9127bb1 diff --git a/requirements/base.txt b/requirements/base.txt index 244b5ee0..cc8cfd93 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b9035164..8e275f63 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -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 diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 2a94fe6a..b0f88614 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -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) diff --git a/requirements/dev.txt b/requirements/dev.txt index 9db6c602..a714157a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/django.txt b/requirements/django.txt index d17004c3..9109eb20 100644 --- a/requirements/django.txt +++ b/requirements/django.txt @@ -1 +1 @@ -django==4.2.25 +django==5.2.7 diff --git a/requirements/doc.txt b/requirements/doc.txt index e889eaa7..e9ce0584 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/production.txt b/requirements/production.txt index fb367411..31b2250a 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -10,12 +10,12 @@ amqp==5.3.1 # kombu analytics-python==1.4.post1 # via -r requirements/base.txt -asgiref==3.9.2 +asgiref==3.10.0 # via # -r requirements/base.txt # django # django-cors-headers -attrs==25.3.0 +attrs==25.4.0 # via # -r requirements/base.txt # jsonschema @@ -30,11 +30,11 @@ billiard==4.2.2 # celery bleach[css]==6.2.0 # via -r requirements/base.txt -boto3==1.40.44 +boto3==1.40.49 # via # -r requirements/base.txt # django-ses -botocore==1.40.44 +botocore==1.40.49 # via # -r requirements/base.txt # boto3 @@ -44,7 +44,7 @@ celery==5.5.3 # -r requirements/base.txt # django-celery-results # edx-celeryutils -certifi==2025.8.3 +certifi==2025.10.5 # via # -r requirements/base.txt # requests @@ -86,15 +86,14 @@ cryptography==46.0.2 # via # -r requirements/base.txt # pyjwt - # social-auth-core defusedxml==0.7.1 # via # -r requirements/base.txt # 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.txt # django-autocomplete-light # django-celery-results @@ -136,7 +135,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.txt django-extensions==4.1 # via -r requirements/base.txt -django-filter==25.1 +django-filter==25.2 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -295,7 +294,7 @@ pyjwt[crypto]==2.10.1 # social-auth-core pymemcache==4.0.0 # via -r requirements/production.in -pymongo==4.15.2 +pymongo==4.15.3 # via # -r requirements/base.txt # edx-opaque-keys @@ -370,11 +369,11 @@ 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 # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.7.0 +social-auth-core==4.8.1 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/quality.txt b/requirements/quality.txt index fb7dc511..b3a54383 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -10,7 +10,7 @@ amqp==5.3.1 # kombu analytics-python==1.4.post1 # via -r requirements/base.txt -asgiref==3.9.2 +asgiref==3.10.0 # via # -r requirements/base.txt # django @@ -19,7 +19,7 @@ astroid==3.3.11 # via # pylint # pylint-celery -attrs==25.3.0 +attrs==25.4.0 # via # -r requirements/base.txt # jsonschema @@ -34,11 +34,11 @@ billiard==4.2.2 # celery bleach[css]==6.2.0 # via -r requirements/base.txt -boto3==1.40.44 +boto3==1.40.49 # via # -r requirements/base.txt # django-ses -botocore==1.40.44 +botocore==1.40.49 # via # -r requirements/base.txt # boto3 @@ -48,7 +48,7 @@ celery==5.5.3 # -r requirements/base.txt # django-celery-results # edx-celeryutils -certifi==2025.8.3 +certifi==2025.10.5 # via # -r requirements/base.txt # requests @@ -95,7 +95,6 @@ cryptography==46.0.2 # via # -r requirements/base.txt # pyjwt - # social-auth-core defusedxml==0.7.1 # via # -r requirements/base.txt @@ -103,9 +102,9 @@ defusedxml==0.7.1 # social-auth-core dill==0.4.0 # via pylint -django==4.2.25 +django==5.2.7 # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-autocomplete-light # django-celery-results @@ -147,7 +146,7 @@ django-durationwidget==1.0.5 # via -r requirements/base.txt django-extensions==4.1 # via -r requirements/base.txt -django-filter==25.1 +django-filter==25.2 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -281,7 +280,7 @@ packaging==25.0 # via # -r requirements/base.txt # kombu -platformdirs==4.4.0 +platformdirs==4.5.0 # via pylint ply==3.11 # via @@ -311,7 +310,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 # edx-lint # pylint-celery @@ -325,7 +324,7 @@ pylint-plugin-utils==0.9.0 # via # pylint-celery # pylint-django -pymongo==4.15.2 +pymongo==4.15.3 # via # -r requirements/base.txt # edx-opaque-keys @@ -400,11 +399,11 @@ six==1.17.0 # python-dateutil snowballstemmer==3.0.1 # via pydocstyle -social-auth-app-django==5.4.3 +social-auth-app-django==5.6.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.7.0 +social-auth-core==4.8.1 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/test.txt b/requirements/test.txt index 77c53e4b..270256a1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -10,7 +10,7 @@ amqp==5.3.1 # kombu analytics-python==1.4.post1 # via -r requirements/base.txt -asgiref==3.9.2 +asgiref==3.10.0 # via # -r requirements/base.txt # django @@ -19,7 +19,7 @@ astroid==3.3.11 # via # pylint # pylint-celery -attrs==25.3.0 +attrs==25.4.0 # via # -r requirements/base.txt # jsonschema @@ -34,11 +34,11 @@ billiard==4.2.2 # celery bleach[css]==6.2.0 # via -r requirements/base.txt -boto3==1.40.44 +boto3==1.40.49 # via # -r requirements/base.txt # django-ses -botocore==1.40.44 +botocore==1.40.49 # via # -r requirements/base.txt # boto3 @@ -48,7 +48,7 @@ celery==5.5.3 # -r requirements/base.txt # django-celery-results # edx-celeryutils -certifi==2025.8.3 +certifi==2025.10.5 # via # -r requirements/base.txt # requests @@ -100,7 +100,6 @@ cryptography==46.0.2 # via # -r requirements/base.txt # pyjwt - # social-auth-core ddt==1.7.2 # via -r requirements/test.in defusedxml==0.7.1 @@ -111,7 +110,7 @@ defusedxml==0.7.1 dill==0.4.0 # via pylint # via - # -c requirements/common_constraints.txt + # -c requirements/constraints.txt # -r requirements/base.txt # django-autocomplete-light # django-celery-results @@ -155,7 +154,7 @@ django-dynamic-fixture==4.0.1 # via -r requirements/test.in django-extensions==4.1 # via -r requirements/base.txt -django-filter==25.1 +django-filter==25.2 # via -r requirements/base.txt django-log-request-id==2.1.0 # via -r requirements/base.txt @@ -233,7 +232,7 @@ edx-toggles==5.4.1 # edx-auth-backends factory-boy==3.3.3 # via -r requirements/test.in -faker==37.8.0 +faker==37.11.0 # via factory-boy freezegun==1.5.5 # via -r requirements/test.in @@ -296,7 +295,7 @@ packaging==25.0 # -r requirements/base.txt # kombu # pytest -platformdirs==4.4.0 +platformdirs==4.5.0 # via pylint pluggy==1.6.0 # via @@ -328,7 +327,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 # edx-lint # pylint-celery @@ -342,7 +341,7 @@ pylint-plugin-utils==0.9.0 # via # pylint-celery # pylint-django -pymongo==4.15.2 +pymongo==4.15.3 # via # -r requirements/base.txt # edx-opaque-keys @@ -424,11 +423,11 @@ six==1.17.0 # edx-lint # edx-rbac # python-dateutil -social-auth-app-django==5.4.3 +social-auth-app-django==5.6.0 # via # -r requirements/base.txt # edx-auth-backends -social-auth-core==4.7.0 +social-auth-core==4.8.1 # via # -r requirements/base.txt # edx-auth-backends diff --git a/requirements/validation.txt b/requirements/validation.txt index aaee6a3b..2d8cb1df 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -13,7 +13,7 @@ analytics-python==1.4.post1 # via # -r requirements/quality.txt # -r requirements/test.txt -asgiref==3.9.2 +asgiref==3.10.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -25,7 +25,7 @@ astroid==3.3.11 # -r requirements/test.txt # pylint # pylint-celery -attrs==25.3.0 +attrs==25.4.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -45,12 +45,12 @@ bleach[css]==6.2.0 # via # -r requirements/quality.txt # -r requirements/test.txt -boto3==1.40.44 +boto3==1.40.49 # via # -r requirements/quality.txt # -r requirements/test.txt # django-ses -botocore==1.40.44 +botocore==1.40.49 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -62,7 +62,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/quality.txt # -r requirements/test.txt @@ -125,7 +125,6 @@ cryptography==46.0.2 # -r requirements/quality.txt # -r requirements/test.txt # pyjwt - # social-auth-core ddt==1.7.2 # via -r requirements/test.txt defusedxml==0.7.1 @@ -139,9 +138,9 @@ dill==0.4.0 # -r requirements/quality.txt # -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/quality.txt # -r requirements/test.txt # django-autocomplete-light @@ -198,7 +197,7 @@ django-extensions==4.1 # via # -r requirements/quality.txt # -r requirements/test.txt -django-filter==25.1 +django-filter==25.2 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -314,7 +313,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 @@ -413,7 +412,7 @@ path==16.14.0 # edx-i18n-tools pathlib2==2.3.7.post1 # via -r requirements/validation.in -platformdirs==4.4.0 +platformdirs==4.5.0 # via # -r requirements/quality.txt # -r requirements/test.txt @@ -462,7 +461,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/quality.txt # -r requirements/test.txt @@ -486,7 +485,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/quality.txt # -r requirements/test.txt @@ -596,12 +595,12 @@ snowballstemmer==3.0.1 # via # -r requirements/quality.txt # pydocstyle -social-auth-app-django==5.4.3 +social-auth-app-django==5.6.0 # via # -r requirements/quality.txt # -r requirements/test.txt # edx-auth-backends -social-auth-core==4.7.0 +social-auth-core==4.8.1 # via # -r requirements/quality.txt # -r requirements/test.txt