summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-09-25 06:13:51 +0900
committerkali <kali@leap.se>2012-09-25 06:13:51 +0900
commitf56e89199c063ea76a901ae187933c7604b4858b (patch)
tree19dfe2c956e593615fd15efe07d3a79c68d996b4
parenta5366ebc06a1345f9248672e91cf87379d3bcec1 (diff)
parent5343d884d0ad6efd4f3b24826361773675842c4d (diff)
Merge branch 'feature/autoinstall-test-reqs' into develop
-rw-r--r--pkg/install_venv.py21
1 files changed, 14 insertions, 7 deletions
diff --git a/pkg/install_venv.py b/pkg/install_venv.py
index 15385beb..17dfb984 100644
--- a/pkg/install_venv.py
+++ b/pkg/install_venv.py
@@ -29,8 +29,8 @@ import sys
ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
VENV = os.path.join(ROOT, '.venv')
-PIP_REQUIRES = os.path.join(ROOT, 'setup', 'requirements.pip')
-TEST_REQUIRES = os.path.join(ROOT, 'setup', 'test-requirements.pip')
+PIP_REQUIRES = os.path.join(ROOT, 'pkg', 'requirements.pip')
+TEST_REQUIRES = os.path.join(ROOT, 'pkg', 'test-requirements.pip')
PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
@@ -108,6 +108,10 @@ class Debian(Distro):
def apply_patch(self, originalfile, patchfile):
run_command(['patch', originalfile, patchfile])
+ def post_process(self):
+ #symlink qt in virtualenv
+ run_command(['pkg/tools/with_venv.sh', 'pkg/postmkvenv.sh'])
+
def install_virtualenv(self):
if self.check_cmd('virtualenv'):
return
@@ -163,19 +167,22 @@ def create_virtualenv(venv=VENV, no_site_packages=True):
"""
print 'Creating venv...',
if no_site_packages:
- run_command(['virtualenv', '-q', '--no-site-packages', VENV])
+ #setuptools and virtualenv don't play nicely together,
+ #so we create the virtualenv with the distribute package instead.
+ #See: view-source:http://pypi.python.org/pypi/distribute
+ run_command(['virtualenv', '-q', '--distribute', '--no-site-packages', VENV])
else:
- run_command(['virtualenv', '-q', VENV])
+ run_command(['virtualenv', '-q', '--distribute', VENV])
print 'done.'
print 'Installing pip in virtualenv...',
- if not run_command(['setup/tools/with_venv.sh', 'easy_install',
+ if not run_command(['pkg/tools/with_venv.sh', 'easy_install',
'pip>1.0']).strip():
die("Failed to install pip.")
print 'done.'
def pip_install(*args):
- run_command(['setup/tools/with_venv.sh',
+ run_command(['pkg/tools/with_venv.sh',
'pip', 'install', '--upgrade'] + list(args),
redirect_output=False)
@@ -211,7 +218,7 @@ def print_help():
Or, if you prefer, you can run commands in the virtualenv on a case by case
basis by running:
- $ setup/tools/with_venv.sh <your command>
+ $ pkg/tools/with_venv.sh <your command>
Also, make test will automatically use the virtualenv.
"""