tox.ini: fix conditional syntax errors

`{[testenv]deps}` was passing conditionals in their raw form; this
simply lists them manually to avoid this.
This commit is contained in:
Ryan Farley 2017-11-30 16:58:14 -06:00
parent 6b76203780
commit 49485ca220

14
tox.ini
View File

@ -107,14 +107,15 @@ deps =
setenv = PYTHONPATH={toxinidir} setenv = PYTHONPATH={toxinidir}
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} scripts/dev/run_vulture.py {[testenv:vulture]commands}
[testenv:pylint] [testenv:pylint]
basepython = {env:PYTHON:python3} basepython = {env:PYTHON:python3}
ignore_errors = true ignore_errors = true
passenv = passenv =
deps = deps =
{[testenv]deps} -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tests.txt
-r{toxinidir}/misc/requirements/requirements-pylint.txt -r{toxinidir}/misc/requirements/requirements-pylint.txt
-r{toxinidir}/misc/requirements/requirements-pyqt.txt -r{toxinidir}/misc/requirements/requirements-pyqt.txt
commands = commands =
@ -126,18 +127,19 @@ basepython = {env:PYTHON:python3}
ignore_errors = true ignore_errors = true
passenv = passenv =
deps = deps =
{[testenv]deps} -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tests.txt
-r{toxinidir}/misc/requirements/requirements-pylint.txt -r{toxinidir}/misc/requirements/requirements-pylint.txt
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}
{envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs} {[testenv:pylint]commands}
{envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
[testenv:pylint-master] [testenv:pylint-master]
basepython = python3 basepython = python3
passenv = {[testenv:pylint]passenv} passenv = {[testenv:pylint]passenv}
deps = deps =
{[testenv]deps} -r{toxinidir}/requirements.txt
-r{toxinidir}/misc/requirements/requirements-tests.txt
-r{toxinidir}/misc/requirements/requirements-pylint-master.txt -r{toxinidir}/misc/requirements/requirements-pylint-master.txt
commands = commands =
{envpython} scripts/link_pyqt.py --tox {envdir} {envpython} scripts/link_pyqt.py --tox {envdir}