diff --git a/openedx/core/djangoapps/discussions/migrations/0005_auto_20210910_0940.py b/openedx/core/djangoapps/discussions/migrations/0005_auto_20210910_0940.py new file mode 100644 index 0000000000..7b067f8c34 --- /dev/null +++ b/openedx/core/djangoapps/discussions/migrations/0005_auto_20210910_0940.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.24 on 2021-09-10 09:40 + +from django.db import migrations +import jsonfield.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('discussions', '0004_historicalprogramdiscussionsconfiguration_programdiscussionsconfiguration'), + ] + + operations = [ + migrations.AlterField( + model_name='discussionsconfiguration', + name='plugin_configuration', + field=jsonfield.fields.JSONField(blank=True, default={}, help_text='The plugin configuration data for this context/provider.'), + ), + migrations.AlterField( + model_name='historicaldiscussionsconfiguration', + name='plugin_configuration', + field=jsonfield.fields.JSONField(blank=True, default={}, help_text='The plugin configuration data for this context/provider.'), + ), + ] diff --git a/openedx/core/djangoapps/site_configuration/migrations/0008_auto_20210910_0940.py b/openedx/core/djangoapps/site_configuration/migrations/0008_auto_20210910_0940.py new file mode 100644 index 0000000000..efcc616d8f --- /dev/null +++ b/openedx/core/djangoapps/site_configuration/migrations/0008_auto_20210910_0940.py @@ -0,0 +1,25 @@ +# Generated by Django 2.2.24 on 2021-09-10 09:40 + +import collections +from django.db import migrations +import jsonfield.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('site_configuration', '0007_remove_values_field'), + ] + + operations = [ + migrations.AlterField( + model_name='siteconfiguration', + name='site_values', + field=jsonfield.fields.JSONField(blank=True, default=dict, load_kwargs={'object_pairs_hook': collections.OrderedDict}), + ), + migrations.AlterField( + model_name='siteconfigurationhistory', + name='site_values', + field=jsonfield.fields.JSONField(blank=True, load_kwargs={'object_pairs_hook': collections.OrderedDict}), + ), + ] diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index fb2cbbb9fd..c184363a93 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -3,16 +3,6 @@ # See BOM-2721 for more details. # Below is the copied and edited version of common_constraints -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - # A central location for most common version constraints # (across edx repos) for pip-installation. # diff --git a/requirements/constraints.txt b/requirements/constraints.txt index b74f03f931..f0b254d570 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -30,7 +30,7 @@ django-storages<1.9 # 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 # for them. -edx-enterprise==3.28.24 +edx-enterprise==3.30.0 # Newer versions need a more recent version of python-dateutil freezegun==0.3.12 @@ -85,9 +85,6 @@ click<8.0.0 # constraints present due to Python35 support. Need to be tested and removed independently. -# jsonfield2 will be replaced with jsonfield in https://openedx.atlassian.net/browse/BOM-1917. -jsonfield2<3.1.0 # jsonfield2 3.1.0 drops support for python 3.5 - # Release 2.1.0 pulls declares `pact-python` as a base requirement, even though it should be # a testing requirement. Installing it would cause a bunch of new tool packages to become base # requirements of edx-platform. Pinning temporarily until this is resolved in edx-val. diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index b65a6cf5d9..b26740348a 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -51,7 +51,7 @@ networkx==2.2 # via # -c requirements/edx-sandbox/../constraints.txt # -r requirements/edx-sandbox/py35.in -nltk==3.6.4 +nltk==3.6.3 # via # -r requirements/edx-sandbox/py35.in # chem @@ -62,6 +62,7 @@ numpy==1.16.5 # chem # matplotlib # openedx-calc + # scipy openedx-calc==1.0.9 # via -r requirements/edx-sandbox/py35.in pycparser==2.20 diff --git a/requirements/edx-sandbox/py38.txt b/requirements/edx-sandbox/py38.txt index f69b867ad9..63d04ce98a 100644 --- a/requirements/edx-sandbox/py38.txt +++ b/requirements/edx-sandbox/py38.txt @@ -42,7 +42,7 @@ networkx==2.5.1 # via # -c requirements/edx-sandbox/../constraints.txt # -r requirements/edx-sandbox/py38.in -nltk==3.6.4 +nltk==3.6.3 # via # -r requirements/edx-sandbox/py38.in # chem diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 9ad2ca4c39..e21539410e 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -106,7 +106,7 @@ help-tokens html5lib # HTML parser, used for capa problems icalendar # .ics generator, used by calendar_sync ipaddress # Ip network support for Embargo feature -jsonfield2 # Django model field for validated JSON; used in several apps +jsonfield # Django model field for validated JSON; used in several apps laboratory # Library for testing that code refactors/infrastructure changes produce identical results lxml # XML parser lti-consumer-xblock diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 63148caa44..9712658180 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -146,7 +146,7 @@ cryptography==3.4.8 # social-auth-core cssutils==2.3.0 # via pynliner -ddt==1.4.3 +ddt==1.4.4 # via # xblock-drag-and-drop-v2 # xblock-poll @@ -216,7 +216,7 @@ django==2.2.24 # enmerkar-underscore # event-tracking # help-tokens - # jsonfield2 + # jsonfield # lti-consumer-xblock # openedx-events # ora2 @@ -243,7 +243,7 @@ django-config-models==2.2.0 # lti-consumer-xblock django-cookies-samesite==0.9.0 # via -r requirements/edx/base.in -django-cors-headers==3.9.0 +django-cors-headers==3.10.0 # via -r requirements/edx/base.in django-countries==7.2.1 # via @@ -301,7 +301,7 @@ django-mptt==0.13.4 # django-wiki django-multi-email-field==0.6.2 # via edx-enterprise -django-mysql==4.1.0 +django-mysql==4.2.0 # via -r requirements/edx/base.in django-oauth-toolkit==1.3.2 # via @@ -399,7 +399,7 @@ edx-bulk-grades==0.9.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.in -edx-celeryutils==1.1.0 +edx-celeryutils==1.1.1 # via # -r requirements/edx/base.in # edx-name-affirmation @@ -434,7 +434,7 @@ edx-drf-extensions==8.0.0 # edx-rbac # edx-when # edxval -edx-enterprise==3.28.24 +edx-enterprise==3.30.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in @@ -463,7 +463,7 @@ edx-opaque-keys[django]==2.2.2 # xmodule edx-organizations==6.10.0 # via -r requirements/edx/base.in -edx-proctoring==4.0.3 +edx-proctoring==4.0.4 # via # -r requirements/edx/base.in # edx-proctoring-proctortrack @@ -480,7 +480,7 @@ edx-search==3.1.0 # via -r requirements/edx/base.in edx-sga==0.16.0 # via -r requirements/edx/base.in -edx-submissions==3.3.1 +edx-submissions==3.3.2 # via # -r requirements/edx/base.in # ora2 @@ -561,7 +561,7 @@ isodate==0.6.0 # via python3-saml itypes==1.2.0 # via coreapi -jinja2==3.0.1 +jinja2==3.0.2 # via # code-annotations # coreschema @@ -573,9 +573,8 @@ joblib==1.0.1 # via nltk jsondiff==1.3.0 # via edx-enterprise -jsonfield2==3.0.3 +jsonfield==3.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in # edx-celeryutils # edx-enterprise @@ -601,7 +600,7 @@ libsass==0.10.0 # ora2 loremipsum==1.0.5 # via ora2 -lti-consumer-xblock==3.0.3 +lti-consumer-xblock==3.0.4 # via -r requirements/edx/base.in lxml==4.5.0 # via @@ -666,7 +665,7 @@ newrelic==7.0.0.166 # via # -r requirements/edx/base.in # edx-django-utils -nltk==3.6.4 +nltk==3.6.3 # via # -r requirements/edx/base.in # chem @@ -689,7 +688,7 @@ openedx-calc==2.0.1 # via -r requirements/edx/base.in openedx-events==0.6.0 # via -r requirements/edx/base.in -ora2==3.6.22 +ora2==3.7.2 # via -r requirements/edx/base.in packaging==21.0 # via diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index a29e42ad16..2e93b28ac1 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -12,7 +12,7 @@ diff-cover==4.0.0 # -r requirements/edx/coverage.in inflect==5.3.0 # via jinja2-pluralize -jinja2==3.0.1 +jinja2==3.0.2 # via # diff-cover # jinja2-pluralize diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f67492c491..6a11e5b898 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -212,7 +212,7 @@ cssutils==2.3.0 # via # -r requirements/edx/testing.txt # pynliner -ddt==1.4.3 +ddt==1.4.4 # via # -r requirements/edx/testing.txt # xblock-drag-and-drop-v2 @@ -294,7 +294,7 @@ django==2.2.24 # enmerkar-underscore # event-tracking # help-tokens - # jsonfield2 + # jsonfield # lti-consumer-xblock # openedx-events # ora2 @@ -325,7 +325,7 @@ django-config-models==2.2.0 # lti-consumer-xblock django-cookies-samesite==0.9.0 # via -r requirements/edx/testing.txt -django-cors-headers==3.9.0 +django-cors-headers==3.10.0 # via -r requirements/edx/testing.txt django-countries==7.2.1 # via @@ -389,7 +389,7 @@ django-multi-email-field==0.6.2 # via # -r requirements/edx/testing.txt # edx-enterprise -django-mysql==4.1.0 +django-mysql==4.2.0 # via -r requirements/edx/testing.txt django-oauth-toolkit==1.3.2 # via @@ -501,7 +501,7 @@ edx-bulk-grades==0.9.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/testing.txt -edx-celeryutils==1.1.0 +edx-celeryutils==1.1.1 # via # -r requirements/edx/testing.txt # edx-name-affirmation @@ -536,7 +536,7 @@ edx-drf-extensions==8.0.0 # edx-rbac # edx-when # edxval -edx-enterprise==3.28.24 +edx-enterprise==3.30.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt @@ -569,7 +569,7 @@ edx-opaque-keys[django]==2.2.2 # xmodule edx-organizations==6.10.0 # via -r requirements/edx/testing.txt -edx-proctoring==4.0.3 +edx-proctoring==4.0.4 # via # -r requirements/edx/testing.txt # edx-proctoring-proctortrack @@ -590,7 +590,7 @@ edx-sga==0.16.0 # via -r requirements/edx/testing.txt edx-sphinx-theme==3.0.0 # via -r requirements/edx/development.in -edx-submissions==3.3.1 +edx-submissions==3.3.2 # via # -r requirements/edx/testing.txt # ora2 @@ -742,7 +742,7 @@ itypes==1.2.0 # via # -r requirements/edx/testing.txt # coreapi -jinja2==3.0.1 +jinja2==3.0.2 # via # -r requirements/edx/testing.txt # code-annotations @@ -767,9 +767,8 @@ jsondiff==1.3.0 # via # -r requirements/edx/testing.txt # edx-enterprise -jsonfield2==3.0.3 +jsonfield==3.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt # edx-celeryutils # edx-enterprise @@ -808,7 +807,7 @@ loremipsum==1.0.5 # via # -r requirements/edx/testing.txt # ora2 -lti-consumer-xblock==3.0.3 +lti-consumer-xblock==3.0.4 # via -r requirements/edx/testing.txt lxml==4.5.0 # via @@ -894,7 +893,7 @@ newrelic==7.0.0.166 # via # -r requirements/edx/testing.txt # edx-django-utils -nltk==3.6.4 +nltk==3.6.3 # via # -r requirements/edx/testing.txt # chem @@ -918,7 +917,7 @@ openedx-calc==2.0.1 # via -r requirements/edx/testing.txt openedx-events==0.6.0 # via -r requirements/edx/testing.txt -ora2==3.6.22 +ora2==3.7.2 # via -r requirements/edx/testing.txt packaging==21.0 # via diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 3997d70e4d..80c206bc8d 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -30,7 +30,7 @@ idna==3.2 # via requests imagesize==1.2.0 # via sphinx -jinja2==3.0.1 +jinja2==3.0.2 # via # code-annotations # sphinx diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 15429c4e43..12b9a23b99 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -200,7 +200,7 @@ cssutils==2.3.0 # via # -r requirements/edx/base.txt # pynliner -ddt==1.4.3 +ddt==1.4.4 # via # -r requirements/edx/base.txt # -r requirements/edx/testing.in @@ -279,7 +279,7 @@ distlib==0.3.3 # enmerkar-underscore # event-tracking # help-tokens - # jsonfield2 + # jsonfield # lti-consumer-xblock # openedx-events # ora2 @@ -309,7 +309,7 @@ django-config-models==2.2.0 # edx-name-affirmation # lti-consumer-xblock # via -r requirements/edx/base.txt -django-cors-headers==3.9.0 +django-cors-headers==3.10.0 # via -r requirements/edx/base.txt django-countries==7.2.1 # via @@ -371,7 +371,7 @@ django-multi-email-field==0.6.2 # via # -r requirements/edx/base.txt # edx-enterprise -django-mysql==4.1.0 +django-mysql==4.2.0 # via -r requirements/edx/base.txt django-oauth-toolkit==1.3.2 # via @@ -481,7 +481,7 @@ edx-bulk-grades==0.9.2 # staff-graded-xblock edx-ccx-keys==1.2.1 # via -r requirements/edx/base.txt -edx-celeryutils==1.1.0 +edx-celeryutils==1.1.1 # via # -r requirements/edx/base.txt # edx-name-affirmation @@ -516,7 +516,7 @@ edx-drf-extensions==8.0.0 # edx-rbac # edx-when # edxval -edx-enterprise==3.28.24 +edx-enterprise==3.30.0 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt @@ -550,7 +550,7 @@ edx-opaque-keys[django]==2.2.2 # xmodule edx-organizations==6.10.0 # via -r requirements/edx/base.txt -edx-proctoring==4.0.3 +edx-proctoring==4.0.4 # via # -r requirements/edx/base.txt # edx-proctoring-proctortrack @@ -569,7 +569,7 @@ edx-search==3.1.0 # via -r requirements/edx/base.txt edx-sga==0.16.0 # via -r requirements/edx/base.txt -edx-submissions==3.3.1 +edx-submissions==3.3.2 # via # -r requirements/edx/base.txt # ora2 @@ -702,7 +702,7 @@ itypes==1.2.0 # via # -r requirements/edx/base.txt # coreapi -jinja2==3.0.1 +jinja2==3.0.2 # via # -r requirements/edx/base.txt # -r requirements/edx/coverage.txt @@ -727,9 +727,8 @@ jsondiff==1.3.0 # via # -r requirements/edx/base.txt # edx-enterprise -jsonfield2==3.0.3 +jsonfield==3.1.0 # via - # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-celeryutils # edx-enterprise @@ -764,7 +763,7 @@ loremipsum==1.0.5 # via # -r requirements/edx/base.txt # ora2 -lti-consumer-xblock==3.0.3 +lti-consumer-xblock==3.0.4 # via -r requirements/edx/base.txt lxml==4.5.0 # via @@ -841,7 +840,7 @@ newrelic==7.0.0.166 # via # -r requirements/edx/base.txt # edx-django-utils -nltk==3.6.4 +nltk==3.6.3 # via # -r requirements/edx/base.txt # chem @@ -865,7 +864,7 @@ openedx-calc==2.0.1 # via -r requirements/edx/base.txt openedx-events==0.6.0 # via -r requirements/edx/base.txt -ora2==3.6.22 +ora2==3.7.2 # via -r requirements/edx/base.txt packaging==21.0 # via