diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 3b3b136413fc669c0510599f3ed93b58e3e5bb19..4a4ab4a2eac85aa83a6bcfe8c7862b5c8e91b325 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@ffec49bb09785fb688afc5d24714d4e43ae8449f#egg=codejail==3.0.1 # via -r requirements/edx/github.in --e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki # via -r requirements/edx/github.in +-e git+https://github.com/edx/django-wiki.git@0.1.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 @@ -27,7 +27,7 @@ attrs==19.3.0 # via -r requirements/edx/base.in, edx-ace babel==2.8.0 # via -r requirements/edx/base.in, enmerkar, enmerkar-underscore beautifulsoup4==4.9.1 # via pynliner billiard==3.3.0.23 # via celery -bleach==3.1.5 # via -r requirements/edx/base.in, edx-enterprise, lti-consumer-xblock, ora2 +bleach==3.1.5 # via -r requirements/edx/base.in, django-wiki, edx-enterprise, lti-consumer-xblock, ora2 boto3==1.4.8 # via -r requirements/edx/base.in, fs-s3fs boto==2.39.0 # via -r requirements/edx/base.in, django-ses, edxval, ora2 botocore==1.8.17 # via -r requirements/edx/base.in, boto3, s3transfer @@ -217,11 +217,11 @@ scipy==1.4.1 # via -c requirements/edx/../constraints.txt, chem, op semantic-version==2.8.5 # via edx-drf-extensions shapely==1.7.0 # 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, crowdsourcehinter-xblock, cryptography, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, drf-yasg, 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, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, 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, crowdsourcehinter-xblock, cryptography, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, django-wiki, drf-yasg, 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, edx-search, event-tracking, fs, fs-s3fs, help-tokens, html5lib, isodate, libsass, mock, openedx-calc, packaging, 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 -r requirements/edx/base.in, social-auth-app-django -sorl-thumbnail==12.6.3 # via -r requirements/edx/base.in +sorl-thumbnail==12.6.3 # via -r requirements/edx/base.in, django-wiki sortedcontainers==2.2.2 # via -r requirements/edx/base.in, pdfminer.six soupsieve==2.0.1 # via beautifulsoup4 sqlparse==0.3.1 # via -r requirements/edx/base.in, django diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b1f886d2eed5fc640ed6bad8571e287512e5b889..7e7f89a07cbe4d6cce5bc8ab5748acaff08304be 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@ffec49bb09785fb688afc5d24714d4e43ae8449f#egg=codejail==3.0.1 # via -r requirements/edx/testing.txt --e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki # via -r requirements/edx/testing.txt +-e git+https://github.com/edx/django-wiki.git@0.1.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 @@ -30,7 +30,7 @@ attrs==19.3.0 # via -r requirements/edx/testing.txt, edx-ace, jsonsc babel==2.8.0 # via -r requirements/edx/testing.txt, enmerkar, enmerkar-underscore, sphinx beautifulsoup4==4.9.1 # via -r requirements/edx/testing.txt, pynliner billiard==3.3.0.23 # via -r requirements/edx/testing.txt, celery -bleach==3.1.5 # via -r requirements/edx/testing.txt, edx-enterprise, lti-consumer-xblock, ora2 +bleach==3.1.5 # via -r requirements/edx/testing.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2 bok-choy==1.1.1 # via -r requirements/edx/testing.txt boto3==1.4.8 # via -r requirements/edx/testing.txt, fs-s3fs boto==2.39.0 # via -r requirements/edx/testing.txt, django-ses, edxval, ora2 @@ -277,13 +277,13 @@ semantic-version==2.8.5 # via -r requirements/edx/testing.txt, edx-drf-extensi shapely==1.7.0 # 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, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, drf-yasg, 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-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, 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, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, django-wiki, drf-yasg, 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-search, edx-sphinx-theme, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, jsonschema, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pip-tools, pycontracts, pyjwkest, pytest-xdist, 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 social-auth-app-django==4.0.0 # via -r requirements/edx/testing.txt social-auth-core==3.3.3 # via -r requirements/edx/testing.txt, social-auth-app-django -sorl-thumbnail==12.6.3 # via -r requirements/edx/testing.txt +sorl-thumbnail==12.6.3 # via -r requirements/edx/testing.txt, django-wiki sortedcontainers==2.2.2 # via -r requirements/edx/testing.txt, pdfminer.six soupsieve==2.0.1 # via -r requirements/edx/testing.txt, beautifulsoup4 sphinx==3.1.2 # via edx-sphinx-theme, sphinxcontrib-httpdomain diff --git a/requirements/edx/github.in b/requirements/edx/github.in index beaabfff212a5bcc1e29540971543b9e10f66264..aff982b3976e32b1e822c7a0907e73c59da13395 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.0.27#egg=django-wiki +-e git+https://github.com/edx/django-wiki.git@0.1.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 93a3f50b7aa64e00140cdcc178bffffbad6f75c4..f731f47700115a753701aae2f0357f2a7a0fd50c 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@ffec49bb09785fb688afc5d24714d4e43ae8449f#egg=codejail==3.0.1 # via -r requirements/edx/base.txt --e git+https://github.com/edx/django-wiki.git@0.0.27#egg=django-wiki # via -r requirements/edx/base.txt +-e git+https://github.com/edx/django-wiki.git@0.1.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 @@ -29,7 +29,7 @@ attrs==19.3.0 # via -r requirements/edx/base.txt, edx-ace, pytest babel==2.8.0 # via -r requirements/edx/base.txt, enmerkar, enmerkar-underscore beautifulsoup4==4.9.1 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, pynliner billiard==3.3.0.23 # via -r requirements/edx/base.txt, celery -bleach==3.1.5 # via -r requirements/edx/base.txt, edx-enterprise, lti-consumer-xblock, ora2 +bleach==3.1.5 # via -r requirements/edx/base.txt, django-wiki, edx-enterprise, lti-consumer-xblock, ora2 bok-choy==1.1.1 # via -r requirements/edx/testing.in boto3==1.4.8 # via -r requirements/edx/base.txt, fs-s3fs boto==2.39.0 # via -r requirements/edx/base.txt, django-ses, edxval, ora2 @@ -266,12 +266,12 @@ semantic-version==2.8.5 # via -r requirements/edx/base.txt, edx-drf-extensions shapely==1.7.0 # 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, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, drf-yasg, 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-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, 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, -r requirements/edx/coverage.txt, analytics-python, astroid, bleach, bok-choy, chem, crowdsourcehinter-xblock, cryptography, diff-cover, django-classy-tags, django-countries, django-sekizai, django-simple-history, django-statici18n, django-wiki, drf-yasg, 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-search, event-tracking, freezegun, fs, fs-s3fs, help-tokens, html5lib, httpretty, isodate, libsass, mando, mock, openedx-calc, packaging, pathlib2, paver, pycontracts, pyjwkest, pytest-xdist, 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 social-auth-core==3.3.3 # via -r requirements/edx/base.txt, social-auth-app-django -sorl-thumbnail==12.6.3 # via -r requirements/edx/base.txt +sorl-thumbnail==12.6.3 # via -r requirements/edx/base.txt, django-wiki sortedcontainers==2.2.2 # via -r requirements/edx/base.txt, pdfminer.six soupsieve==2.0.1 # via -r requirements/edx/base.txt, beautifulsoup4 sqlparse==0.3.1 # via -r requirements/edx/base.txt, django