Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26031 from edx/djangorestfram-upgrade

Browse Source 
Upgrade drf version.
This commit is contained in:
Usama Sadiq
2021-01-13 23:29:42 +05:00
committed by GitHub
parent 129cd48266 3d7da3e739
commit e4b8f56e26
5 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/course_home_api/dates/v1/serializers.py
View File

@@ -15,7 +15,7 @@ class DateSummarySerializer(serializers.Serializer):
Serializer for Date Summary Objects.
"""
assignment_type = serializers.CharField(default=None)
complete = serializers.NullBooleanField()
complete = serializers.BooleanField(allow_null=True)
date = serializers.DateTimeField()
date_type = serializers.CharField()
description = serializers.CharField()

4
requirements/constraints.txt
View File

@@ -135,10 +135,6 @@ cryptography==3.2.1
# greater versions breaking the code
Sphinx==3.3.0
# incremental upgrade approach
djangorestframework==3.11.0
# latest edx-bulk-grades==0.8.5 is giving migration error.
edx-bulk-grades<0.8.5

8
requirements/edx/base.txt
View File

@@ -50,7 +50,7 @@ defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework
django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n
django-celery-results==2.0.0 # via -r requirements/edx/base.in
django-classy-tags==2.0.0 # via django-sekizai
django-config-models==2.0.4 # via -r requirements/edx/base.in, edx-enterprise, edx-event-routing-backends
django-config-models==2.1.0 # via -r requirements/edx/base.in, edx-enterprise, edx-event-routing-backends
django-cookies-samesite==0.8.0 # via -r requirements/edx/base.in
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise
@@ -82,7 +82,7 @@ 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, djangorestframework, 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.11.0 # 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
djangorestframework==3.12.2 # 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
docopt==0.6.2 # via xmodule
docutils==0.16 # via botocore
drf-jwt==1.17.3 # via edx-drf-extensions
@@ -99,7 +99,7 @@ edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in
edx-django-utils==3.13.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2, super-csv
edx-drf-extensions==6.3.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.17.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in
edx-event-routing-backends==3.0.2 # via -r requirements/edx/base.in
edx-event-routing-backends==4.0.0 # via -r requirements/edx/base.in
edx-i18n-tools==0.5.3 # via ora2
edx-milestones==0.3.0 # via -r requirements/edx/base.in
edx-opaque-keys[django]==2.1.1 # via -r requirements/edx/paver.txt, edx-bulk-grades, edx-ccx-keys, edx-completion, edx-drf-extensions, edx-enterprise, edx-milestones, edx-organizations, edx-proctoring, edx-user-state-client, edx-when, lti-consumer-xblock, xmodule
@@ -110,7 +110,7 @@ edx-rbac==1.3.4 # via edx-enterprise
edx-rest-api-client==5.3.0 # via -r requirements/edx/base.in, edx-enterprise, edx-proctoring
edx-search==2.0.1 # via -r requirements/edx/base.in
edx-sga==0.13.1 # via -r requirements/edx/base.in
edx-submissions==3.2.3 # via -r requirements/edx/base.in, ora2
edx-submissions==3.2.4 # via -r requirements/edx/base.in, ora2
edx-tincan-py35==0.0.9 # via edx-enterprise
edx-toggles==2.0.0 # via -r requirements/edx/base.in, edx-completion, edx-event-routing-backends, edxval, ora2
edx-user-state-client==1.2.0 # via -r requirements/edx/base.in

12
requirements/edx/development.txt
View File

@@ -60,7 +60,7 @@ distlib==0.3.1 # via -r requirements/edx/testing.txt, virtualenv
django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n
django-celery-results==2.0.0 # via -r requirements/edx/testing.txt
django-classy-tags==2.0.0 # via -r requirements/edx/testing.txt, django-sekizai
django-config-models==2.0.4 # via -r requirements/edx/testing.txt, edx-enterprise, edx-event-routing-backends
django-config-models==2.1.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-event-routing-backends
django-cookies-samesite==0.8.0 # via -r requirements/edx/testing.txt
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise
@@ -93,7 +93,7 @@ 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, djangorestframework, 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.11.0 # 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
djangorestframework==3.12.2 # 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
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
@@ -110,7 +110,7 @@ edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt
edx-django-utils==3.13.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2, super-csv
edx-drf-extensions==6.3.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.17.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt
edx-event-routing-backends==3.0.2 # via -r requirements/edx/testing.txt
edx-event-routing-backends==4.0.0 # via -r requirements/edx/testing.txt
edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2
edx-lint==1.6 # via -r requirements/edx/testing.txt
edx-milestones==0.3.0 # via -r requirements/edx/testing.txt
@@ -123,7 +123,7 @@ edx-rest-api-client==5.3.0 # via -r requirements/edx/testing.txt, edx-enterpris
edx-search==2.0.1 # via -r requirements/edx/testing.txt
edx-sga==0.13.1 # via -r requirements/edx/testing.txt
edx-sphinx-theme==1.6.0 # via -r requirements/edx/development.in
edx-submissions==3.2.3 # via -r requirements/edx/testing.txt, ora2
edx-submissions==3.2.4 # via -r requirements/edx/testing.txt, ora2
edx-tincan-py35==0.0.9 # via -r requirements/edx/testing.txt, edx-enterprise
edx-toggles==2.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-completion, edx-event-routing-backends, edxval, ora2
edx-user-state-client==1.2.0 # via -r requirements/edx/testing.txt
@@ -295,7 +295,7 @@ text-unidecode==1.3 # via -r requirements/edx/testing.txt, faker, python-s
tincan==1.0.0 # via -r requirements/edx/testing.txt, edx-event-routing-backends
toml==0.10.2 # via -r requirements/edx/testing.txt, pylint, pytest, tox
tox-battery==0.6.1 # via -r requirements/edx/testing.txt
tox==3.21.0 # via -r requirements/edx/testing.txt, tox-battery
tox==3.21.1 # via -r requirements/edx/testing.txt, tox-battery
tqdm==4.56.0 # via -r requirements/edx/testing.txt, nltk
transifex-client==0.14.2 # via -r requirements/edx/testing.txt
ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite
@@ -305,7 +305,7 @@ uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-ya
urllib3==1.26.2 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client
user-util==0.3.1 # via -r requirements/edx/testing.txt
vine==1.3.0 # via -r requirements/edx/testing.txt, amqp, celery
virtualenv==20.3.0 # via -r requirements/edx/testing.txt, tox
virtualenv==20.3.1 # via -r requirements/edx/testing.txt, tox
voluptuous==0.12.1 # via -r requirements/edx/testing.txt, ora2
vulture==1.6 # via -c requirements/edx/../constraints.txt, -r requirements/edx/development.in
watchdog==1.0.2 # via -r requirements/edx/testing.txt

12
requirements/edx/testing.txt
View File

@@ -59,7 +59,7 @@ distlib==0.3.1 # via virtualenv
django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n
django-celery-results==2.0.0 # via -r requirements/edx/base.txt
django-classy-tags==2.0.0 # via -r requirements/edx/base.txt, django-sekizai
django-config-models==2.0.4 # via -r requirements/edx/base.txt, edx-enterprise, edx-event-routing-backends
django-config-models==2.1.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-event-routing-backends
django-cookies-samesite==0.8.0 # via -r requirements/edx/base.txt
django-cors-headers==2.5.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
django-countries==5.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise
@@ -90,7 +90,7 @@ 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.11.0 # 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
djangorestframework==3.12.2 # 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
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
@@ -107,7 +107,7 @@ edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt
edx-django-utils==3.13.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2, super-csv
edx-drf-extensions==6.3.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval
edx-enterprise==3.17.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt
edx-event-routing-backends==3.0.2 # via -r requirements/edx/base.txt
edx-event-routing-backends==4.0.0 # via -r requirements/edx/base.txt
edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2
edx-lint==1.6 # via -r requirements/edx/testing.in
edx-milestones==0.3.0 # via -r requirements/edx/base.txt
@@ -119,7 +119,7 @@ edx-rbac==1.3.4 # via -r requirements/edx/base.txt, edx-enterprise
edx-rest-api-client==5.3.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-proctoring
edx-search==2.0.1 # via -r requirements/edx/base.txt
edx-sga==0.13.1 # via -r requirements/edx/base.txt
edx-submissions==3.2.3 # via -r requirements/edx/base.txt, ora2
edx-submissions==3.2.4 # via -r requirements/edx/base.txt, ora2
edx-tincan-py35==0.0.9 # via -r requirements/edx/base.txt, edx-enterprise
edx-toggles==2.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-completion, edx-event-routing-backends, edxval, ora2
edx-user-state-client==1.2.0 # via -r requirements/edx/base.txt
@@ -274,7 +274,7 @@ text-unidecode==1.3 # via -r requirements/edx/base.txt, faker, python-slug
tincan==1.0.0 # via -r requirements/edx/base.txt, edx-event-routing-backends
toml==0.10.2 # via pylint, pytest, tox
tox-battery==0.6.1 # via -r requirements/edx/testing.in
tox==3.21.0 # via -r requirements/edx/testing.in, tox-battery
tox==3.21.1 # via -r requirements/edx/testing.in, tox-battery
tqdm==4.56.0 # via -r requirements/edx/base.txt, nltk
transifex-client==0.14.2 # via -r requirements/edx/testing.in
ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite
@@ -284,7 +284,7 @@ uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg
urllib3==1.26.2 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client
user-util==0.3.1 # via -r requirements/edx/base.txt
vine==1.3.0 # via -r requirements/edx/base.txt, amqp, celery
virtualenv==20.3.0 # via tox
virtualenv==20.3.1 # via tox
voluptuous==0.12.1 # via -r requirements/edx/base.txt, ora2
watchdog==1.0.2 # via -r requirements/edx/base.txt
web-fragments==0.3.2 # via -r requirements/edx/base.txt, crowdsourcehinter-xblock, edx-sga, staff-graded-xblock, xblock, xblock-utils