diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 5f7201a472..65fedaefea 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -70,9 +70,6 @@ kiwisolver<1.2.0 # Tests passed, but hit a problem in stage lxml<4.5.1 -# Convert text markup to HTML; used in capa problems, forums, and course wikis; pin Markdown version as tests failed for its upgrade to the latest release -Markdown==2.6.11 - # Matplotlib 3.1 requires Python 3.6 matplotlib<3.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 24e428fc42..bdde759066 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -7,7 +7,7 @@ -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock # via -r requirements/edx/github.in -e common/lib/capa # via -r requirements/edx/local.in -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/github.in --e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki # via -r requirements/edx/github.in +-e git+https://github.com/edx/django-wiki.git@1.0.0#egg=django-wiki # via -r requirements/edx/github.in -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock # via -r requirements/edx/github.in -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/github.in -e . # via -r requirements/edx/local.in @@ -148,7 +148,7 @@ lti-consumer-xblock==2.4.0 # via -r requirements/edx/base.in lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/../edx-sandbox/shared.txt, capa, edxval, lti-consumer-xblock, ora2, safe-lxml, xblock, xmlsec mailsnake==1.6.4 # via -r requirements/edx/base.in mako==1.1.4 # via -r requirements/edx/base.in, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils -markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-wiki, staff-graded-xblock, xblock-poll +markdown==3.3.3 # via -r requirements/edx/base.in, django-wiki, staff-graded-xblock, xblock-poll markey==0.8 # via enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/paver.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, geoip2 @@ -211,7 +211,7 @@ scipy==1.4.1 # via -c requirements/edx/../constraints.txt, chem, op semantic-version==2.8.5 # via edx-drf-extensions shapely==1.7.1 # via -r requirements/edx/base.in simplejson==3.17.2 # via -r requirements/edx/base.in, sailthru-client, super-csv, xblock-utils -six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, django-wiki, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, event-tracking, fs, fs-s3fs, html5lib, isodate, libsass, mock, openedx-calc, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock +six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, event-tracking, fs, fs-s3fs, html5lib, isodate, libsass, mock, openedx-calc, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-app-django==4.0.0 # via -r requirements/edx/base.in social-auth-core==3.3.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, social-auth-app-django diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6f3f763e13..f941532a17 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -7,7 +7,7 @@ -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock # via -r requirements/edx/testing.txt -e common/lib/capa # via -r requirements/edx/testing.txt -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/testing.txt --e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki # via -r requirements/edx/testing.txt +-e git+https://github.com/edx/django-wiki.git@1.0.0#egg=django-wiki # via -r requirements/edx/testing.txt -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock # via -r requirements/edx/testing.txt -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/testing.txt -e . # via -r requirements/edx/testing.txt @@ -178,7 +178,7 @@ lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requi m2r==0.2.1 # via sphinxcontrib-openapi mailsnake==1.6.4 # via -r requirements/edx/testing.txt mako==1.1.4 # via -r requirements/edx/testing.txt, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils -markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-wiki, staff-graded-xblock, xblock-poll +markdown==3.3.3 # via -r requirements/edx/testing.txt, django-wiki, staff-graded-xblock, xblock-poll markey==0.8 # via -r requirements/edx/testing.txt, enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/testing.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, geoip2 @@ -266,7 +266,7 @@ semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensi shapely==1.7.1 # via -r requirements/edx/testing.txt simplejson==3.17.2 # via -r requirements/edx/testing.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.txt -six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, django-wiki, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, jsonschema, libsass, mock, openedx-calc, paver, pip-tools, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock +six==1.15.0 # via -r requirements/edx/pip-tools.txt, -r requirements/edx/testing.txt, analytics-python, astroid, bleach, bok-choy, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, jsonschema, libsass, mock, openedx-calc, paver, pip-tools, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, sphinxcontrib-httpdomain, stevedore, tox, transifex-client, virtualenv, xblock slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client smmap==3.0.4 # via -r requirements/edx/testing.txt, gitdb snowballstemmer==2.0.0 # via sphinx diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 99a7af315a..147dd52308 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -54,7 +54,7 @@ # Python libraries to install directly from github # Third-party: --e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki +-e git+https://github.com/edx/django-wiki.git@1.0.0#egg=django-wiki git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 930770fd49..5e2aece893 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -7,7 +7,7 @@ -e git+https://github.com/edx/acid-block.git@758855a67d2f12bd74db4d5e7a0862d6e65f079c#egg=acid-xblock # via -r requirements/edx/base.txt -e common/lib/capa # via -r requirements/edx/base.txt -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/base.txt --e git+https://github.com/edx/django-wiki.git@0.1.1#egg=django-wiki # via -r requirements/edx/base.txt +-e git+https://github.com/edx/django-wiki.git@1.0.0#egg=django-wiki # via -r requirements/edx/base.txt -e git+https://github.com/edx/DoneXBlock.git@2.0.3#egg=done-xblock # via -r requirements/edx/base.txt -e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme # via -r requirements/edx/base.txt -e . # via -r requirements/edx/base.txt @@ -171,7 +171,7 @@ lti-consumer-xblock==2.4.0 # via -r requirements/edx/base.txt lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, capa, edxval, lti-consumer-xblock, ora2, pyquery, safe-lxml, xblock, xmlsec mailsnake==1.6.4 # via -r requirements/edx/base.txt mako==1.1.4 # via -r requirements/edx/base.txt, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils -markdown==2.6.11 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-wiki, staff-graded-xblock, xblock-poll +markdown==3.3.3 # via -r requirements/edx/base.txt, django-wiki, staff-graded-xblock, xblock-poll markey==0.8 # via -r requirements/edx/base.txt, enmerkar-underscore markupsafe==1.1.1 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, chem, jinja2, mako, xblock maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, geoip2 @@ -255,7 +255,7 @@ semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions shapely==1.7.1 # via -r requirements/edx/base.txt simplejson==3.17.2 # via -r requirements/edx/base.txt, sailthru-client, super-csv, xblock-utils singledispatch==3.4.0.3 # via -r requirements/edx/testing.in -six==1.15.0 # via -r requirements/edx/base.txt, analytics-python, astroid, bleach, bok-choy, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, django-wiki, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, libsass, mock, openedx-calc, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock +six==1.15.0 # via -r requirements/edx/base.txt, analytics-python, astroid, bleach, bok-choy, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-lint, edx-milestones, edx-opaque-keys, edx-rbac, event-tracking, freezegun, fs, fs-s3fs, html5lib, httpretty, isodate, libsass, mock, openedx-calc, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, singledispatch, social-auth-app-django, social-auth-core, stevedore, tox, transifex-client, virtualenv, xblock slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client smmap==3.0.4 # via gitdb social-auth-app-django==4.0.0 # via -r requirements/edx/base.txt