Clean up tox.ini file

This update cleans up the initial tox.ini file to purge unnecessary
dependencies, add the --no-run-if-empty argument to xargs commands,
and broadens the bashate check to cover all subdirectories in case
new shell scripts are added elsewhere.

Change-Id: Ib1ecfcee426a2975903f6e61d64b1a650a5d5aa1
Story: 2003371
Task: 24531
Signed-off-by: Don Penney <don.penney@windriver.com>
This commit is contained in:
Don Penney 2018-08-09 22:29:05 -05:00
parent a617eeffca
commit f39c0c79ad
1 changed files with 8 additions and 15 deletions

23
tox.ini
View File

@ -19,11 +19,16 @@ deps = -r{toxinidir}/requirements.txt
whitelist_externals = bash whitelist_externals = bash
commands = commands =
bash -c "find {toxinidir} \ bash -c "find {toxinidir} \
\( -name middleware/io-monitor/recipes-common/io-monitor/io-monitor/io_monitor/test-tools/yaml/* -prune \) \
-o \( -name .tox -prune \) \ -o \( -name .tox -prune \) \
-o -type f -name '*.yaml' \ -o -type f -name '*.yaml' \
-print0 | xargs -0 yamllint" -print0 | xargs --no-run-if-empty -0 yamllint"
bash -c "ls cgcs-patch/bin/*.sh | xargs bashate -v -iE006 {posargs}" bash -c "find {toxinidir} \
-not \( -type d -name .?\* -prune \) \
-type f \
-not -name \*~ \
-not -name \*.md \
-name \*.sh \
-print0 | xargs --no-run-if-empty -0 bashate -v -iE006"
[pep8] [pep8]
# Ignoring these warnings # Ignoring these warnings
@ -48,28 +53,16 @@ verbosity=2
[testenv:py27] [testenv:py27]
basepython = python2.7 basepython = python2.7
deps = {[testenv]deps} deps = {[testenv]deps}
{toxinidir}/nfv/nfv-client
{toxinidir}/nfv/nfv-common
{toxinidir}/nfv/nfv-plugins
{toxinidir}/nfv/nfv-vim
whitelist_externals = cp whitelist_externals = cp
find find
recreate = True recreate = True
commands = {[testenv]commands} commands = {[testenv]commands}
cp -v nfv/nfv-tests/nfv_unit_tests/test_data/nfv_vim_db_18.03_GA {envdir}/
nosetests --exe -w nfv/nfv-tests/nfv_unit_tests/tests/ '{posargs}'
[testenv:py35] [testenv:py35]
basepython = python3 basepython = python3
deps = {[testenv]deps} deps = {[testenv]deps}
nfv/nfv-client
nfv/nfv-common
nfv/nfv-plugins
nfv/nfv-vim
whitelist_externals = cp whitelist_externals = cp
find find
recreate = True recreate = True
commands = {[testenv]commands} commands = {[testenv]commands}
cp -v nfv/nfv-tests/nfv_unit_tests/test_data/nfv_vim_db_18.03_GA {envdir}/
nosetests --exe -w nfv/nfv-tests/nfv_unit_tests/tests/ '{posargs}'