From e5621c91fce8cd774dba225e58be6dacdc649015 Mon Sep 17 00:00:00 2001 From: Julia Eskew Date: Mon, 28 Jan 2019 16:38:26 -0500 Subject: [PATCH] Add code-annotations. Un-pin stevedore. Upgrade deps. --- requirements/edx/base.txt | 3 +-- requirements/edx/development.txt | 3 ++- requirements/edx/paver.in | 2 +- requirements/edx/paver.txt | 3 +-- requirements/edx/testing.in | 1 + requirements/edx/testing.txt | 5 +++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index bb529205b5..1b08481758 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -44,7 +44,6 @@ aniso8601==4.1.0 # via tincan anyjson==0.3.3 # via kombu appdirs==1.4.3 # via fs argh==0.26.2 -argparse==1.4.0 asn1crypto==0.24.0 attrs==17.4.0 babel==1.3 @@ -228,7 +227,7 @@ sorl-thumbnail==12.3 sortedcontainers==0.9.2 soupsieve==1.7.3 # via beautifulsoup4 sqlparse==0.2.4 -stevedore==1.10.0 +stevedore==1.30.0 sympy==0.7.1 tincan==0.0.5 # via edx-enterprise unicodecsv==0.14.1 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 4b1eb8b022..37470de92f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -71,6 +71,7 @@ cffi==1.11.5 chardet==3.0.4 click-log==0.1.8 click==7.0 +code-annotations==0.2.3 colorama==0.4.1 configparser==3.7.1 constantly==15.1.0 @@ -321,7 +322,7 @@ sphinx==1.8.4 sphinxcontrib-websupport==1.1.0 # via sphinx splinter==0.9.0 sqlparse==0.2.4 -stevedore==1.10.0 +stevedore==1.30.0 sure==1.4.11 sympy==0.7.1 testfixtures==6.5.0 diff --git a/requirements/edx/paver.in b/requirements/edx/paver.in index 36b1cb4054..b57197f434 100644 --- a/requirements/edx/paver.in +++ b/requirements/edx/paver.in @@ -21,7 +21,7 @@ psutil==1.2.1 # Library for retrieving information on runn pymongo==2.9.1 # via edx-opaque-keys python-memcached==1.48 # Python interface to the memcached memory cache daemon requests # Simple interface for making HTTP requests -stevedore==1.10.0 # via edx-opaque-keys +stevedore # # Support for runtime plugins, used for XBlocks and edx-platform Django app plugins watchdog # Used in paver watch_assets wrapt==1.10.5 # Decorator utilities used in the @timed paver task decorator diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 979a8e2427..aef06f419d 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -5,7 +5,6 @@ # make upgrade # argh==0.26.2 # via watchdog -argparse==1.4.0 # via stevedore certifi==2018.11.29 # via requests chardet==3.0.4 # via requests edx-opaque-keys==0.4.4 @@ -24,7 +23,7 @@ python-memcached==1.48 pyyaml==3.13 # via watchdog requests==2.21.0 six==1.11.0 -stevedore==1.10.0 +stevedore==1.30.0 urllib3==1.23 # via requests watchdog==0.9.0 wrapt==1.10.5 diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index 11fdc7d599..d4ce3d011d 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -21,6 +21,7 @@ beautifulsoup4 # Library for extracting data from HTML and XML files before_after # Syntactic sugar for mock, only used in one test case, not Python 3 compatible bok-choy # Framework for browser automation tests, based on selenium caniusepython3 # Library for checking the ability to upgrade to python3 +code-annotations # Perform code annotation checking, such as for PII annotations cssselect # Used to extract HTML fragments via CSS selectors in 2 test cases and pyquery ddt # Run a test case multiple times with different input; used in many, many of our tests edx-i18n-tools>=0.4.6 # Commands for developers and translators to extract, compile and validate translations diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 53bc5aba32..09bd771ede 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -46,7 +46,7 @@ anyjson==0.3.3 apipkg==1.5 # via execnet appdirs==1.4.3 argh==0.26.2 -argparse==1.4.0 +argparse==1.4.0 # via unittest2 asn1crypto==0.24.0 astroid==1.5.3 # via edx-lint, pylint, pylint-celery atomicwrites==1.3.0 # via pytest @@ -69,6 +69,7 @@ cffi==1.11.5 chardet==3.0.4 click-log==0.1.8 # via edx-lint click==7.0 +code-annotations==0.2.3 colorama==0.4.1 # via radon configparser==3.7.1 # via entrypoints, flake8, pylint constantly==15.1.0 # via twisted @@ -308,7 +309,7 @@ sortedcontainers==0.9.2 soupsieve==1.7.3 splinter==0.9.0 sqlparse==0.2.4 -stevedore==1.10.0 +stevedore==1.30.0 sure==1.4.11 sympy==0.7.1 testfixtures==6.5.0