From 9f6ac8a3af9865b321d90c21a179a5ed348a3cbd Mon Sep 17 00:00:00 2001 From: Feanil Patel <feanil@edx.org> Date: Wed, 23 May 2018 10:35:03 -0400 Subject: [PATCH] Run make upgrade. --- requirements/edx-sandbox/base.txt | 1 - requirements/edx-sandbox/shared.txt | 1 - requirements/edx/base.txt | 5 ++--- requirements/edx/coverage.txt | 1 - requirements/edx/development.txt | 8 ++++---- requirements/edx/paver.txt | 1 - requirements/edx/pip-tools.txt | 1 - requirements/edx/testing.txt | 8 ++++---- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt index 6ec232c40fb..43115f056f2 100644 --- a/requirements/edx-sandbox/base.txt +++ b/requirements/edx-sandbox/base.txt @@ -4,7 +4,6 @@ # # make upgrade # - common/lib/calc common/lib/chem common/lib/sandbox-packages diff --git a/requirements/edx-sandbox/shared.txt b/requirements/edx-sandbox/shared.txt index e9f57b37502..7fb61cce4dc 100644 --- a/requirements/edx-sandbox/shared.txt +++ b/requirements/edx-sandbox/shared.txt @@ -4,7 +4,6 @@ # # make upgrade # - -e common/lib/calc -e common/lib/chem -e common/lib/sandbox-packages diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index a41ad6d6310..f862b540049 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -4,7 +4,6 @@ # # make upgrade # - -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e common/lib/calc -e common/lib/capa @@ -32,7 +31,6 @@ git+https://github.com/edx/edx-ora2.git@2.1.16#egg=ora2==2.1.16 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock git+https://github.com/edx/RecommenderXBlock.git@1.3#egg=recommender-xblock==1.3 -git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx -e common/lib/safe_lxml -e common/lib/sandbox-packages -e common/lib/symmath @@ -156,7 +154,7 @@ jsondiff==1.1.1 # via edx-enterprise jsonfield==2.0.2 kombu==3.0.37 # via celery lazy==1.1 -lepl==5.1.3 +lepl==5.1.3 # via rfc6266-parser libsass==0.10.0 loremipsum==1.0.5 lxml==3.8.0 @@ -211,6 +209,7 @@ redis==2.10.6 reportlab==3.1.44 requests-oauthlib==0.6.1 requests==2.9.1 +rfc6266-parser==0.0.5.post2 rules==1.3 s3transfer==0.1.13 # via boto3 sailthru-client==2.2.3 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index c721171b435..2ee11724863 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -4,7 +4,6 @@ # # make upgrade # - coverage==4.2 diff-cover==0.9.8 inflect==0.3.1 # via jinja2-pluralize diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b82870b7e1f..d70b10c8544 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -4,7 +4,6 @@ # # make upgrade # - -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e common/lib/calc -e common/lib/capa @@ -35,7 +34,6 @@ git+https://github.com/edx/edx-ora2.git@2.1.16#egg=ora2==2.1.16 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock git+https://github.com/edx/RecommenderXBlock.git@1.3#egg=recommender-xblock==1.3 -git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx -e common/lib/safe_lxml -e common/lib/sandbox-packages -e common/lib/symmath @@ -55,6 +53,7 @@ argh==0.26.2 argparse==1.4.0 asn1crypto==0.24.0 astroid==1.5.2 +atomicwrites==1.1.5 attrs==17.4.0 babel==1.3 backports.functools-lru-cache==1.5 @@ -63,7 +62,7 @@ beautifulsoup==3.2.1 before-after==1.0.1 billiard==3.3.0.23 bleach==1.4 -bok-choy==0.7.2 +bok-choy==0.7.3 boto3==1.4.8 boto==2.39.0 botocore==1.8.17 @@ -271,7 +270,7 @@ pytest-django==3.1.2 pytest-forked==0.2 pytest-randomly==1.2.3 pytest-xdist==1.22.2 -pytest==3.5.1 +pytest==3.6.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 python-memcached==1.48 @@ -290,6 +289,7 @@ redis==2.10.6 reportlab==3.1.44 requests-oauthlib==0.6.1 requests==2.9.1 +rfc6266-parser==0.0.5.post2 rules==1.3 s3transfer==0.1.13 sailthru-client==2.2.3 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index fe881ec7897..f00bbe947b7 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -4,7 +4,6 @@ # # make upgrade # - argh==0.26.2 # via watchdog argparse==1.4.0 # via stevedore edx-opaque-keys==0.4.4 diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index 44aa65b2a3d..e7027f3fb21 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -4,7 +4,6 @@ # # make upgrade # - click==6.7 # via pip-tools first==2.0.1 # via pip-tools pip-tools==2.0.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 065b6370320..7df6c40b912 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -4,7 +4,6 @@ # # make upgrade # - -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock -e common/lib/calc -e common/lib/capa @@ -33,7 +32,6 @@ git+https://github.com/edx/edx-ora2.git@2.1.16#egg=ora2==2.1.16 -e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev -e git+https://github.com/edx/RateXBlock.git@367e19c0f6eac8a5f002fd0f1559555f8e74bfff#egg=rate-xblock git+https://github.com/edx/RecommenderXBlock.git@1.3#egg=recommender-xblock==1.3 -git+https://github.com/edx/rfc6266.git@v0.0.5-edx#egg=rfc6266==0.0.5-edx -e common/lib/safe_lxml -e common/lib/sandbox-packages -e common/lib/symmath @@ -52,6 +50,7 @@ argh==0.26.2 argparse==1.4.0 asn1crypto==0.24.0 astroid==1.5.2 # via edx-lint, pylint, pylint-celery, pylint-plugin-utils +atomicwrites==1.1.5 # via pytest attrs==17.4.0 babel==1.3 backports.functools-lru-cache==1.5 # via astroid, pylint @@ -60,7 +59,7 @@ beautifulsoup==3.2.1 before-after==1.0.1 billiard==3.3.0.23 bleach==1.4 -bok-choy==0.7.2 +bok-choy==0.7.3 boto3==1.4.8 boto==2.39.0 botocore==1.8.17 @@ -260,7 +259,7 @@ pytest-django==3.1.2 pytest-forked==0.2 # via pytest-xdist pytest-randomly==1.2.3 pytest-xdist==1.22.2 -pytest==3.5.1 +pytest==3.6.0 python-dateutil==2.4.0 python-levenshtein==0.12.0 python-memcached==1.48 @@ -279,6 +278,7 @@ redis==2.10.6 reportlab==3.1.44 requests-oauthlib==0.6.1 requests==2.9.1 +rfc6266-parser==0.0.5.post2 rules==1.3 s3transfer==0.1.13 sailthru-client==2.2.3 -- GitLab