From 66b2c7f7baaef4ac4645b9d9a9286b286474890e Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Fri, 15 Jun 2018 21:54:55 +0530 Subject: [PATCH 1/6] Move Travis files into tools/ --- .travis.yml | 6 +++--- {.travis => tools/travis}/install.sh | 0 {.travis => tools/travis}/run.sh | 0 {.travis => tools/travis}/setup.sh | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {.travis => tools/travis}/install.sh (100%) rename {.travis => tools/travis}/run.sh (100%) rename {.travis => tools/travis}/setup.sh (100%) 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/.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 From c57705d1e452a5d086b361d31ce33677106220f8 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Fri, 15 Jun 2018 21:57:10 +0530 Subject: [PATCH 2/6] Move requirements files to tools/ * Rename dev-requirements to tests-requirements --- docs-requirements.txt => tools/docs-requirements.txt | 0 dev-requirements.txt => tools/tests-requirements.txt | 0 tox.ini | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename docs-requirements.txt => tools/docs-requirements.txt (100%) rename dev-requirements.txt => tools/tests-requirements.txt (100%) 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/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/tox.ini b/tox.ini index 1b0a8fc67..9790a5019 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 From 69783941c7dd5445276021a080c8da63cfca05b6 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 16 Jun 2018 00:08:33 +0530 Subject: [PATCH 3/6] Move linting requirements to a requirements file --- tools/lint-requirements.txt | 2 ++ tox.ini | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tools/lint-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/tox.ini b/tox.ini index 9790a5019..866db977f 100644 --- a/tox.ini +++ b/tox.ini @@ -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 From bb43340a172b277e23f1b18f3f88930b5e38be00 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 16 Jun 2018 00:12:06 +0530 Subject: [PATCH 4/6] Update MANIFEST.in --- MANIFEST.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 3e9cbaee8..9a49b5ac1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -15,7 +15,6 @@ exclude .travis.yml exclude .landscape.yml exclude src/pip/_vendor/Makefile exclude tox.ini -exclude *-requirements.txt exclude appveyor.yml recursive-include src/pip/_vendor *.pem @@ -26,9 +25,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 From 93cdb4d2434bf734607f69d876fcd7f61ead8204 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 16 Jun 2018 09:37:10 +0530 Subject: [PATCH 5/6] Update docs reference --- docs/development.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development.rst b/docs/development.rst index 9691f487f..9a6a0e05a 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`_ +`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 +.. _`test-requirements.txt`: https://github.com/pypa/pip/blob/master/tools/test-requirements.txt From 9e03fe4c821a180506f2fb80c8a2b8855228efc1 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Sat, 16 Jun 2018 16:42:51 +0530 Subject: [PATCH 6/6] Mention complete path in docs for tests-requirements.txt --- docs/development.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/development.rst b/docs/development.rst index 9a6a0e05a..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 -`test-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 -.. _`test-requirements.txt`: https://github.com/pypa/pip/blob/master/tools/test-requirements.txt +.. _`tools/test-requirements.txt`: https://github.com/pypa/pip/blob/master/tools/test-requirements.txt