mirror of https://github.com/pypa/pip
Merge pull request #10197 from pradyunsg/breakout-tools-requirements-folder
Get rid of tools/requirements/ directory, by moving those files into better locations
This commit is contained in:
commit
664beeabf7
|
@ -30,7 +30,6 @@ jobs:
|
|||
tests:
|
||||
# Anything that's touching testable stuff
|
||||
- ".github/workflows/ci.yml"
|
||||
- "tools/requirements/tests.txt"
|
||||
- "src/**"
|
||||
- "tests/**"
|
||||
if: github.event_name == 'pull_request'
|
||||
|
|
|
@ -7,4 +7,4 @@ sphinx:
|
|||
python:
|
||||
version: 3.8
|
||||
install:
|
||||
- requirements: tools/requirements/docs.txt
|
||||
- requirements: docs/requirements.txt
|
||||
|
|
|
@ -10,6 +10,7 @@ recursive-include src/pip/_vendor *LICENSE*
|
|||
recursive-include src/pip/_vendor *COPYING*
|
||||
|
||||
include docs/docutils.conf
|
||||
include docs/requirements.txt
|
||||
|
||||
exclude .coveragerc
|
||||
exclude .mailmap
|
||||
|
|
|
@ -24,7 +24,7 @@ LOCATIONS = {
|
|||
"protected-pip": "tools/tox_pip.py",
|
||||
}
|
||||
REQUIREMENTS = {
|
||||
"docs": "tools/requirements/docs.txt",
|
||||
"docs": "docs/requirements.txt",
|
||||
"tests": "tools/requirements/tests.txt",
|
||||
"common-wheels": "tools/requirements/tests-common_wheels.txt",
|
||||
}
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -23,10 +23,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/requirements/tests.txt
|
||||
deps = -r{toxinidir}/tests/requirements.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/requirements/tests-common_wheels.txt
|
||||
{[helpers]pip} wheel -w {toxinidir}/tests/data/common_wheels -r {toxinidir}/tests/requirements-common_wheels.txt
|
||||
commands = pytest []
|
||||
install_command = {[helpers]pip} install {opts} {packages}
|
||||
list_dependencies_command = {[helpers]pip} freeze --all
|
||||
|
@ -48,7 +48,7 @@ setenv =
|
|||
|
||||
[testenv:docs]
|
||||
# Don't skip install here since pip_sphinxext uses pip's internals.
|
||||
deps = -r{toxinidir}/tools/requirements/docs.txt
|
||||
deps = -r{toxinidir}/docs/requirements.txt
|
||||
basepython = python3
|
||||
commands =
|
||||
sphinx-build -W -j auto -d {envtmpdir}/doctrees/html -b html docs/html docs/build/html
|
||||
|
|
Loading…
Reference in New Issue