Merge pull request #5510 from pradyunsg/dev-ops/tools-directory

Add a new tools/ directory and move some files into it

.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:

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

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

tools/lint-requirements.txt

@@ -0,0 +1,2 @@
+flake8 == 3.3.0
+isort == 4.2.5

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