From be8909c415490be49eb3021034724b7cf9ab550d Mon Sep 17 00:00:00 2001 From: Robert Raposa <rraposa@edx.org> Date: Fri, 20 Nov 2020 21:07:30 -0500 Subject: [PATCH] code_owner for enterprise celery tasks Upgrade enterprise to 3.12.3 to get code_owner monitoring for celery tasks. ARCHBOM-1260 --- requirements/constraints.txt | 2 +- requirements/edx/base.txt | 5 +---- requirements/edx/development.txt | 11 ++++------- requirements/edx/paver.txt | 3 --- requirements/edx/testing.txt | 13 +++++-------- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 1b454d1b350..f807c761a7c 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.12.2 +edx-enterprise==3.12.3 # We expect v2.0.0 to introduce large breaking changes in the feature toggle API edx-toggles<2.0.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 9b792ecbf3d..92ad2d2d5e8 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.13.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2 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.12.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in +edx-enterprise==3.12.3 # 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 @@ -129,7 +129,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 @@ -155,7 +154,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.21.0 # via -r requirements/edx/base.in -more-itertools==8.6.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.22.1.152 # via -r requirements/edx/base.in, edx-django-utils @@ -247,7 +245,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.9 # 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/development.txt b/requirements/edx/development.txt index 6bedb7a7003..b62901de3b9 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.13.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2 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.12.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt +edx-enterprise==3.12.3 # 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 @@ -151,8 +151,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.2.1 # 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 @@ -200,7 +199,6 @@ ora2==2.12.0 # 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.1 # via -r requirements/edx/testing.txt, stevedore @@ -268,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, 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-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, codejail, 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-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 @@ -299,7 +297,6 @@ 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.52.0 # via -r requirements/edx/testing.txt, nltk transifex-client==0.14.2 # 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 @@ -321,7 +318,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.9 # 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/paver.txt b/requirements/edx/paver.txt index a78460e62cc..a057927e7b4 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -8,12 +8,10 @@ certifi==2020.11.8 # 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.6.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 @@ -27,4 +25,3 @@ stevedore==1.32.0 # via -c requirements/edx/../constraints.txt, -r requi urllib3==1.26.2 # 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 93387f7437d..d284685580a 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.13.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when, ora2 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.12.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt +edx-enterprise==3.12.3 # 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 @@ -146,8 +146,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.2.1 # 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 @@ -179,7 +178,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.21.0 # via -r requirements/edx/base.txt -more-itertools==8.6.0 # via -r requirements/edx/base.txt, -r requirements/edx/coverage.txt, zipp +more-itertools==8.6.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.22.1.152 # via -r requirements/edx/base.txt, edx-django-utils @@ -192,7 +191,6 @@ ora2==2.12.0 # 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.1 # via -r requirements/edx/base.txt, stevedore @@ -257,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, 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, 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, codejail, 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, 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 @@ -278,7 +276,6 @@ 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.52.0 # via -r requirements/edx/base.txt, nltk transifex-client==0.14.2 # 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 @@ -299,7 +296,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.9 # 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 -- GitLab