From a07eca26394153d636e7809e3191b1ead030ef6b Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Wed, 20 Jul 2016 14:55:15 -0700 Subject: [PATCH] Revert "Factor out venv-installation into a script." This reverts commit 852c49a44e00edac6f9e57c5b02906da8b294765. I think this may have broken provisioning without a venv. --- tools/provision.py | 5 ++++- tools/setup/setup-venvs | 17 ----------------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100755 tools/setup/setup-venvs diff --git a/tools/provision.py b/tools/provision.py index 8a3aedda43..4c13c032f0 100755 --- a/tools/provision.py +++ b/tools/provision.py @@ -178,7 +178,10 @@ def main(): DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "py3_dev.txt") setup_virtualenv(VENV_PATH, DEV_REQS_FILE, virtualenv_args=['-p', 'python3']) else: - run(["tools/setup/setup-venvs"]) + DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "py2_dev.txt") + setup_virtualenv(PY2_VENV_PATH, DEV_REQS_FILE) + DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "py3_dev.txt") + setup_virtualenv(PY3_VENV_PATH, DEV_REQS_FILE, virtualenv_args=['-p', 'python3']) # Put Python2 virtualenv activation in our .bash_profile. with open(os.path.expanduser('~/.bash_profile'), 'w+') as bash_profile: diff --git a/tools/setup/setup-venvs b/tools/setup/setup-venvs deleted file mode 100755 index 9edad1431e..0000000000 --- a/tools/setup/setup-venvs +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -import os -import sys -from os.path import dirname, abspath - -ZULIP_PATH = dirname(dirname(dirname(abspath(__file__)))) -if ZULIP_PATH not in sys.path: - sys.path.append(ZULIP_PATH) - -from scripts.lib.setup_venv import setup_virtualenv - -PY2_DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "py2_dev.txt") -setup_virtualenv("/srv/zulip-venv", PY2_DEV_REQS_FILE) - -PY3_DEV_REQS_FILE = os.path.join(ZULIP_PATH, "requirements", "py3_dev.txt") -setup_virtualenv("/srv/zulip-py3-venv", PY3_DEV_REQS_FILE, virtualenv_args=['-p', 'python3'])