diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 578230c9405935b925ce55dbc9d4c04498b4c8dc..c59e42ad70c7bae661c60ae6c8a35db9d509a6b5 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -32,8 +32,6 @@ django-pipeline<2.0.0 # django-storages version 1.9 drops support for boto storage backend. django-storages<1.9 -# Support was dropped for Python 3.5 -drf-yasg<1.17.1 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better @@ -139,3 +137,6 @@ cryptography==3.2.1 # greater versions breaking the code Sphinx==3.3.0 + +# incremental upgrade approach +djangorestframework==3.10.3 diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 35174978dddb963b278d161d79aa0eb75af86c53..c6695d6874227be3d91fdcd7bb70275719ef2e11 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -68,7 +68,7 @@ django-storages django-user-tasks django-waffle django-webpack-loader # Used to wire webpack bundles into the django asset pipeline -djangorestframework==3.9.4 +djangorestframework edx-ace edx-analytics-data-api-client edx-api-doc-tools diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 736922b22182d12cf5be656443ea49d2a6f5311a..6863f8ef77c9aaa894ae6ec04d2faae302a3d222 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -82,11 +82,11 @@ django-waffle==2.0.0 # via -r requirements/edx/base.in, edx-django-utils, e django-webpack-loader==0.7.0 # via -r requirements/edx/base.in, edx-proctoring django==2.2.17 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, code-annotations, django-appconf, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-ses, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-event-routing-backends, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-toggles, edx-when, edxval, enmerkar, enmerkar-underscore, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils djangorestframework-xml==2.0.0 # via edx-enterprise -djangorestframework==3.9.4 # via -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv +djangorestframework==3.10.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv docopt==0.6.2 # via xmodule docutils==0.16 # via botocore drf-jwt==1.17.3 # via edx-drf-extensions -drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, edx-api-doc-tools +drf-yasg==1.20.0 # via -c requirements/edx/../constraints.txt, edx-api-doc-tools edx-ace==0.1.17 # via -r requirements/edx/base.in edx-analytics-data-api-client==0.16.1 # via -r requirements/edx/base.in edx-api-doc-tools==1.4.0 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 5f048190874377e746ea740949e1cc4a83e94f3e..a8d1cec2236d904cd5e047b6e0dac374700c9d57 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -93,11 +93,11 @@ django-waffle==2.0.0 # via -r requirements/edx/testing.txt, edx-django-util django-webpack-loader==0.7.0 # via -r requirements/edx/testing.txt, edx-proctoring django==2.2.17 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, code-annotations, django-appconf, django-classy-tags, django-config-models, django-cors-headers, django-crum, django-debug-toolbar, django-fernet-fields, django-filter, django-method-override, django-model-utils, django-mptt, django-multi-email-field, django-mysql, django-oauth-toolkit, django-pyfs, django-ratelimit-backend, django-sekizai, django-ses, django-splash, django-statici18n, django-storages, django-user-tasks, django-wiki, drf-jwt, drf-yasg, edx-ace, edx-api-doc-tools, edx-bulk-grades, edx-celeryutils, edx-completion, edx-django-release-util, edx-django-sites-extensions, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-event-routing-backends, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-organizations, edx-proctoring, edx-rbac, edx-search, edx-submissions, edx-toggles, edx-when, edxval, enmerkar, enmerkar-underscore, event-tracking, help-tokens, jsonfield2, lti-consumer-xblock, ora2, rest-condition, super-csv, xss-utils djangorestframework-xml==2.0.0 # via -r requirements/edx/testing.txt, edx-enterprise -djangorestframework==3.9.4 # via -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv +djangorestframework==3.10.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv docopt==0.6.2 # via -r requirements/edx/testing.txt, xmodule docutils==0.16 # via -r requirements/edx/testing.txt, botocore, m2r, sphinx drf-jwt==1.17.3 # via -r requirements/edx/testing.txt, edx-drf-extensions -drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-api-doc-tools +drf-yasg==1.20.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-api-doc-tools edx-ace==0.1.17 # via -r requirements/edx/testing.txt edx-analytics-data-api-client==0.16.1 # via -r requirements/edx/testing.txt edx-api-doc-tools==1.4.0 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index a69c217b10075b93cfae0c73095d90d04d48f0eb..c4ff3c7c4eb941cd6ff7c372c92e79b1d0d78511 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -90,11 +90,11 @@ django-user-tasks==1.3.2 # via -r requirements/edx/base.txt django-waffle==2.0.0 # via -r requirements/edx/base.txt, edx-django-utils, edx-drf-extensions, edx-enterprise, edx-proctoring, edx-toggles django-webpack-loader==0.7.0 # via -r requirements/edx/base.txt, edx-proctoring djangorestframework-xml==2.0.0 # via -r requirements/edx/base.txt, edx-enterprise -djangorestframework==3.9.4 # via -r requirements/edx/base.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv +djangorestframework==3.10.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-config-models, django-user-tasks, drf-jwt, drf-yasg, edx-api-doc-tools, edx-completion, edx-drf-extensions, edx-enterprise, edx-organizations, edx-proctoring, edx-submissions, ora2, rest-condition, super-csv docopt==0.6.2 # via -r requirements/edx/base.txt, xmodule docutils==0.16 # via -r requirements/edx/base.txt, botocore drf-jwt==1.17.3 # via -r requirements/edx/base.txt, edx-drf-extensions -drf-yasg==1.17.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-api-doc-tools +drf-yasg==1.20.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-api-doc-tools edx-ace==0.1.17 # via -r requirements/edx/base.txt edx-analytics-data-api-client==0.16.1 # via -r requirements/edx/base.txt edx-api-doc-tools==1.4.0 # via -r requirements/edx/base.txt