diff --git a/common/djangoapps/entitlements/rest_api/v1/serializers.py b/common/djangoapps/entitlements/rest_api/v1/serializers.py index a64d6d25bb31..9e9facbbe71e 100644 --- a/common/djangoapps/entitlements/rest_api/v1/serializers.py +++ b/common/djangoapps/entitlements/rest_api/v1/serializers.py @@ -50,7 +50,7 @@ class CourseEntitlementSupportDetailSerializer(serializers.ModelSerializer): slug_field='username', default=serializers.CurrentUserDefault() ) - unenrolled_run = CourseKeyField('unenrolled_run.id') + unenrolled_run = CourseKeyField(read_only='unenrolled_run.id') class Meta: model = CourseEntitlementSupportDetail diff --git a/requirements/constraints.txt b/requirements/constraints.txt index d50dc8b6051c..6bc2bf568da7 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -117,3 +117,8 @@ docutils<0.20 # Issue for unpinning: https://github.com/openedx/edx-platform/issues/32327 python3-saml<1.10.0 +# greater version has dropped few dependencies. Fix this in other ticket. +drf-yasg<1.21.6 + +# incremental upgrade approach. After successfull deploy remove this pin and try latest version. +djangorestframework<3.14.0 diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index f1cd0cd3b0fc..529da1dfffd2 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -56,7 +56,7 @@ pillow==9.5.0 # via matplotlib pycparser==2.21 # via cffi -pyparsing==3.0.9 +pyparsing==3.1.0 # via # -r requirements/edx-sandbox/py38.in # chem diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 748d25f7cd47..ffcd4b0d6fc6 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -132,7 +132,7 @@ click-didyoumean==0.3.0 # via celery click-plugins==1.1.1 # via celery -click-repl==0.2.0 +click-repl==0.3.0 # via celery code-annotations==1.3.0 # via @@ -262,7 +262,7 @@ django-config-models==2.3.0 # edx-enterprise # edx-name-affirmation # lti-consumer-xblock -django-cors-headers==4.0.0 +django-cors-headers==4.1.0 # via -r requirements/edx/base.in django-countries==7.5.1 # via @@ -327,7 +327,7 @@ django-mptt==0.14.0 # openedx-django-wiki django-multi-email-field==0.6.2 # via edx-enterprise -django-mysql==4.9.0 +django-mysql==4.10.0 # via -r requirements/edx/base.in django-oauth-toolkit==1.3.2 # via @@ -383,8 +383,9 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-proctoring -djangorestframework==3.12.4 +djangorestframework==3.13.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # django-config-models # django-user-tasks @@ -420,7 +421,9 @@ drf-jwt==1.19.2 drf-nested-routers==0.93.4 # via openedx-blockstore drf-yasg==1.21.5 - # via edx-api-doc-tools + # via + # -c requirements/edx/../constraints.txt + # edx-api-doc-tools edx-ace==1.6.1 # via -r requirements/edx/base.in edx-api-doc-tools==1.6.0 @@ -537,9 +540,9 @@ edx-rest-api-client==5.5.2 # edx-proctoring edx-search==3.5.0 # via -r requirements/edx/base.in -edx-sga==0.21.1 +edx-sga==0.22.0 # via -r requirements/edx/base.in -edx-submissions==3.5.5 +edx-submissions==3.5.6 # via # -r requirements/edx/base.in # ora2 @@ -620,7 +623,7 @@ idna==3.4 # requests # snowflake-connector-python # yarl -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via markdown importlib-resources==5.12.0 # via jsonschema @@ -902,7 +905,7 @@ pyopenssl==22.0.0 # -c requirements/edx/../constraints.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.0.9 +pyparsing==3.1.0 # via # chem # openedx-calc @@ -951,6 +954,7 @@ pytz==2022.7.1 # celery # django # django-ses + # djangorestframework # drf-yasg # edx-completion # edx-enterprise @@ -1016,7 +1020,7 @@ requests-oauthlib==1.3.1 # via # -r requirements/edx/base.in # social-auth-core -ruamel-yaml==0.17.31 +ruamel-yaml==0.17.32 # via drf-yasg ruamel-yaml-clib==0.2.7 # via ruamel-yaml @@ -1051,7 +1055,6 @@ six==1.16.0 # analytics-python # bleach # chem - # click-repl # codejail-includes # crowdsourcehinter-xblock # edx-ace @@ -1216,7 +1219,7 @@ xblock-google-drive==0.3.0 # via -r requirements/edx/base.in xblock-poll==1.13.0 # via -r requirements/edx/base.in -xblock-utils==3.1.0 +xblock-utils==3.2.0 # via # -r requirements/edx/base.in # edx-sga diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 40be409c27ff..e9091045c9e2 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -195,7 +195,7 @@ click-plugins==1.1.1 # via # -r requirements/edx/testing.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/edx/testing.txt # celery @@ -363,7 +363,7 @@ django-config-models==2.3.0 # edx-enterprise # edx-name-affirmation # lti-consumer-xblock -django-cors-headers==4.0.0 +django-cors-headers==4.1.0 # via -r requirements/edx/testing.txt django-countries==7.5.1 # via @@ -436,7 +436,7 @@ django-multi-email-field==0.6.2 # via # -r requirements/edx/testing.txt # edx-enterprise -django-mysql==4.9.0 +django-mysql==4.10.0 # via -r requirements/edx/testing.txt django-oauth-toolkit==1.3.2 # via @@ -494,8 +494,9 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-proctoring -djangorestframework==3.12.4 +djangorestframework==3.13.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # django-config-models # django-user-tasks @@ -543,6 +544,7 @@ drf-nested-routers==0.93.4 # openedx-blockstore drf-yasg==1.21.5 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-api-doc-tools edx-ace==1.6.1 @@ -666,11 +668,11 @@ edx-rest-api-client==5.5.2 # edx-proctoring edx-search==3.5.0 # via -r requirements/edx/testing.txt -edx-sga==0.21.1 +edx-sga==0.22.0 # via -r requirements/edx/testing.txt edx-sphinx-theme==3.1.0 # via -r requirements/edx/development.in -edx-submissions==3.5.5 +edx-submissions==3.5.6 # via # -r requirements/edx/testing.txt # ora2 @@ -811,7 +813,7 @@ imagesize==1.4.1 # via sphinx import-linter==1.9.0 # via -r requirements/edx/testing.txt -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/edx/testing.txt # markdown @@ -1113,7 +1115,7 @@ pkgutil-resolve-name==1.3.10 # via # -r requirements/edx/testing.txt # jsonschema -platformdirs==3.5.3 +platformdirs==3.6.0 # via # -r requirements/edx/testing.txt # pylint @@ -1244,7 +1246,7 @@ pyopenssl==22.0.0 # -r requirements/edx/testing.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.0.9 +pyparsing==3.1.0 # via # -r requirements/edx/testing.txt # chem @@ -1334,6 +1336,7 @@ pytz==2022.7.1 # celery # django # django-ses + # djangorestframework # drf-yasg # edx-completion # edx-enterprise @@ -1412,7 +1415,7 @@ rfc3986[idna2008]==1.5.0 # via # -r requirements/edx/testing.txt # httpx -ruamel-yaml==0.17.31 +ruamel-yaml==0.17.32 # via # -r requirements/edx/testing.txt # drf-yasg @@ -1463,7 +1466,6 @@ six==1.16.0 # analytics-python # bleach # chem - # click-repl # codejail-includes # crowdsourcehinter-xblock # edx-ace @@ -1676,7 +1678,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.23.0 +virtualenv==20.23.1 # via # -r requirements/edx/testing.txt # tox @@ -1745,7 +1747,7 @@ xblock-google-drive==0.3.0 # via -r requirements/edx/testing.txt xblock-poll==1.13.0 # via -r requirements/edx/testing.txt -xblock-utils==3.1.0 +xblock-utils==3.2.0 # via # -r requirements/edx/testing.txt # edx-sga diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 225fdcdfca31..44fa71ecb570 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -40,7 +40,7 @@ idna==3.4 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via sphinx jinja2==3.1.2 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4316d17511ef..edbb2cc62539 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -183,7 +183,7 @@ click-plugins==1.1.1 # via # -r requirements/edx/base.txt # celery -click-repl==0.2.0 +click-repl==0.3.0 # via # -r requirements/edx/base.txt # celery @@ -345,7 +345,7 @@ django-config-models==2.3.0 # edx-enterprise # edx-name-affirmation # lti-consumer-xblock -django-cors-headers==4.0.0 +django-cors-headers==4.1.0 # via -r requirements/edx/base.txt django-countries==7.5.1 # via @@ -416,7 +416,7 @@ django-multi-email-field==0.6.2 # via # -r requirements/edx/base.txt # edx-enterprise -django-mysql==4.9.0 +django-mysql==4.10.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.3.2 # via @@ -474,8 +474,9 @@ django-webpack-loader==0.7.0 # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-proctoring -djangorestframework==3.12.4 +djangorestframework==3.13.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # django-config-models # django-user-tasks @@ -521,6 +522,7 @@ drf-nested-routers==0.93.4 # openedx-blockstore drf-yasg==1.21.5 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-api-doc-tools edx-ace==1.6.1 @@ -645,9 +647,9 @@ edx-rest-api-client==5.5.2 # edx-proctoring edx-search==3.5.0 # via -r requirements/edx/base.txt -edx-sga==0.21.1 +edx-sga==0.22.0 # via -r requirements/edx/base.txt -edx-submissions==3.5.5 +edx-submissions==3.5.6 # via # -r requirements/edx/base.txt # ora2 @@ -772,7 +774,7 @@ idna==3.4 # yarl import-linter==1.9.0 # via -r requirements/edx/testing.in -importlib-metadata==6.6.0 +importlib-metadata==6.7.0 # via # -r requirements/edx/base.txt # markdown @@ -1054,7 +1056,7 @@ pkgutil-resolve-name==1.3.10 # via # -r requirements/edx/base.txt # jsonschema -platformdirs==3.5.3 +platformdirs==3.6.0 # via # pylint # virtualenv @@ -1174,7 +1176,7 @@ pyopenssl==22.0.0 # -r requirements/edx/base.txt # optimizely-sdk # snowflake-connector-python -pyparsing==3.0.9 +pyparsing==3.1.0 # via # -r requirements/edx/base.txt # chem @@ -1260,6 +1262,7 @@ pytz==2022.7.1 # celery # django # django-ses + # djangorestframework # drf-yasg # edx-completion # edx-enterprise @@ -1332,7 +1335,7 @@ requests-oauthlib==1.3.1 # social-auth-core rfc3986[idna2008]==1.5.0 # via httpx -ruamel-yaml==0.17.31 +ruamel-yaml==0.17.32 # via # -r requirements/edx/base.txt # drf-yasg @@ -1383,7 +1386,6 @@ six==1.16.0 # analytics-python # bleach # chem - # click-repl # codejail-includes # crowdsourcehinter-xblock # edx-ace @@ -1553,7 +1555,7 @@ vine==5.0.0 # amqp # celery # kombu -virtualenv==20.23.0 +virtualenv==20.23.1 # via tox voluptuous==0.13.1 # via @@ -1614,7 +1616,7 @@ xblock-google-drive==0.3.0 # via -r requirements/edx/base.txt xblock-poll==1.13.0 # via -r requirements/edx/base.txt -xblock-utils==3.1.0 +xblock-utils==3.2.0 # via # -r requirements/edx/base.txt # edx-sga diff --git a/requirements/pip.txt b/requirements/pip.txt index 5a5ce227ee78..fa19e6f0b1a7 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -10,5 +10,5 @@ wheel==0.40.0 # The following packages are considered to be unsafe in a requirements file: pip==23.1.2 # via -r requirements/pip.in -setuptools==67.8.0 +setuptools==68.0.0 # via -r requirements/pip.in