From bcd6e6d890e062336d5d5913224e621f6ac80e32 Mon Sep 17 00:00:00 2001 From: Josh McLaughlin Date: Wed, 26 Feb 2020 18:30:34 -0800 Subject: [PATCH] Update test_requirements.in as well --- Makefile | 2 +- test_requirements.in | 9 ++-- test_requirements.txt | 99 +++++++++++++++++++++---------------------- 3 files changed, 53 insertions(+), 57 deletions(-) diff --git a/Makefile b/Makefile index ac7f5836..ad6f3564 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ help: ## display this help message @perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m %-25s\033[0m %s\n", $$1, $$2}' upgrade: - pip-compile --output-file test_requirements.txt test_requirements.in + pip-compile --upgrade --output-file test_requirements.txt test_requirements.in extract_translations: ## extract strings to be translated, outputting .po files cd $(WORKING_DIR) && i18n_tool extract diff --git a/test_requirements.in b/test_requirements.in index 24cb8291..fddc3662 100644 --- a/test_requirements.in +++ b/test_requirements.in @@ -1,19 +1,18 @@ -e xblock-sdk bok_choy==0.7.1 ddt -django_nose>=1.4.4 +django_nose>=1.4.6 -e git+https://github.com/edx/acid-block.git@e46f9cda8a03e121a00c7e347084d142d22ebfb7#egg=acid-xblock --e git+https://github.com/edx/django-pyfs.git@1.0.3#egg=django-pyfs==1.0.3 --e git+https://github.com/edx/xblock-utils.git@v1.2.2#egg=xblock-utils +-e git+https://github.com/edx/django-pyfs.git@2.1#egg=django-pyfs==2.1 +-e git+https://github.com/edx/xblock-utils.git@v1.2.3#egg=xblock-utils lazy lxml mock selenium==3.4.1 webob XBlock>=1.2 -Django>=1.11,<2.0 +Django~=2.2.10 pytest -coverage<5 pylint pycodestyle -r xblock-sdk/requirements/base.txt diff --git a/test_requirements.txt b/test_requirements.txt index f3107f2b..3d516bbf 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -5,83 +5,80 @@ # pip-compile --output-file=test_requirements.txt test_requirements.in # -e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock --e git+https://github.com/edx/django-pyfs.git@1.0.3#egg=django-pyfs==1.0.3 --e xblock-sdk --e git+https://github.com/edx/xblock-utils.git@v1.2.2#egg=xblock-utils +-e git+https://github.com/edx/django-pyfs.git@2.1#egg=django-pyfs==2.1 +-e file:///home/josh/opencraft/devstack/src/problem-builder/xblock-sdk +-e git+https://github.com/edx/xblock-utils.git@v1.2.3#egg=xblock-utils appdirs==1.4.3 -astroid==1.6.6 # via pylint -atomicwrites==1.3.0 -attrs==19.2.0 -backports.functools-lru-cache==1.6.1 # via astroid, isort, pylint -backports.os==0.1.1 +astroid==2.3.3 # via pylint +attrs==19.3.0 binaryornot==0.4.4 bok_choy==0.7.1 -boto3==1.4.8 +boto3==1.12.8 boto==2.39.0 -botocore==1.8.50 +botocore==1.15.8 +certifi==2019.11.28 chardet==3.0.4 -configparser==4.0.2 -contextlib2==0.6.0 cookiecutter==0.9.0 -coverage==4.5.4 -ddt==1.2.1 +coverage==5.0.3 +ddt==1.2.2 +distlib==0.3.0 django-nose==1.4.6 -django==1.11.25 +django==2.2.10 docutils==0.15.2 -enum34==1.1.6 filelock==3.0.12 -fs-s3fs==0.1.5 +fs-s3fs==0.1.8 fs==2.0.27 -funcsigs==1.0.2 -future==0.17.1 -futures==3.3.0 ; python_version == "2.7" -importlib-metadata==0.23 +idna==2.8 +importlib-metadata==1.5.0 +importlib-resources==1.0.2 isort==4.3.21 # via pylint -jinja2==2.10.1 -jmespath==0.9.4 +jinja2==2.11.1 +jmespath==0.9.5 lazy-object-proxy==1.4.3 # via astroid lazy==1.1 lxml==3.8.0 -mako==1.1.0 +mako==1.1.1 markupsafe==1.1.1 mccabe==0.6.1 # via pylint mock==3.0.5 -more-itertools==5.0.0 +more-itertools==8.2.0 needle==0.5.0 nose==1.3.7 -packaging==19.2 +packaging==20.1 pathlib2==2.3.5 -pillow==6.1.0 -pluggy==0.13.0 -py==1.8.0 +pillow==7.0.0 +pluggy==0.13.1 +py==1.8.1 pycodestyle==2.5.0 -pylint==1.9.5 -pyparsing==2.4.2 +pylint==2.4.4 +pyparsing==2.4.6 pypng==0.0.20 -pytest-cov==2.7.1 -pytest-django==3.5.1 -pytest==4.6.5 -python-dateutil==2.8.0 -pytz==2019.2 -pyyaml==5.1.2 -requests==2.9.1 -s3transfer==0.1.13 -scandir==1.10.0 +pytest-cov==2.8.1 +pytest-django==3.8.0 +pytest-rerunfailures==8.0 +pytest==5.3.5 +python-dateutil==2.8.1 +pytz==2019.3 +pyyaml==5.3 +requests==2.22.0 +s3transfer==0.3.3 selenium==3.4.1 -simplejson==3.16.0 -singledispatch==3.4.0.3 # via astroid, pylint -six==1.10.0 +simplejson==3.17.0 +six==1.14.0 +sqlparse==0.3.0 toml==0.10.0 -tox-battery==0.5.1 -tox==3.14.0 +tox-battery==0.5.2 +tox==3.14.5 +typed-ast==1.4.1 # via astroid typing==3.7.4.1 -virtualenv==16.7.5 -wcwidth==0.1.7 -web-fragments==0.3.0 -webob==1.8.5 +urllib3==1.25.8 +virtualenv==20.0.7 +wcwidth==0.1.8 +web-fragments==0.3.1 +webob==1.8.6 wrapt==1.11.2 # via astroid -xblock==1.2.6 -zipp==0.6.0 +xblock==1.2.9 +zipp==1.2.0 # The following packages are considered to be unsafe in a requirements file: # setuptools