From f6458e263415e35fa8934b404e472346c61a4209 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 22 Aug 2012 07:40:35 +0900 Subject: 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) --- setup/install_venv.py | 8 +++----- setup/test-requirements.pip | 5 +++++ setup/test-requires | 5 ----- 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 setup/test-requirements.pip delete mode 100644 setup/test-requires (limited to 'setup') 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-requirements.pip b/setup/test-requirements.pip new file mode 100644 index 00000000..26db61c8 --- /dev/null +++ b/setup/test-requirements.pip @@ -0,0 +1,5 @@ +coverage +mock +nose +pep8==1.1 +sphinx>=1.1.2 diff --git a/setup/test-requires b/setup/test-requires deleted file mode 100644 index 26db61c8..00000000 --- a/setup/test-requires +++ /dev/null @@ -1,5 +0,0 @@ -coverage -mock -nose -pep8==1.1 -sphinx>=1.1.2 -- cgit v1.2.3