From 67b90365743ea9b10036007a51dbc76bc5809e50 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 26 Mar 2015 13:17:07 +0100
Subject: [PATCH] tox: tox.ini fixes for Ubuntu Trusty/tox 1.6

- Don't use old PYTHONPATH in tox.ini.
  PYTHONPATH should be unset anyways, so it's okay to ignore the old value.

- Don't use config interpolation for unittests.
  This shows a "command not found" error for some reason.
---
 tox.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 9589feb13..a0b3f7f22 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,8 +16,10 @@ usedevelop = true
 
 [testenv:unittests]
 setenv = QT_QPA_PLATFORM_PLUGIN_PATH={envsitepackagesdir}/PyQt5/plugins/platforms
+# We don't use {[testenv:mkvenv]commands} here because that seems to be broken
+# on Ubuntu Trusty.
 commands =
-    {[testenv:mkvenv]commands}
+    {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -m unittest
 
 [testenv:coverage]
@@ -37,7 +39,7 @@ commands =
 
 [testenv:pylint]
 skip_install = true
-setenv = PYTHONPATH={toxinidir}/scripts:{env:PYTHONPATH:}
+setenv = PYTHONPATH={toxinidir}/scripts
 deps =
     -rrequirements.txt
     astroid==1.3.6