From d25d4038fdc8a10903c9a8771f0a4decfb93e78a Mon Sep 17 00:00:00 2001 From: Jeff Chaves <58956521+chavesj@users.noreply.github.com> Date: Mon, 19 Oct 2020 16:42:16 -0400 Subject: [PATCH] ENT-3460: updating usage of EnterpriseCustomerBrandingConfiguration, edx-enterprise 3.8.42 (#25376) * bumping enterprise version * adding pillow constraint * updating usage of EnterpriseCustomerBrandingConfiguration --- .../enterprise_support/tests/test_utils.py | 6 +++--- openedx/features/enterprise_support/utils.py | 19 +++++++++++-------- requirements/constraints.txt | 5 ++++- requirements/edx-sandbox/py35.txt | 2 +- requirements/edx/base.txt | 11 ++++------- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 17 +++++++---------- requirements/edx/doc.txt | 4 ++-- requirements/edx/paver.txt | 7 ++----- requirements/edx/testing.txt | 19 ++++++++----------- scripts/xblock/requirements.txt | 2 +- 11 files changed, 44 insertions(+), 50 deletions(-) diff --git a/openedx/features/enterprise_support/tests/test_utils.py b/openedx/features/enterprise_support/tests/test_utils.py index f73a3f9a72..f6e97faf35 100644 --- a/openedx/features/enterprise_support/tests/test_utils.py +++ b/openedx/features/enterprise_support/tests/test_utils.py @@ -76,7 +76,7 @@ class TestEnterpriseUtils(TestCase): self.assertDictEqual(portal, { 'name': enterprise_customer_user.enterprise_customer.name, 'slug': enterprise_customer_user.enterprise_customer.slug, - 'logo': enterprise_customer_user.enterprise_customer.branding_configuration.logo.url, + 'logo': enterprise_customer_user.enterprise_customer.safe_branding_configuration.safe_logo_url, }) @override_waffle_flag(ENTERPRISE_HEADER_LINKS, True) @@ -98,7 +98,7 @@ class TestEnterpriseUtils(TestCase): self.assertDictEqual(portal, { 'name': enterprise_customer_user.enterprise_customer.name, 'slug': enterprise_customer_user.enterprise_customer.slug, - 'logo': None, + 'logo': enterprise_customer_user.enterprise_customer.safe_branding_configuration.safe_logo_url, }) @override_waffle_flag(ENTERPRISE_HEADER_LINKS, True) @@ -132,7 +132,7 @@ class TestEnterpriseUtils(TestCase): self.assertDictEqual(portal, { 'name': enterprise_customer_user.enterprise_customer.name, 'slug': enterprise_customer_user.enterprise_customer.slug, - 'logo': enterprise_customer_user.enterprise_customer.branding_configuration.logo.url, + 'logo': enterprise_customer_user.enterprise_customer.safe_branding_configuration.safe_logo_url, }) @override_waffle_flag(ENTERPRISE_HEADER_LINKS, True) diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py index 5884d58906..5e0f3f6fc9 100644 --- a/openedx/features/enterprise_support/utils.py +++ b/openedx/features/enterprise_support/utils.py @@ -76,7 +76,11 @@ def get_enterprise_sidebar_context(enterprise_customer, is_proxy_login): """ Get context information for enterprise sidebar for the given enterprise customer. - Enterprise Sidebar Context has the following key-value pairs. + Args: + enterprise_customer (dict): customer data from enterprise-customer endpoint, cached + is_proxy_login (bool): If True, use proxy login welcome template + + Returns: Enterprise Sidebar Context with the following key-value pairs. { 'enterprise_name': 'Enterprise Name', 'enterprise_logo_url': 'URL of the enterprise logo image', @@ -354,14 +358,13 @@ def get_enterprise_learner_portal(request): def enterprise_branding_configuration(enterprise_customer_obj): """ Given an instance of ``EnterpriseCustomer``, returns a related - branding_configuration serialized dictionary if it exists, otherwise an empty dictionary. - """ - # We can use hasattr() on one-to-one relationships to avoid exception-catching: - # https://docs.djangoproject.com/en/2.2/topics/db/examples/one_to_one/ - if not hasattr(enterprise_customer_obj, 'branding_configuration'): - return {} + branding_configuration serialized dictionary if it exists, otherwise + the serialized default EnterpriseCustomerBrandingConfiguration object. - branding_config = enterprise_customer_obj.branding_configuration + EnterpriseCustomerBrandingConfigurationSerializer will use default values + for any empty branding config fields. + """ + branding_config = enterprise_customer_obj.safe_branding_configuration return EnterpriseCustomerBrandingConfigurationSerializer(branding_config).data diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 1d71e1707c..b470dd1d89 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -35,7 +35,7 @@ drf-yasg<1.17.1 # 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.8.39 +edx-enterprise==3.8.42 # Upgrading to 2.12.0 breaks several test classes due to API changes, need to update our code accordingly factory-boy==2.8.1 @@ -86,6 +86,9 @@ oauthlib==3.0.1 # path 13.2.0 drops support for Python 3.5 path<13.2.0 +# pillow 8.0.0 drops support for Python 3.5 +pillow<8.0.0 + # ARCHBOM-1141: pip-tools upgrade requires pip upgrade pip-tools<5.0.0 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index 1c99021b63..712e02619b 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -20,7 +20,7 @@ matplotlib==2.2.4 # via -c requirements/edx-sandbox/../constraints.txt, mpmath==1.1.0 # via sympy networkx==2.2 # via -r requirements/edx-sandbox/py35.in nltk==3.5 # via -r requirements/edx-sandbox/shared.txt, chem -numpy==1.16.5 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc, scipy +numpy==1.16.5 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc openedx-calc==1.0.9 # via -r requirements/edx-sandbox/py35.in pycparser==2.20 # via -r requirements/edx-sandbox/shared.txt, cffi pyparsing==2.2.0 # via -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8bee3c58c8..350a781905 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -98,7 +98,7 @@ 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.8.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.2.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.8.39 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.8.42 # via -c requirements/edx/../constraints.txt, -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 @@ -128,7 +128,6 @@ help-tokens==1.1.2 # via -r requirements/edx/base.in html5lib==1.1 # via -r requirements/edx/base.in, ora2 icalendar==4.0.7 # via -r requirements/edx/base.in idna==2.10 # via -r requirements/edx/paver.txt, requests -importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, kombu, path inflection==0.5.1 # via drf-yasg ipaddress==1.0.23 # via -r requirements/edx/base.in isodate==0.6.0 # via python3-saml @@ -154,7 +153,6 @@ maxminddb==1.5.4 # via -c requirements/edx/../constraints.txt, geoip2 mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/github.in mongoengine==0.20.0 # via -r requirements/edx/base.in -more-itertools==8.5.0 # via -r requirements/edx/paver.txt, zipp mpmath==1.1.0 # via sympy mysqlclient==2.0.1 # via -r requirements/edx/base.in newrelic==5.20.1.150 # via -r requirements/edx/base.in, edx-django-utils @@ -169,9 +167,9 @@ path.py==12.5.0 # via edx-enterprise, edx-i18n-tools, ora2, staff-grad path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, path.py pathtools==0.1.2 # via -r requirements/edx/paver.txt, watchdog paver==1.3.4 # via -r requirements/edx/paver.txt -pbr==5.5.0 # via -r requirements/edx/paver.txt, stevedore +pbr==5.5.1 # via -r requirements/edx/paver.txt, stevedore piexif==1.1.3 # via -r requirements/edx/base.in -pillow==7.2.0 # via -r requirements/edx/base.in, edx-enterprise, edx-organizations +pillow==7.2.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, edx-enterprise, edx-organizations polib==1.1.0 # via edx-i18n-tools psutil==5.7.2 # via -r requirements/edx/paver.txt, edx-django-utils py2neo==3.1.2 # via -r requirements/edx/base.in @@ -230,7 +228,7 @@ tqdm==4.50.2 # via -r requirements/edx/../edx-sandbox/shared.txt, n ua-parser==0.10.0 # via django-cookies-samesite unicodecsv==0.14.1 # via -r requirements/edx/base.in, edx-enterprise uritemplate==3.0.1 # via coreapi, drf-yasg -urllib3==1.25.10 # via -r requirements/edx/paver.txt, elasticsearch, geoip2, requests +urllib3==1.25.11 # via -r requirements/edx/paver.txt, elasticsearch, geoip2, requests user-util==0.3.1 # via -r requirements/edx/base.in vine==1.3.0 # via amqp, celery voluptuous==0.12.0 # via ora2 @@ -245,7 +243,6 @@ xblock-utils==2.1.1 # via -r requirements/edx/base.in, edx-sga, lti-consum xblock==1.4.0 # via -r requirements/edx/base.in, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.8 # via python3-saml xss-utils==0.1.3 # via -r requirements/edx/base.in -zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.txt, importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index da1c7f9749..c001e72690 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -6,7 +6,7 @@ # coverage==5.3 # via -r requirements/edx/coverage.in diff-cover==4.0.1 # via -r requirements/edx/coverage.in -importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, inflect, pluggy +importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, inflect inflect==3.0.2 # via -c requirements/edx/../constraints.txt, jinja2-pluralize jinja2-pluralize==0.3.0 # via diff-cover jinja2==2.11.2 # via diff-cover, jinja2-pluralize diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index cd57a2f591..93b38888f2 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -109,7 +109,7 @@ 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.8.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.2.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.8.39 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.8.42 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 edx-lint==1.5.2 # via -r requirements/edx/testing.txt edx-milestones==0.3.0 # via -r requirements/edx/testing.txt @@ -150,8 +150,7 @@ httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requi icalendar==4.0.7 # via -r requirements/edx/testing.txt idna==2.10 # via -r requirements/edx/testing.txt, requests imagesize==1.2.0 # via sphinx -importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, inflect, jsonschema, kombu, path, pluggy, pytest, pytest-randomly, tox, virtualenv -importlib-resources==3.0.0 # via -r requirements/edx/testing.txt, virtualenv +importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, inflect inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, jinja2-pluralize inflection==0.5.1 # via -r requirements/edx/testing.txt, drf-yasg iniconfig==1.1.1 # via -r requirements/edx/testing.txt, pytest @@ -199,12 +198,11 @@ ora2==2.10.2 # via -r requirements/edx/testing.txt packaging==20.4 # via -r requirements/edx/testing.txt, bleach, drf-yasg, pytest, sphinx, tox path.py==12.5.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-i18n-tools, ora2, staff-graded-xblock, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, path.py -pathlib2==2.3.5 # via -r requirements/edx/testing.txt, pytest pathtools==0.1.2 # via -r requirements/edx/testing.txt, watchdog paver==1.3.4 # via -r requirements/edx/testing.txt -pbr==5.5.0 # via -r requirements/edx/testing.txt, stevedore +pbr==5.5.1 # via -r requirements/edx/testing.txt, stevedore piexif==1.1.3 # via -r requirements/edx/testing.txt -pillow==7.2.0 # via -r requirements/edx/testing.txt, edx-enterprise, edx-organizations +pillow==7.2.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, edx-enterprise, edx-organizations pip-tools==4.5.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/pip-tools.txt pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools @@ -267,7 +265,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, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, 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, mock, openedx-calc, packaging, pathlib2, 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, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, 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, mock, openedx-calc, packaging, 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 @@ -297,12 +295,11 @@ tox-battery==0.6.1 # via -r requirements/edx/testing.txt tox==3.20.1 # via -r requirements/edx/testing.txt, tox-battery tqdm==4.50.2 # via -r requirements/edx/testing.txt, nltk transifex-client==0.13.12 # via -r requirements/edx/testing.txt -typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid ua-parser==0.10.0 # via -r requirements/edx/testing.txt, django-cookies-samesite 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 uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg -urllib3==1.25.10 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client +urllib3==1.25.11 # 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.0.35 # via -r requirements/edx/testing.txt, tox @@ -319,7 +316,7 @@ xblock-utils==2.1.1 # via -r requirements/edx/testing.txt, edx-sga, lti-co xblock==1.4.0 # via -r requirements/edx/testing.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.8 # via -r requirements/edx/testing.txt, python3-saml xss-utils==0.1.3 # via -r requirements/edx/testing.txt -zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata, importlib-resources +zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 4b820b3c01..3427252724 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -20,7 +20,7 @@ imagesize==1.2.0 # via sphinx jinja2==2.11.2 # via code-annotations, sphinx markupsafe==1.1.1 # via jinja2 packaging==20.4 # via sphinx -pbr==5.5.0 # via stevedore +pbr==5.5.1 # via stevedore pygments==2.7.1 # via sphinx pyparsing==2.4.7 # via packaging python-slugify==4.0.1 # via code-annotations @@ -40,7 +40,7 @@ sphinxcontrib-serializinghtml==1.1.4 # via sphinx sqlparse==0.4.1 # via django stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, code-annotations text-unidecode==1.3 # via python-slugify -urllib3==1.25.10 # via requests +urllib3==1.25.11 # via requests # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 7e35d16ab8..bfb0a2fe3a 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -8,23 +8,20 @@ certifi==2020.6.20 # via requests chardet==3.0.4 # via requests edx-opaque-keys==2.1.1 # via -r requirements/edx/paver.in idna==2.10 # via requests -importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, path lazy==1.4 # via -r requirements/edx/paver.in libsass==0.10.0 # via -r requirements/edx/paver.in markupsafe==1.1.1 # via -r requirements/edx/paver.in mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in -more-itertools==8.5.0 # via zipp path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in pathtools==0.1.2 # via watchdog paver==1.3.4 # via -r requirements/edx/paver.in -pbr==5.5.0 # via stevedore +pbr==5.5.1 # via stevedore psutil==5.7.2 # via -r requirements/edx/paver.in pymongo==3.10.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys python-memcached==1.59 # via -r requirements/edx/paver.in requests==2.24.0 # via -r requirements/edx/paver.in six==1.15.0 # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in, edx-opaque-keys -urllib3==1.25.10 # via requests +urllib3==1.25.11 # via requests watchdog==0.10.3 # via -r requirements/edx/paver.in wrapt==1.11.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/paver.in -zipp==1.0.0 # via -c requirements/edx/../constraints.txt, importlib-metadata diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index eadc04db7a..bd2890f902 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -106,7 +106,7 @@ 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.8.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-when edx-drf-extensions==6.2.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval -edx-enterprise==3.8.39 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.8.42 # via -c requirements/edx/../constraints.txt, -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.5.2 # via -r requirements/edx/testing.in edx-milestones==0.3.0 # via -r requirements/edx/base.txt @@ -145,8 +145,7 @@ html5lib==1.1 # via -r requirements/edx/base.txt, ora2 httpretty==0.9.7 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in icalendar==4.0.7 # via -r requirements/edx/base.txt idna==2.10 # via -r requirements/edx/base.txt, requests -importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, inflect, kombu, path, pluggy, pytest, pytest-randomly, tox, virtualenv -importlib-resources==3.0.0 # via virtualenv +importlib-metadata==1.7.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, inflect inflect==3.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, jinja2-pluralize inflection==0.5.1 # via -r requirements/edx/base.txt, drf-yasg iniconfig==1.1.1 # via pytest @@ -178,7 +177,7 @@ mccabe==0.6.1 # via pylint mock==3.0.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, xblock-drag-and-drop-v2, xblock-poll git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2 # via -r requirements/edx/base.txt mongoengine==0.20.0 # via -r requirements/edx/base.txt -more-itertools==8.5.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, zipp +more-itertools==8.5.0 # via -r requirements/edx/coverage.txt, zipp mpmath==1.1.0 # via -r requirements/edx/base.txt, sympy mysqlclient==2.0.1 # via -r requirements/edx/base.txt newrelic==5.20.1.150 # via -r requirements/edx/base.txt, edx-django-utils @@ -191,12 +190,11 @@ ora2==2.10.2 # via -r requirements/edx/base.txt packaging==20.4 # via -r requirements/edx/base.txt, bleach, drf-yasg, pytest, tox path.py==12.5.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-i18n-tools, ora2, staff-graded-xblock, xmodule path==13.1.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, path.py -pathlib2==2.3.5 # via pytest pathtools==0.1.2 # via -r requirements/edx/base.txt, watchdog paver==1.3.4 # via -r requirements/edx/base.txt -pbr==5.5.0 # via -r requirements/edx/base.txt, stevedore +pbr==5.5.1 # via -r requirements/edx/base.txt, stevedore piexif==1.1.3 # via -r requirements/edx/base.txt -pillow==7.2.0 # via -r requirements/edx/base.txt, edx-enterprise, edx-organizations +pillow==7.2.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, edx-enterprise, edx-organizations pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools psutil==5.7.2 # via -r requirements/edx/base.txt, edx-django-utils, pytest-xdist @@ -256,7 +254,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, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, 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, mock, openedx-calc, packaging, pathlib2, 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, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, 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, mock, openedx-calc, packaging, 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 @@ -276,12 +274,11 @@ tox-battery==0.6.1 # via -r requirements/edx/testing.in tox==3.20.1 # via -r requirements/edx/testing.in, tox-battery tqdm==4.50.2 # via -r requirements/edx/base.txt, nltk transifex-client==0.13.12 # via -r requirements/edx/testing.in -typed-ast==1.4.1 # via astroid ua-parser==0.10.0 # via -r requirements/edx/base.txt, django-cookies-samesite 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 uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg -urllib3==1.25.10 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client +urllib3==1.25.11 # 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.0.35 # via tox @@ -297,7 +294,7 @@ xblock-utils==2.1.1 # via -r requirements/edx/base.txt, edx-sga, lti-consu xblock==1.4.0 # via -r requirements/edx/base.txt, acid-xblock, crowdsourcehinter-xblock, done-xblock, edx-completion, edx-sga, edx-user-state-client, edx-when, lti-consumer-xblock, ora2, rate-xblock, staff-graded-xblock, xblock-discussion, xblock-drag-and-drop-v2, xblock-google-drive, xblock-poll, xblock-utils xmlsec==1.3.8 # via -r requirements/edx/base.txt, python3-saml xss-utils==0.1.3 # via -r requirements/edx/base.txt -zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, importlib-metadata, importlib-resources +zipp==1.0.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/coverage.txt, importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 47f4334eda..249fd79d26 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -8,4 +8,4 @@ certifi==2020.6.20 # via requests chardet==3.0.4 # via requests idna==2.10 # via requests requests==2.24.0 # via -r scripts/xblock/requirements.in -urllib3==1.25.10 # via requests +urllib3==1.25.11 # via requests