diff --git a/.travis.yml b/.travis.yml index e3b020e56..8f5e9bf5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,9 +58,9 @@ jobs: allow_failures: - python: 3.7-dev -before_install: .travis/setup.sh -install: travis_retry .travis/install.sh -script: .travis/run.sh +before_install: tools/travis/setup.sh +install: travis_retry tools/travis/install.sh +script: tools/travis/run.sh notifications: irc: diff --git a/MANIFEST.in b/MANIFEST.in index 822e2d8ab..c92ac5928 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -13,7 +13,6 @@ exclude .coveragerc exclude .mailmap exclude .travis.yml exclude tox.ini -exclude *-requirements.txt exclude appveyor.yml recursive-include src/pip/_vendor *.pem @@ -24,9 +23,9 @@ exclude src/pip/_vendor/six/moves recursive-exclude src/pip/_vendor *.pyi prune .github -prune .travis prune docs/build prune news prune contrib prune tasks prune tests +prune tools diff --git a/docs/development.rst b/docs/development.rst index 9691f487f..caac58048 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -69,7 +69,7 @@ Running tests OS Requirements: subversion, bazaar, git, and mercurial. Python Requirements: tox or install all packages listed in -`dev-requirements.txt`_ +`tools/test-requirements.txt`_ Ways to run the tests locally:: @@ -262,4 +262,4 @@ to create one of these the changes should already be merged into the .. _`.travis.yml`: https://github.com/pypa/pip/blob/master/.travis.yml .. _`appveyor.yml`: https://github.com/pypa/pip/blob/master/appveyor.yml .. _`Travis CI Pull Requests`: https://travis-ci.org/pypa/pip/pull_requests -.. _`dev-requirements.txt`: https://github.com/pypa/pip/blob/master/dev-requirements.txt +.. _`tools/test-requirements.txt`: https://github.com/pypa/pip/blob/master/tools/test-requirements.txt diff --git a/docs-requirements.txt b/tools/docs-requirements.txt similarity index 100% rename from docs-requirements.txt rename to tools/docs-requirements.txt diff --git a/tools/lint-requirements.txt b/tools/lint-requirements.txt new file mode 100644 index 000000000..a19517e78 --- /dev/null +++ b/tools/lint-requirements.txt @@ -0,0 +1,2 @@ +flake8 == 3.3.0 +isort == 4.2.5 diff --git a/dev-requirements.txt b/tools/tests-requirements.txt similarity index 100% rename from dev-requirements.txt rename to tools/tests-requirements.txt diff --git a/.travis/install.sh b/tools/travis/install.sh similarity index 100% rename from .travis/install.sh rename to tools/travis/install.sh diff --git a/.travis/run.sh b/tools/travis/run.sh similarity index 100% rename from .travis/run.sh rename to tools/travis/run.sh diff --git a/.travis/setup.sh b/tools/travis/setup.sh similarity index 100% rename from .travis/setup.sh rename to tools/travis/setup.sh diff --git a/tox.ini b/tox.ini index 1b0a8fc67..866db977f 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ 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}/dev-requirements.txt +deps = -r{toxinidir}/tools/tests-requirements.txt commands = pytest --timeout 300 [] install_command = python -m pip install {opts} {packages} usedevelop = True @@ -19,7 +19,7 @@ basepython = python3 commands = pytest --timeout 300 --cov=pip --cov-report=term-missing --cov-report=xml --cov-report=html tests/unit {posargs} [testenv:docs] -deps = -r{toxinidir}/docs-requirements.txt +deps = -r{toxinidir}/tools/docs-requirements.txt basepython = python2.7 commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html @@ -34,9 +34,7 @@ commands = python setup.py check -m -r -s [lint] -deps = - flake8==3.3.0 - isort==4.2.5 +deps = -r{toxinidir}/tools/lint-requirements.txt commands = flake8 . isort --recursive --check-only --diff src/pip tests