From c6da85a6ebde3c6d6a1d0bcc82e994514fe79c72 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Tue, 30 Jul 2019 17:01:05 +0530 Subject: [PATCH] Move requirement files to tools/requirements/ --- tools/{docs-requirements.txt => requirements/docs.txt} | 0 tools/{lint-requirements.txt => requirements/lint.txt} | 0 tools/{mypy-requirements.txt => requirements/mypy.txt} | 0 .../tests-common_wheels.txt} | 0 .../{tests-requirements.txt => requirements/tests.txt} | 0 tox.ini | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename tools/{docs-requirements.txt => requirements/docs.txt} (100%) rename tools/{lint-requirements.txt => requirements/lint.txt} (100%) rename tools/{mypy-requirements.txt => requirements/mypy.txt} (100%) rename tools/{tests-common_wheels-requirements.txt => requirements/tests-common_wheels.txt} (100%) rename tools/{tests-requirements.txt => requirements/tests.txt} (100%) diff --git a/tools/docs-requirements.txt b/tools/requirements/docs.txt similarity index 100% rename from tools/docs-requirements.txt rename to tools/requirements/docs.txt diff --git a/tools/lint-requirements.txt b/tools/requirements/lint.txt similarity index 100% rename from tools/lint-requirements.txt rename to tools/requirements/lint.txt diff --git a/tools/mypy-requirements.txt b/tools/requirements/mypy.txt similarity index 100% rename from tools/mypy-requirements.txt rename to tools/requirements/mypy.txt diff --git a/tools/tests-common_wheels-requirements.txt b/tools/requirements/tests-common_wheels.txt similarity index 100% rename from tools/tests-common_wheels-requirements.txt rename to tools/requirements/tests-common_wheels.txt diff --git a/tools/tests-requirements.txt b/tools/requirements/tests.txt similarity index 100% rename from tools/tests-requirements.txt rename to tools/requirements/tests.txt diff --git a/tox.ini b/tox.ini index 512bad52ded..879c234e809 100644 --- a/tox.ini +++ b/tox.ini @@ -15,10 +15,10 @@ setenv = # This is required in order to get UTF-8 output inside of the subprocesses # that our tests use. LC_CTYPE = en_US.UTF-8 -deps = -r{toxinidir}/tools/tests-requirements.txt +deps = -r{toxinidir}/tools/requirements/tests.txt commands_pre = python -c 'import shutil, sys; shutil.rmtree(sys.argv[1], ignore_errors=True)' {toxinidir}/tests/data/common_wheels - {[helpers]pip} wheel -w {toxinidir}/tests/data/common_wheels -r {toxinidir}/tools/tests-common_wheels-requirements.txt + {[helpers]pip} wheel -w {toxinidir}/tests/data/common_wheels -r {toxinidir}/tools/requirements/tests-common_wheels.txt commands = pytest --timeout 300 [] install_command = {[helpers]pip} install {opts} {packages} list_dependencies_command = {[helpers]pip} freeze --all @@ -29,7 +29,7 @@ commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report [testenv:docs] # Don't skip install here since pip_sphinxext uses pip's internals. -deps = -r{toxinidir}/tools/docs-requirements.txt +deps = -r{toxinidir}/tools/requirements/docs.txt basepython = python3.6 commands = sphinx-build -W -d {envtmpdir}/doctrees/html -b html docs/html docs/build/html @@ -50,7 +50,7 @@ commands = python setup.py check -m -r -s [lint] -deps = -r{toxinidir}/tools/lint-requirements.txt +deps = -r{toxinidir}/tools/requirements/lint.txt [testenv:lint-py2] skip_install = True @@ -74,7 +74,7 @@ commands = [testenv:mypy] skip_install = True basepython = python3 -deps = -r{toxinidir}/tools/mypy-requirements.txt +deps = -r{toxinidir}/tools/requirements/mypy.txt commands_pre = commands = mypy src