From 8fdb62a6bc21cb4afc18ffaaa03e70f33a048f07 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 6 Feb 2019 17:14:01 -0800 Subject: [PATCH] tools: Create DEPLOY_ROOT/zulip-py3-venv symlink in development too. Signed-off-by: Anders Kaseorg --- tools/setup/setup_venvs.py | 8 +++++--- version.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/setup/setup_venvs.py b/tools/setup/setup_venvs.py index 11a37226b3..60bab2132e 100755 --- a/tools/setup/setup_venvs.py +++ b/tools/setup/setup_venvs.py @@ -8,7 +8,7 @@ if ZULIP_PATH not in sys.path: sys.path.append(ZULIP_PATH) from scripts.lib.setup_venv import setup_virtualenv -from scripts.lib.zulip_tools import subprocess_text_output +from scripts.lib.zulip_tools import overwrite_symlink, subprocess_text_output VENV_PATH = "/srv/zulip-py3-venv" @@ -22,8 +22,10 @@ def main() -> None: python_interpreter = subprocess_text_output(['which', 'python3']) setup_virtualenv("/srv/zulip-thumbor-venv", THUMBOR_REQS_FILE, patch_activate_script=True, virtualenv_args=['-p', 'python2.7']) - setup_virtualenv(VENV_PATH, DEV_REQS_FILE, patch_activate_script=True, - virtualenv_args=['-p', python_interpreter]) + cached_venv_path = setup_virtualenv( + VENV_PATH, DEV_REQS_FILE, patch_activate_script=True, + virtualenv_args=['-p', python_interpreter]) + overwrite_symlink(cached_venv_path, os.path.join(ZULIP_PATH, "zulip-py3-venv")) if __name__ == "__main__": main() diff --git a/version.py b/version.py index 7929eead18..817eee0aeb 100644 --- a/version.py +++ b/version.py @@ -11,4 +11,4 @@ LATEST_RELEASE_ANNOUNCEMENT = "https://blog.zulip.org/2018/11/07/zulip-1-9-relea # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '28.0' +PROVISION_VERSION = '28.1'