Merge "Rename dev-requirements.txt to test-requirements.txt"
This commit is contained in:
@@ -26,8 +26,8 @@ info_block "Running Basic Ansible Lint Check"
|
|||||||
|
|
||||||
|
|
||||||
# Install the development requirements.
|
# Install the development requirements.
|
||||||
if [ -f "dev-requirements.txt" ]; then
|
if [ -f "test-requirements.txt" ]; then
|
||||||
pip2 install -r dev-requirements.txt || pip install -r dev-requirements.txt
|
pip2 install -r test-requirements.txt || pip install -r test-requirements.txt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pushd doc
|
pushd doc
|
||||||
|
|||||||
@@ -28,8 +28,8 @@ info_block "Running Basic Ansible Lint Check"
|
|||||||
source $(dirname ${0})/bootstrap-ansible.sh
|
source $(dirname ${0})/bootstrap-ansible.sh
|
||||||
|
|
||||||
# Install the development requirements.
|
# Install the development requirements.
|
||||||
if [ -f "dev-requirements.txt" ]; then
|
if [ -f "test-requirements.txt" ]; then
|
||||||
pip2 install -r dev-requirements.txt || pip install -r dev-requirements.txt
|
pip2 install -r test-requirements.txt || pip install -r test-requirements.txt
|
||||||
else
|
else
|
||||||
pip2 install ansible-lint || pip install ansible-lint
|
pip2 install ansible-lint || pip install ansible-lint
|
||||||
fi
|
fi
|
||||||
|
|||||||
4
tox.ini
4
tox.ini
@@ -7,7 +7,7 @@ envlist = docs,pep8,bashate
|
|||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
deps = -r{toxinidir}/dev-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
commands=
|
commands=
|
||||||
@@ -15,7 +15,7 @@ commands=
|
|||||||
|
|
||||||
# environment used by the -infra templated docs job
|
# environment used by the -infra templated docs job
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
deps = -r{toxinidir}/dev-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
# Run hacking/flake8 check for all python files
|
# Run hacking/flake8 check for all python files
|
||||||
|
|||||||
Reference in New Issue
Block a user