summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-22 07:40:35 +0900
committerkali <kali@leap.se>2012-08-22 07:40:35 +0900
commitf6458e263415e35fa8934b404e472346c61a4209 (patch)
treecb6ea174d0f0c23d00482197388500f552eace66
parent04676d5869c33a419d199b1be7dbb616c31434c2 (diff)
fix install virtualenv for running tests
(actually, it's not completely working. it's missing a fix for the broken qt4 libs inside virtualenv, which still need manual intervention)
-rw-r--r--setup/install_venv.py8
-rw-r--r--setup/test-requirements.pip (renamed from setup/test-requires)0
2 files changed, 3 insertions, 5 deletions
diff --git a/setup/install_venv.py b/setup/install_venv.py
index 3f3f0575..15385beb 100644
--- a/setup/install_venv.py
+++ b/setup/install_venv.py
@@ -26,13 +26,11 @@ import optparse
import os
import subprocess
import sys
-import platform
-
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
VENV = os.path.join(ROOT, '.venv')
-PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
-TEST_REQUIRES = os.path.join(ROOT, 'tools', 'test-requires')
+PIP_REQUIRES = os.path.join(ROOT, 'setup', 'requirements.pip')
+TEST_REQUIRES = os.path.join(ROOT, 'setup', 'test-requirements.pip')
PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
@@ -55,7 +53,7 @@ def run_command_with_code(cmd, redirect_output=True, check_exit_code=True):
stdout = subprocess.PIPE
else:
stdout = None
-
+
print 'executing command: %s', cmd
proc = subprocess.Popen(cmd, cwd=ROOT, stdout=stdout)
output = proc.communicate()[0]
diff --git a/setup/test-requires b/setup/test-requirements.pip
index 26db61c8..26db61c8 100644
--- a/setup/test-requires
+++ b/setup/test-requirements.pip