paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/lib/setup_venv.py: Avoid shelling out for cp, touch.

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2018-07-18 17:50:15 -04:00
committed by Tim Abbott
parent 6162ea1075
commit fe76b97e28
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/lib/setup_venv.py
View File

@@ -1,5 +1,6 @@
import os import os
import shutil
import subprocess import subprocess
from scripts.lib.zulip_tools import run, ENDC, WARNING, parse_lsb_release from scripts.lib.zulip_tools import run, ENDC, WARNING, parse_lsb_release
from scripts.lib.hash_reqs import expand_reqs from scripts.lib.hash_reqs import expand_reqs
@@ -201,7 +202,7 @@ def create_log_entry(target_log, parent, copied_packages, new_packages):
def copy_parent_log(source_log, target_log): def copy_parent_log(source_log, target_log):
# type: (str, str) -> None # type: (str, str) -> None
if os.path.exists(source_log): if os.path.exists(source_log):
run('cp {} {}'.format(source_log, target_log).split()) shutil.copyfile(source_log, target_log)
def do_patch_activate_script(venv_path): def do_patch_activate_script(venv_path):
# type: (str) -> None # type: (str) -> None
@@ -237,7 +238,7 @@ def setup_virtualenv(target_venv_path, requirements_file, virtualenv_args=None,
success_stamp = os.path.join(cached_venv_path, "success-stamp") success_stamp = os.path.join(cached_venv_path, "success-stamp")
if not os.path.exists(success_stamp): if not os.path.exists(success_stamp):
do_setup_virtualenv(cached_venv_path, requirements_file, virtualenv_args or []) do_setup_virtualenv(cached_venv_path, requirements_file, virtualenv_args or [])
run(["touch", success_stamp]) open(success_stamp, 'w').close()
print("Using cached Python venv from %s" % (cached_venv_path,)) print("Using cached Python venv from %s" % (cached_venv_path,))
if target_venv_path is not None: if target_venv_path is not None: