From f88b4d75f09c67a3d709f7e85c1463521808b652 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 5 Jun 2020 09:10:15 -0400 Subject: [PATCH 1/3] Add marketing_url to courseware_api This will let the courseware MFE point at a course's marketing page. AA-137 --- openedx/core/djangoapps/courseware_api/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openedx/core/djangoapps/courseware_api/serializers.py b/openedx/core/djangoapps/courseware_api/serializers.py index 5b66b25aa5..7f47c763b2 100644 --- a/openedx/core/djangoapps/courseware_api/serializers.py +++ b/openedx/core/djangoapps/courseware_api/serializers.py @@ -86,6 +86,7 @@ class CourseInfoSerializer(serializers.Serializer): # pylint: disable=abstract- is_staff = serializers.BooleanField() can_load_courseware = serializers.DictField() notes = serializers.DictField() + marketing_url = serializers.CharField() def __init__(self, *args, **kwargs): """ From b7a838c34b04a9e20bdb4a0e24690c097d6f6668 Mon Sep 17 00:00:00 2001 From: Aura Milena Alba <36944773+amalbas@users.noreply.github.com> Date: Fri, 5 Jun 2020 08:54:03 -0500 Subject: [PATCH 2/3] Remove pattern library of course_experience/course-updates-fragment.html. (#24062) --- .../sass/features/_course-experience.scss | 22 ++++++++++++++++++- .../course_experience/views/course_updates.py | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lms/static/sass/features/_course-experience.scss b/lms/static/sass/features/_course-experience.scss index 5205cdc282..623820d4a1 100644 --- a/lms/static/sass/features/_course-experience.scss +++ b/lms/static/sass/features/_course-experience.scss @@ -501,7 +501,7 @@ border-bottom: 1px solid $border-color; .date { - font-size: font-size(small); + font-size: 0.875rem; font-weight: $font-light; float: none; padding-bottom: ($baseline/4); @@ -516,6 +516,26 @@ max-width: 100%; } } + + .well { + box-shadow: inset 0 1px 2px 1px $shadow; + padding: 1.25rem; + background: $gray-100; + } + } + + .breadcrumbs { + font-size: 0.875rem; + + .nav-item { + @include margin-left($baseline/4); + } + + .fa-angle-right { + transform: rotateY(0deg) #{"/*rtl: rotateY(180deg)*/"}; + + @include margin-left($baseline/4); + } } } diff --git a/openedx/features/course_experience/views/course_updates.py b/openedx/features/course_experience/views/course_updates.py index 7ce5779ddd..f7c71ce797 100644 --- a/openedx/features/course_experience/views/course_updates.py +++ b/openedx/features/course_experience/views/course_updates.py @@ -82,6 +82,8 @@ class CourseUpdatesFragmentView(EdxFragmentView): """ A fragment to render the updates page for a course. """ + _uses_pattern_library = False + def render_to_fragment(self, request, course_id=None, **kwargs): """ Renders the course's home page as a fragment. From c382237c33009d700b7684f91039ac2af4ea6f88 Mon Sep 17 00:00:00 2001 From: "M. Zulqarnain" Date: Fri, 5 Jun 2020 19:09:58 +0500 Subject: [PATCH 3/3] update django-appconf installation (#24151) --- requirements/edx/base.in | 1 + requirements/edx/base.txt | 10 +++++----- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 16 ++++++++-------- requirements/edx/github.in | 1 - requirements/edx/testing.txt | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 1cf703a361..a6854b2e70 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -38,6 +38,7 @@ celery # Asynchronous task execution library contextlib2 # We need contextlib2.ExitStack so we can stop using contextlib.nested which doesn't exist in python 3 defusedxml Django # Web application framework +django-appconf django-celery # Only used for the CacheBackend for celery results django-cookies-samesite # Middleware which allows SameSite=None flag for session and csrf cookies in Django<3.0.5 django-config-models>=1.0.0 # Configuration models for Django allowing config management with auditing diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index fca0aa7bfa..82ce0f15a2 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -50,7 +50,7 @@ cssutils==1.0.2 # via pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/github.in, django-statici18n +django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/github.in git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/github.in django-celery==3.3.1 # via -r requirements/edx/base.in @@ -100,9 +100,9 @@ edx-celeryutils==0.5.0 # via -r requirements/edx/base.in, super-csv edx-completion==3.2.0 # via -r requirements/edx/base.in edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in -edx-django-utils==3.2.2 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.2.3 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.0.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.20 # via -r requirements/edx/base.in +edx-enterprise==3.2.21 # 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.0 # 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, xmodule @@ -164,7 +164,7 @@ mysqlclient==1.4.6 # via -r requirements/edx/base.in newrelic==5.14.0.142 # via -r requirements/edx/base.in, edx-django-utils nltk==3.5 # via -r requirements/edx/../edx-sandbox/shared.txt, chem nodeenv==1.4.0 # via -r requirements/edx/base.in -numpy==1.18.4 # via chem, openedx-calc, scipy +numpy==1.18.5 # via chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/base.in git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/github.in @@ -219,7 +219,7 @@ scipy==1.4.1 # via chem, openedx-calc semantic-version==2.8.5 # via edx-drf-extensions shapely==1.7.0 # via -r requirements/edx/base.in simplejson==3.17.0 # 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, cryptography, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, 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, cryptography, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, 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-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 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index 3153f987ff..401ca2084c 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -5,7 +5,7 @@ # make upgrade # coverage==5.1 # via -r requirements/edx/coverage.in -diff-cover==3.0.0 # via -r requirements/edx/coverage.in +diff-cover==3.0.1 # via -r requirements/edx/coverage.in importlib-metadata==1.6.0 # via inflect, pluggy inflect==3.0.2 # via -c requirements/edx/../constraints.txt, jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 4c68103b0c..5f7c4a1a91 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -51,7 +51,6 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/testing.txt coreapi==2.3.3 # via -r requirements/edx/testing.txt, drf-yasg coreschema==0.0.4 # via -r requirements/edx/testing.txt, coreapi, drf-yasg coverage==5.1 # via -r requirements/edx/testing.txt, pytest-cov -git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt git+https://github.com/edx/crowdsourcehinter.git@2178ac72891392106ffef389651aef374177d294#egg=crowdsourcehinter-xblock==0.4 # via -r requirements/edx/testing.txt cryptography==2.9.2 # via -r requirements/edx/testing.txt, django-fernet-fields, edx-enterprise, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery @@ -59,9 +58,9 @@ cssutils==1.0.2 # via -r requirements/edx/testing.txt, pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core -diff-cover==3.0.0 # via -r requirements/edx/testing.txt +diff-cover==3.0.1 # via -r requirements/edx/testing.txt distlib==0.3.0 # via -r requirements/edx/testing.txt, virtualenv -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/testing.txt, django-statici18n +django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/testing.txt git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/testing.txt django-celery==3.3.1 # via -r requirements/edx/testing.txt @@ -112,9 +111,9 @@ edx-celeryutils==0.5.0 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.2.0 # via -r requirements/edx/testing.txt edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt -edx-django-utils==3.2.2 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.2.3 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.0.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.20 # via -r requirements/edx/testing.txt +edx-enterprise==3.2.21 # via -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.4.1 # via -r requirements/edx/testing.txt edx-milestones==0.3.0 # via -r requirements/edx/testing.txt @@ -197,7 +196,7 @@ mysqlclient==1.4.6 # via -r requirements/edx/testing.txt newrelic==5.14.0.142 # via -r requirements/edx/testing.txt, edx-django-utils nltk==3.5 # via -r requirements/edx/testing.txt, chem nodeenv==1.4.0 # via -r requirements/edx/testing.txt -numpy==1.18.4 # via -r requirements/edx/testing.txt, chem, openedx-calc, scipy +numpy==1.18.5 # via -r requirements/edx/testing.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/testing.txt git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/testing.txt @@ -277,7 +276,7 @@ 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.0 # 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, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, 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, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, 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 snowballstemmer==2.0.0 # via sphinx social-auth-core==3.3.3 # via -r requirements/edx/testing.txt, social-auth-app-django @@ -307,7 +306,8 @@ tqdm==4.46.1 # via -r requirements/edx/testing.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin +unidiff==0.6.0 # via -r requirements/edx/testing.txt +git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/github.in b/requirements/edx/github.in index cf910c2465..dec9027273 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -89,4 +89,3 @@ git+https://github.com/edx/xblock-lti-consumer.git@v1.3.1#egg=lti_consumer-xbloc git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index f5b7d9738f..ccf8ffbd17 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -50,7 +50,6 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/base.txt coreapi==2.3.3 # via -r requirements/edx/base.txt, drf-yasg coreschema==0.0.4 # via -r requirements/edx/base.txt, coreapi, drf-yasg coverage==5.1 # via -r requirements/edx/coverage.txt, pytest-cov -git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in git+https://github.com/edx/crowdsourcehinter.git@2178ac72891392106ffef389651aef374177d294#egg=crowdsourcehinter-xblock==0.4 # via -r requirements/edx/base.txt cryptography==2.9.2 # via -r requirements/edx/base.txt, django-fernet-fields, edx-enterprise, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery @@ -58,9 +57,9 @@ cssutils==1.0.2 # via -r requirements/edx/base.txt, pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/testing.in, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core -diff-cover==3.0.0 # via -r requirements/edx/coverage.txt +diff-cover==3.0.1 # via -r requirements/edx/coverage.txt distlib==0.3.0 # via virtualenv -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/base.txt, django-statici18n +django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/base.txt git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/base.txt django-celery==3.3.1 # via -r requirements/edx/base.txt @@ -109,9 +108,9 @@ edx-celeryutils==0.5.0 # via -r requirements/edx/base.txt, super-csv edx-completion==3.2.0 # via -r requirements/edx/base.txt edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt -edx-django-utils==3.2.2 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when +edx-django-utils==3.2.3 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.0.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.2.20 # via -r requirements/edx/base.txt +edx-enterprise==3.2.21 # 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.4.1 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt @@ -189,7 +188,7 @@ mysqlclient==1.4.6 # via -r requirements/edx/base.txt newrelic==5.14.0.142 # via -r requirements/edx/base.txt, edx-django-utils nltk==3.5 # via -r requirements/edx/base.txt, chem nodeenv==1.4.0 # via -r requirements/edx/base.txt -numpy==1.18.4 # via -r requirements/edx/base.txt, chem, openedx-calc, scipy +numpy==1.18.5 # via -r requirements/edx/base.txt, chem, openedx-calc, scipy oauthlib==3.0.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, django-oauth-toolkit, lti-consumer-xblock, requests-oauthlib, social-auth-core openedx-calc==1.0.9 # via -r requirements/edx/base.txt git+https://github.com/edx/edx-ora2.git@v2.7.10#egg=ora2==v2.7.10 # via -r requirements/edx/base.txt @@ -266,7 +265,7 @@ 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.0 # 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, cryptography, diff-cover, django-appconf, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, 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, cryptography, diff-cover, django-classy-tags, django-countries, django-pyfs, django-sekizai, django-simple-history, django-statici18n, drf-yasg, edx-ace, 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 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 @@ -286,7 +285,8 @@ tqdm==4.46.1 # via -r requirements/edx/base.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in typed-ast==1.4.1 # via astroid unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin +unidiff==0.6.0 # via -r requirements/edx/testing.in +git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/base.txt