From 4ddb3b72efc0358e718c0ac14ccc6628a56ab802 Mon Sep 17 00:00:00 2001 From: Aarif Date: Thu, 20 May 2021 18:19:07 +0500 Subject: [PATCH] fixed pip and pip-tools version conflicts to fix upgrade requirements job (#17) --- .gitignore | 1 + Makefile | 2 + requirements/base.txt | 56 +++--- requirements/constraints.txt | 8 +- requirements/dev.txt | 327 ++++++++++++++++++++++++++++------- requirements/doc.txt | 232 +++++++++++++++++++------ requirements/pip-tools.txt | 13 +- requirements/pip.in | 5 + requirements/pip.txt | 14 ++ requirements/quality.txt | 206 ++++++++++++++++------ requirements/test.txt | 127 ++++++++++---- requirements/travis.txt | 68 +++++--- 12 files changed, 808 insertions(+), 251 deletions(-) create mode 100644 requirements/pip.in create mode 100644 requirements/pip.txt diff --git a/.gitignore b/.gitignore index 16cd01f..b1c7cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_STORE *.swp +.vscode/ \ No newline at end of file diff --git a/Makefile b/Makefile index acbf880..c60d9e7 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! + pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in $(PIP_COMPILE) -o requirements/base.txt requirements/base.in $(PIP_COMPILE) -o requirements/test.txt requirements/test.in @@ -54,6 +55,7 @@ pii_check: ## check for PII annotations on all Django models tox -e pii_check requirements: ## install development environment requirements + pip install -r requirements/pip.txt pip install -qr requirements/pip-tools.txt pip-sync requirements/dev.txt requirements/private.* diff --git a/requirements/base.txt b/requirements/base.txt index 48122b9..43e7ca8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,26 +4,36 @@ # # make upgrade # -atomicwrites==1.3.0 # via pytest -attrs==19.3.0 # via pytest -configparser==4.0.2 # via importlib-metadata -contextlib2==0.6.0.post1 # via importlib-metadata -funcsigs==1.0.2 # via pytest -importlib-metadata==1.4.0 # via pluggy, pytest -more-itertools==5.0.0 # via pytest, zipp -numpy==1.16.6 # via pandas -packaging==20.0 # via pytest -pandas==0.24.2 -pathlib2==2.3.5 # via importlib-metadata, pytest -pluggy==0.13.1 # via pytest -py==1.8.1 # via pytest -pyparsing==2.4.6 # via packaging -pytest-json-report==1.2.1 -pytest-metadata==1.8.0 # via pytest-json-report -pytest==4.6.9 -python-dateutil==2.8.1 # via pandas -pytz==2019.3 # via pandas -scandir==1.10.0 # via pathlib2 -six==1.13.0 # via more-itertools, packaging, pathlib2, pytest, python-dateutil -wcwidth==0.1.8 # via pytest -zipp==1.0.0 # via importlib-metadata +attrs==21.2.0 + # via pytest +iniconfig==1.1.1 + # via pytest +numpy==1.20.3 + # via pandas +packaging==20.9 + # via pytest +pandas==1.2.4 + # via -r requirements/base.in +pluggy==0.13.1 + # via pytest +py==1.10.0 + # via pytest +pyparsing==2.4.7 + # via packaging +pytest-json-report==1.3.0 + # via -r requirements/base.in +pytest-metadata==1.11.0 + # via pytest-json-report +pytest==6.2.4 + # via + # -r requirements/base.in + # pytest-json-report + # pytest-metadata +python-dateutil==2.8.1 + # via pandas +pytz==2021.1 + # via pandas +six==1.16.0 + # via python-dateutil +toml==0.10.2 + # via pytest diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 3b08bd0..a1fe898 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -14,5 +14,9 @@ Django<2.3 # Version 4.0.0 dropped support for Django < 2.0.1 django-model-utils<4.0.0 -# See https://openedx.atlassian.net/browse/BOM-2247 for details. -pip-tools==5.3.0 +# Sphinx>=4.0.1 requires Jinja2<3.0.0, MarkupSafe<2.0.0 (Can be removed once Sphinx==4.0.2 is released) +Jinja2<3.0.0 +MarkupSafe<2.0.0 + +# click>=8.0.0 causes conflicts with Sphinx>=4.0.0(which requires jinja2<3.2, click<8.0) +click<8.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 30e28f8..9cd4c4a 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -4,76 +4,275 @@ # # make upgrade # -astroid==1.6.6 -atomicwrites==1.3.0 -attrs==19.3.0 -backports.functools-lru-cache==1.6.1 -certifi==2019.11.28 -chardet==3.0.4 +appdirs==1.4.4 + # via + # -r requirements/travis.txt + # virtualenv +astroid==2.5.6 + # via + # -r requirements/quality.txt + # pylint + # pylint-celery +attrs==21.2.0 + # via + # -r requirements/quality.txt + # pytest +certifi==2020.12.5 + # via + # -r requirements/travis.txt + # requests +chardet==4.0.0 + # via + # -r requirements/travis.txt + # diff-cover + # requests click-log==0.3.2 -click==7.0 -code-annotations==0.3.3 -codecov==2.0.15 -configparser==4.0.2 -contextlib2==0.6.0.post1 -coverage==5.0.3 -diff-cover==2.5.2 -django==1.11.27 -edx-i18n-tools==0.5.0 -edx-lint==1.4.1 -enum34==1.1.6 + # via + # -r requirements/quality.txt + # edx-lint +click==7.1.2 + # via + # -c requirements/constraints.txt + # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # click-log + # code-annotations + # edx-lint + # pip-tools +code-annotations==1.1.1 + # via + # -r requirements/quality.txt + # edx-lint +codecov==2.1.11 + # via -r requirements/travis.txt +coverage[toml]==5.5 + # via + # -r requirements/quality.txt + # -r requirements/travis.txt + # codecov + # pytest-cov +diff-cover==5.1.1 + # via -r requirements/dev.in +distlib==0.3.1 + # via + # -r requirements/travis.txt + # virtualenv +django==2.2.23 + # via + # -c requirements/constraints.txt + # -r requirements/quality.txt + # code-annotations + # edx-i18n-tools + # edx-lint +edx-i18n-tools==0.5.3 + # via -r requirements/dev.in +edx-lint==5.0.0 + # via -r requirements/quality.txt filelock==3.0.12 -funcsigs==1.0.2 -futures==3.3.0 -idna==2.8 -importlib-metadata==1.4.0 -inflect==3.0.2 # via jinja2-pluralize -isort==4.3.21 -jinja2-pluralize==0.3.0 # via diff-cover -jinja2==2.10.3 -lazy-object-proxy==1.4.3 + # via + # -r requirements/travis.txt + # tox + # virtualenv +idna==2.10 + # via + # -r requirements/travis.txt + # requests +inflect==5.3.0 + # via jinja2-pluralize +iniconfig==1.1.1 + # via + # -r requirements/quality.txt + # pytest +isort==5.8.0 + # via + # -r requirements/quality.txt + # pylint +jinja2-pluralize==0.3.0 + # via diff-cover +jinja2==2.11.3 + # via + # -c requirements/constraints.txt + # -r requirements/quality.txt + # code-annotations + # diff-cover + # jinja2-pluralize +lazy-object-proxy==1.6.0 + # via + # -r requirements/quality.txt + # astroid markupsafe==1.1.1 + # via + # -c requirements/constraints.txt + # -r requirements/quality.txt + # jinja2 mccabe==0.6.1 -more-itertools==5.0.0 -numpy==1.16.6 -packaging==20.0 -pandas==0.24.2 -path.py==11.5.2 # via edx-i18n-tools -pathlib2==2.3.5 -pbr==5.4.4 -pip-tools==4.3.0 + # via + # -r requirements/quality.txt + # pylint +numpy==1.20.3 + # via + # -r requirements/quality.txt + # pandas +packaging==20.9 + # via + # -r requirements/quality.txt + # -r requirements/travis.txt + # pytest + # tox +pandas==1.2.4 + # via -r requirements/quality.txt +path.py==12.5.0 + # via edx-i18n-tools +path==15.1.2 + # via path.py +pbr==5.6.0 + # via + # -r requirements/quality.txt + # stevedore +pep517==0.10.0 + # via + # -r requirements/pip-tools.txt + # pip-tools +pip-tools==6.1.0 + # via -r requirements/pip-tools.txt pluggy==0.13.1 -polib==1.1.0 # via edx-i18n-tools -py==1.8.1 -pycodestyle==2.5.0 -pydocstyle==3.0.0 -pygments==2.5.2 # via diff-cover + # via + # -r requirements/quality.txt + # -r requirements/travis.txt + # diff-cover + # pytest + # tox +polib==1.1.1 + # via edx-i18n-tools +py==1.10.0 + # via + # -r requirements/quality.txt + # -r requirements/travis.txt + # pytest + # tox +pycodestyle==2.7.0 + # via -r requirements/quality.txt +pydocstyle==6.1.1 + # via -r requirements/quality.txt +pygments==2.9.0 + # via diff-cover pylint-celery==0.3 -pylint-django==0.11.1 + # via + # -r requirements/quality.txt + # edx-lint +pylint-django==2.4.4 + # via + # -r requirements/quality.txt + # edx-lint pylint-plugin-utils==0.6 -pylint==1.9.5 -pyparsing==2.4.6 -pytest-cov==2.8.1 -pytest-django==3.8.0 -pytest-json-report==1.2.1 -pytest-metadata==1.8.0 -pytest==4.6.9 + # via + # -r requirements/quality.txt + # pylint-celery + # pylint-django +pylint==2.8.2 + # via + # -r requirements/quality.txt + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils +pyparsing==2.4.7 + # via + # -r requirements/quality.txt + # -r requirements/travis.txt + # packaging +pytest-cov==2.12.0 + # via -r requirements/quality.txt +pytest-django==4.3.0 + # via -r requirements/quality.txt +pytest-json-report==1.3.0 + # via -r requirements/quality.txt +pytest-metadata==1.11.0 + # via + # -r requirements/quality.txt + # pytest-json-report +pytest==6.2.4 + # via + # -r requirements/quality.txt + # pytest-cov + # pytest-django + # pytest-json-report + # pytest-metadata python-dateutil==2.8.1 -python-slugify==4.0.0 -pytz==2019.3 -pyyaml==5.3 -requests==2.22.0 -scandir==1.10.0 -singledispatch==3.4.0.3 -six==1.13.0 -snowballstemmer==2.0.0 -stevedore==1.31.0 + # via + # -r requirements/quality.txt + # pandas +python-slugify==5.0.2 + # via + # -r requirements/quality.txt + # code-annotations +pytz==2021.1 + # via + # -r requirements/quality.txt + # django + # pandas +pyyaml==5.4.1 + # via + # -r requirements/quality.txt + # code-annotations + # edx-i18n-tools +requests==2.25.1 + # via + # -r requirements/travis.txt + # codecov +six==1.16.0 + # via + # -r requirements/quality.txt + # -r requirements/travis.txt + # edx-i18n-tools + # edx-lint + # python-dateutil + # tox + # virtualenv +snowballstemmer==2.1.0 + # via + # -r requirements/quality.txt + # pydocstyle +sqlparse==0.4.1 + # via + # -r requirements/quality.txt + # django +stevedore==3.3.0 + # via + # -r requirements/quality.txt + # code-annotations text-unidecode==1.3 -toml==0.10.0 -tox-battery==0.5.1 -tox==3.14.3 -urllib3==1.25.7 -virtualenv==16.7.9 -wcwidth==0.1.8 -wrapt==1.11.2 -zipp==1.0.0 + # via + # -r requirements/quality.txt + # python-slugify +toml==0.10.2 + # via + # -r requirements/pip-tools.txt + # -r requirements/quality.txt + # -r requirements/travis.txt + # coverage + # pep517 + # pylint + # pytest + # tox +tox-battery==0.6.1 + # via -r requirements/travis.txt +tox==3.23.1 + # via + # -r requirements/travis.txt + # tox-battery +urllib3==1.26.4 + # via + # -r requirements/travis.txt + # requests +virtualenv==20.4.6 + # via + # -r requirements/travis.txt + # tox +wrapt==1.12.1 + # via + # -r requirements/quality.txt + # astroid + +# The following packages are considered to be unsafe in a requirements file: +# pip diff --git a/requirements/doc.txt b/requirements/doc.txt index 65c6300..07df6ba 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -4,62 +4,190 @@ # # make upgrade # -alabaster==0.7.12 # via sphinx -atomicwrites==1.3.0 -attrs==19.3.0 -babel==2.8.0 # via sphinx -bleach==3.1.0 # via readme-renderer -certifi==2019.11.28 # via requests -chardet==3.0.4 # via doc8, requests -click==7.0 -code-annotations==0.3.3 -configparser==4.0.2 -contextlib2==0.6.0.post1 -coverage==5.0.3 -django==1.11.27 -doc8==0.8.0 -docutils==0.16 # via doc8, readme-renderer, restructuredtext-lint, sphinx -edx-sphinx-theme==1.5.0 -funcsigs==1.0.2 -idna==2.8 # via requests -imagesize==1.2.0 # via sphinx -importlib-metadata==1.4.0 -jinja2==2.10.3 +alabaster==0.7.12 + # via sphinx +attrs==21.2.0 + # via + # -r requirements/test.txt + # pytest +babel==2.9.1 + # via sphinx +bleach==3.3.0 + # via readme-renderer +certifi==2020.12.5 + # via requests +chardet==4.0.0 + # via + # doc8 + # requests +click==7.1.2 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # code-annotations +code-annotations==1.1.1 + # via -r requirements/test.txt +coverage[toml]==5.5 + # via + # -r requirements/test.txt + # pytest-cov +django==2.2.23 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # code-annotations +doc8==0.8.1 + # via -r requirements/doc.in +docutils==0.17.1 + # via + # doc8 + # readme-renderer + # restructuredtext-lint + # sphinx +edx-sphinx-theme==2.1.0 + # via -r requirements/doc.in +idna==2.10 + # via requests +imagesize==1.2.0 + # via sphinx +iniconfig==1.1.1 + # via + # -r requirements/test.txt + # pytest +jinja2==2.11.3 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # code-annotations + # sphinx markupsafe==1.1.1 -more-itertools==5.0.0 -numpy==1.16.6 -packaging==20.0 -pandas==0.24.2 -pathlib2==2.3.5 -pbr==5.4.4 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # jinja2 + # sphinx +numpy==1.20.3 + # via + # -r requirements/test.txt + # pandas +packaging==20.9 + # via + # -r requirements/test.txt + # bleach + # pytest + # sphinx +pandas==1.2.4 + # via -r requirements/test.txt +pbr==5.6.0 + # via + # -r requirements/test.txt + # stevedore pluggy==0.13.1 -py==1.8.1 -pygments==2.5.2 # via readme-renderer, sphinx -pyparsing==2.4.6 -pytest-cov==2.8.1 -pytest-django==3.8.0 -pytest-json-report==1.2.1 -pytest-metadata==1.8.0 -pytest==4.6.9 + # via + # -r requirements/test.txt + # pytest +py==1.10.0 + # via + # -r requirements/test.txt + # pytest +pygments==2.9.0 + # via + # doc8 + # readme-renderer + # sphinx +pyparsing==2.4.7 + # via + # -r requirements/test.txt + # packaging +pytest-cov==2.12.0 + # via -r requirements/test.txt +pytest-django==4.3.0 + # via -r requirements/test.txt +pytest-json-report==1.3.0 + # via -r requirements/test.txt +pytest-metadata==1.11.0 + # via + # -r requirements/test.txt + # pytest-json-report +pytest==6.2.4 + # via + # -r requirements/test.txt + # pytest-cov + # pytest-django + # pytest-json-report + # pytest-metadata python-dateutil==2.8.1 -python-slugify==4.0.0 -pytz==2019.3 -pyyaml==5.3 -readme-renderer==24.0 -requests==2.22.0 # via sphinx -restructuredtext-lint==1.3.0 # via doc8 -scandir==1.10.0 -six==1.13.0 -snowballstemmer==2.0.0 # via sphinx -sphinx==1.8.5 -sphinxcontrib-websupport==1.1.2 # via sphinx -stevedore==1.31.0 + # via + # -r requirements/test.txt + # pandas +python-slugify==5.0.2 + # via + # -r requirements/test.txt + # code-annotations +pytz==2021.1 + # via + # -r requirements/test.txt + # babel + # django + # pandas +pyyaml==5.4.1 + # via + # -r requirements/test.txt + # code-annotations +readme-renderer==29.0 + # via -r requirements/doc.in +requests==2.25.1 + # via sphinx +restructuredtext-lint==1.3.2 + # via doc8 +six==1.16.0 + # via + # -r requirements/test.txt + # bleach + # doc8 + # edx-sphinx-theme + # python-dateutil + # readme-renderer +snowballstemmer==2.1.0 + # via sphinx +sphinx==4.0.1 + # via + # -r requirements/doc.in + # edx-sphinx-theme +sphinxcontrib-applehelp==1.0.2 + # via sphinx +sphinxcontrib-devhelp==1.0.2 + # via sphinx +sphinxcontrib-htmlhelp==1.0.3 + # via sphinx +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-qthelp==1.0.3 + # via sphinx +sphinxcontrib-serializinghtml==1.1.4 + # via sphinx +sqlparse==0.4.1 + # via + # -r requirements/test.txt + # django +stevedore==3.3.0 + # via + # -r requirements/test.txt + # code-annotations + # doc8 text-unidecode==1.3 -typing==3.7.4.1 # via sphinx -urllib3==1.25.7 # via requests -wcwidth==0.1.8 -webencodings==0.5.1 # via bleach -zipp==1.0.0 + # via + # -r requirements/test.txt + # python-slugify +toml==0.10.2 + # via + # -r requirements/test.txt + # coverage + # pytest +urllib3==1.26.4 + # via requests +webencodings==0.5.1 + # via bleach # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index b7ce514..c71d600 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,9 +4,16 @@ # # make upgrade # -click==7.1.2 # via pip-tools -pip-tools==5.3.0 # via -c requirements/constraints.txt, -r requirements/pip-tools.in -six==1.15.0 # via pip-tools +click==7.1.2 + # via + # -c requirements/constraints.txt + # pip-tools +pep517==0.10.0 + # via pip-tools +pip-tools==6.1.0 + # via -r requirements/pip-tools.in +toml==0.10.2 + # via pep517 # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 0000000..21ce8e9 --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,5 @@ +# Core dependencies for installing other packages + +pip +setuptools +wheel diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 0000000..258d736 --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# make upgrade +# +wheel==0.36.2 + # via -r requirements/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==21.1.1 + # via -r requirements/pip.in +setuptools==56.2.0 + # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 9b6b3b2..3de512b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -4,57 +4,163 @@ # # make upgrade # -astroid==1.6.6 # via pylint, pylint-celery -atomicwrites==1.3.0 -attrs==19.3.0 -backports.functools-lru-cache==1.6.1 # via astroid, isort, pylint -click-log==0.3.2 # via edx-lint -click==7.0 -code-annotations==0.3.3 -configparser==4.0.2 -contextlib2==0.6.0.post1 -coverage==5.0.3 -django==1.11.27 -edx-lint==1.4.1 -enum34==1.1.6 # via astroid -funcsigs==1.0.2 -futures==3.3.0 # via isort -importlib-metadata==1.4.0 -isort==4.3.21 -jinja2==2.10.3 -lazy-object-proxy==1.4.3 # via astroid +astroid==2.5.6 + # via + # pylint + # pylint-celery +attrs==21.2.0 + # via + # -r requirements/test.txt + # pytest +click-log==0.3.2 + # via edx-lint +click==7.1.2 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # click-log + # code-annotations + # edx-lint +code-annotations==1.1.1 + # via + # -r requirements/test.txt + # edx-lint +coverage[toml]==5.5 + # via + # -r requirements/test.txt + # pytest-cov +django==2.2.23 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # code-annotations + # edx-lint +edx-lint==5.0.0 + # via -r requirements/quality.in +iniconfig==1.1.1 + # via + # -r requirements/test.txt + # pytest +isort==5.8.0 + # via + # -r requirements/quality.in + # pylint +jinja2==2.11.3 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # code-annotations +lazy-object-proxy==1.6.0 + # via astroid markupsafe==1.1.1 -mccabe==0.6.1 # via pylint -more-itertools==5.0.0 -numpy==1.16.6 -packaging==20.0 -pandas==0.24.2 -pathlib2==2.3.5 -pbr==5.4.4 + # via + # -c requirements/constraints.txt + # -r requirements/test.txt + # jinja2 +mccabe==0.6.1 + # via pylint +numpy==1.20.3 + # via + # -r requirements/test.txt + # pandas +packaging==20.9 + # via + # -r requirements/test.txt + # pytest +pandas==1.2.4 + # via -r requirements/test.txt +pbr==5.6.0 + # via + # -r requirements/test.txt + # stevedore pluggy==0.13.1 -py==1.8.1 -pycodestyle==2.5.0 -pydocstyle==3.0.0 -pylint-celery==0.3 # via edx-lint -pylint-django==0.11.1 # via edx-lint -pylint-plugin-utils==0.6 # via pylint-celery, pylint-django -pylint==1.9.5 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils -pyparsing==2.4.6 -pytest-cov==2.8.1 -pytest-django==3.8.0 -pytest-json-report==1.2.1 -pytest-metadata==1.8.0 -pytest==4.6.9 + # via + # -r requirements/test.txt + # pytest +py==1.10.0 + # via + # -r requirements/test.txt + # pytest +pycodestyle==2.7.0 + # via -r requirements/quality.in +pydocstyle==6.1.1 + # via -r requirements/quality.in +pylint-celery==0.3 + # via edx-lint +pylint-django==2.4.4 + # via edx-lint +pylint-plugin-utils==0.6 + # via + # pylint-celery + # pylint-django +pylint==2.8.2 + # via + # edx-lint + # pylint-celery + # pylint-django + # pylint-plugin-utils +pyparsing==2.4.7 + # via + # -r requirements/test.txt + # packaging +pytest-cov==2.12.0 + # via -r requirements/test.txt +pytest-django==4.3.0 + # via -r requirements/test.txt +pytest-json-report==1.3.0 + # via -r requirements/test.txt +pytest-metadata==1.11.0 + # via + # -r requirements/test.txt + # pytest-json-report +pytest==6.2.4 + # via + # -r requirements/test.txt + # pytest-cov + # pytest-django + # pytest-json-report + # pytest-metadata python-dateutil==2.8.1 -python-slugify==4.0.0 -pytz==2019.3 -pyyaml==5.3 -scandir==1.10.0 -singledispatch==3.4.0.3 # via astroid, pylint -six==1.13.0 -snowballstemmer==2.0.0 # via pydocstyle -stevedore==1.31.0 + # via + # -r requirements/test.txt + # pandas +python-slugify==5.0.2 + # via + # -r requirements/test.txt + # code-annotations +pytz==2021.1 + # via + # -r requirements/test.txt + # django + # pandas +pyyaml==5.4.1 + # via + # -r requirements/test.txt + # code-annotations +six==1.16.0 + # via + # -r requirements/test.txt + # edx-lint + # python-dateutil +snowballstemmer==2.1.0 + # via pydocstyle +sqlparse==0.4.1 + # via + # -r requirements/test.txt + # django +stevedore==3.3.0 + # via + # -r requirements/test.txt + # code-annotations text-unidecode==1.3 -wcwidth==0.1.8 -wrapt==1.11.2 # via astroid -zipp==1.0.0 + # via + # -r requirements/test.txt + # python-slugify +toml==0.10.2 + # via + # -r requirements/test.txt + # coverage + # pylint + # pytest +wrapt==1.12.1 + # via astroid diff --git a/requirements/test.txt b/requirements/test.txt index 6fe9840..ef81f94 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -4,38 +4,99 @@ # # make upgrade # -atomicwrites==1.3.0 -attrs==19.3.0 -click==7.0 # via code-annotations -code-annotations==0.3.3 -configparser==4.0.2 -contextlib2==0.6.0.post1 -coverage==5.0.3 # via pytest-cov -funcsigs==1.0.2 -importlib-metadata==1.4.0 -jinja2==2.10.3 # via code-annotations -markupsafe==1.1.1 # via jinja2 -more-itertools==5.0.0 -numpy==1.16.6 -packaging==20.0 -pandas==0.24.2 -pathlib2==2.3.5 -pbr==5.4.4 # via stevedore +attrs==21.2.0 + # via + # -r requirements/base.txt + # pytest +click==7.1.2 + # via + # -c requirements/constraints.txt + # code-annotations +code-annotations==1.1.1 + # via -r requirements/test.in +coverage[toml]==5.5 + # via pytest-cov + # via + # -c requirements/constraints.txt + # code-annotations +iniconfig==1.1.1 + # via + # -r requirements/base.txt + # pytest +jinja2==2.11.3 + # via + # -c requirements/constraints.txt + # code-annotations +markupsafe==1.1.1 + # via + # -c requirements/constraints.txt + # jinja2 +numpy==1.20.3 + # via + # -r requirements/base.txt + # pandas +packaging==20.9 + # via + # -r requirements/base.txt + # pytest +pandas==1.2.4 + # via -r requirements/base.txt +pbr==5.6.0 + # via stevedore pluggy==0.13.1 -py==1.8.1 -pyparsing==2.4.6 -pytest-cov==2.8.1 -pytest-django==3.8.0 -pytest-json-report==1.2.1 -pytest-metadata==1.8.0 -pytest==4.6.9 + # via + # -r requirements/base.txt + # pytest +py==1.10.0 + # via + # -r requirements/base.txt + # pytest +pyparsing==2.4.7 + # via + # -r requirements/base.txt + # packaging +pytest-cov==2.12.0 + # via -r requirements/test.in +pytest-django==4.3.0 + # via -r requirements/test.in +pytest-json-report==1.3.0 + # via -r requirements/base.txt +pytest-metadata==1.11.0 + # via + # -r requirements/base.txt + # pytest-json-report +pytest==6.2.4 + # via + # -r requirements/base.txt + # pytest-cov + # pytest-django + # pytest-json-report + # pytest-metadata python-dateutil==2.8.1 -python-slugify==4.0.0 # via code-annotations -pytz==2019.3 -pyyaml==5.3 # via code-annotations -scandir==1.10.0 -six==1.13.0 -stevedore==1.31.0 # via code-annotations -text-unidecode==1.3 # via python-slugify -wcwidth==0.1.8 -zipp==1.0.0 + # via + # -r requirements/base.txt + # pandas +python-slugify==5.0.2 + # via code-annotations +pytz==2021.1 + # via + # -r requirements/base.txt + # django + # pandas +pyyaml==5.4.1 + # via code-annotations +six==1.16.0 + # via + # -r requirements/base.txt + # python-dateutil +sqlparse==0.4.1 + # via django +stevedore==3.3.0 + # via code-annotations +text-unidecode==1.3 + # via python-slugify +toml==0.10.2 + # via + # -r requirements/base.txt + # coverage + # pytest diff --git a/requirements/travis.txt b/requirements/travis.txt index df33c8f..ed9fff3 100644 --- a/requirements/travis.txt +++ b/requirements/travis.txt @@ -4,27 +4,47 @@ # # make upgrade # -certifi==2019.11.28 # via requests -chardet==3.0.4 # via requests -codecov==2.0.15 -configparser==4.0.2 # via importlib-metadata -contextlib2==0.6.0.post1 # via importlib-metadata -coverage==5.0.3 # via codecov -filelock==3.0.12 # via tox -idna==2.8 # via requests -importlib-metadata==1.4.0 # via pluggy, tox -more-itertools==5.0.0 # via zipp -packaging==20.0 # via tox -pathlib2==2.3.5 # via importlib-metadata -pluggy==0.13.1 # via tox -py==1.8.1 # via tox -pyparsing==2.4.6 # via packaging -requests==2.22.0 # via codecov -scandir==1.10.0 # via pathlib2 -six==1.13.0 # via more-itertools, packaging, pathlib2, tox -toml==0.10.0 # via tox -tox-battery==0.5.1 -tox==3.14.3 -urllib3==1.25.7 # via requests -virtualenv==16.7.9 # via tox -zipp==1.0.0 # via importlib-metadata +appdirs==1.4.4 + # via virtualenv +certifi==2020.12.5 + # via requests +chardet==4.0.0 + # via requests +codecov==2.1.11 + # via -r requirements/travis.in +coverage==5.5 + # via codecov +distlib==0.3.1 + # via virtualenv +filelock==3.0.12 + # via + # tox + # virtualenv +idna==2.10 + # via requests +packaging==20.9 + # via tox +pluggy==0.13.1 + # via tox +py==1.10.0 + # via tox +pyparsing==2.4.7 + # via packaging +requests==2.25.1 + # via codecov +six==1.16.0 + # via + # tox + # virtualenv +toml==0.10.2 + # via tox +tox-battery==0.6.1 + # via -r requirements/travis.in +tox==3.23.1 + # via + # -r requirements/travis.in + # tox-battery +urllib3==1.26.4 + # via requests +virtualenv==20.4.6 + # via tox