paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 03:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use zulip-py3-venv when running on Python 3

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2016-11-19 23:45:53 -05:00
committed by Tim Abbott
parent c0f2cebe0c
commit 712c98cb48
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/create-production-venv
View File

@@ -13,7 +13,7 @@ from scripts.lib.zulip_tools import run
from scripts.lib.setup_venv import setup_virtualenv, VENV_DEPENDENCIES from scripts.lib.setup_venv import setup_virtualenv, VENV_DEPENDENCIES
parser = argparse.ArgumentParser(description="Create a production virtualenv with caching") parser = argparse.ArgumentParser(description="Create a production virtualenv with caching")
parser.add_argument("target") parser.add_argument("deploy_path")
args = parser.parse_args() args = parser.parse_args()
# install dependencies for setting up the virtualenv # install dependencies for setting up the virtualenv
@@ -22,7 +22,7 @@ run(["apt-get", "-y", "install"] + VENV_DEPENDENCIES)
python_version = sys.version_info[0] python_version = sys.version_info[0]
cached_venv_path = setup_virtualenv( cached_venv_path = setup_virtualenv(
args.target, os.path.join(args.deploy_path, "zulip-venv" if sys.version_info[0] == 2 else "zulip-py3-venv"),
os.path.join(ZULIP_PATH, "requirements", "py{}_prod.txt".format(python_version)), os.path.join(ZULIP_PATH, "requirements", "py{}_prod.txt".format(python_version)),
virtualenv_args=['-p', 'python{}'.format(python_version)]) virtualenv_args=['-p', 'python{}'.format(python_version)])
# Now the virtualenv has been activated # Now the virtualenv has been activated

2
scripts/lib/install
View File

@@ -29,7 +29,7 @@ apt-get install -y puppet git python python-six crudini $ADDITIONAL_PACKAGES
# Create and activate a virtualenv # Create and activate a virtualenv
if [ "$VIRTUALENV_NEEDED" = "yes" ]; then if [ "$VIRTUALENV_NEEDED" = "yes" ]; then
"$ZULIP_PATH"/scripts/lib/create-production-venv "$ZULIP_PATH"/zulip-venv "$ZULIP_PATH"/scripts/lib/create-production-venv "$ZULIP_PATH"
fi fi
# puppet apply # puppet apply

6
scripts/lib/setup_path_on_import.py
View File

@@ -8,7 +8,11 @@ from os.path import dirname, abspath
import sys import sys
BASE_DIR = dirname(dirname(dirname(abspath(__file__)))) BASE_DIR = dirname(dirname(dirname(abspath(__file__))))
activate_this = os.path.join(BASE_DIR, "zulip-venv", "bin", "activate_this.py") activate_this = os.path.join(
BASE_DIR,
"zulip-venv" if sys.version_info[0] == 2 else "zulip-py3-venv",
"bin",
"activate_this.py")
if os.path.exists(activate_this): if os.path.exists(activate_this):
# this file will exist in production # this file will exist in production
exec(open(activate_this).read(), {}, dict(__file__=activate_this)) exec(open(activate_this).read(), {}, dict(__file__=activate_this))

2
scripts/lib/upgrade-zulip-stage-2
View File

@@ -52,7 +52,7 @@ if os.path.islink((os.path.join(deploy_path, "zproject/local_settings.py"))):
subprocess.check_call(["rm", os.path.join(deploy_path, "zproject/local_settings.py")]) subprocess.check_call(["rm", os.path.join(deploy_path, "zproject/local_settings.py")])
subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "create-production-venv"), subprocess.check_call([os.path.join(deploy_path, "scripts", "lib", "create-production-venv"),
os.path.join(deploy_path, "zulip-venv")]) deploy_path])
if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"): if os.path.exists("/etc/supervisor/conf.d/zulip_db.conf"):
subprocess.check_call(["supervisorctl", "stop", "process-fts-updates"], preexec_fn=su_to_zulip) subprocess.check_call(["supervisorctl", "stop", "process-fts-updates"], preexec_fn=su_to_zulip)