From 49485ca220543ce9fbcc48da9f3b69feef695822 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 30 Nov 2017 16:58:14 -0600
Subject: [PATCH] tox.ini: fix conditional syntax errors

`{[testenv]deps}` was passing conditionals in their raw form; this
simply lists them manually to avoid this.
---
 tox.ini | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1c87d1a6c..de41f2e0f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -107,14 +107,15 @@ deps =
 setenv = PYTHONPATH={toxinidir}
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} scripts/dev/run_vulture.py
+    {[testenv:vulture]commands}
 
 [testenv:pylint]
 basepython = {env:PYTHON:python3}
 ignore_errors = true
 passenv =
 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-pyqt.txt
 commands =
@@ -126,18 +127,19 @@ basepython = {env:PYTHON:python3}
 ignore_errors = true
 passenv =
 deps =
-    {[testenv]deps}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-tests.txt
     -r{toxinidir}/misc/requirements/requirements-pylint.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
-    {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs}
-    {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs}
+    {[testenv:pylint]commands}
 
 [testenv:pylint-master]
 basepython = python3
 passenv = {[testenv:pylint]passenv}
 deps =
-    {[testenv]deps}
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/misc/requirements/requirements-tests.txt
     -r{toxinidir}/misc/requirements/requirements-pylint-master.txt
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}