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

requirements: Fork pip.txt to pip2.txt for Python 2.

Browse Source 
The current version of setuptools no longer supports Python 2.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2020-02-04 21:56:04 -08:00
committed by Tim Abbott
parent d2e07ea51b
commit 61bf698185
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/setup_venv.py
View File

@@ -99,9 +99,9 @@ YUM_THUMBOR_VENV_DEPENDENCIES = [
"gifsicle",
]
def install_venv_deps(pip, requirements_file):
# type: (str, str) -> None
pip_requirements = os.path.join(ZULIP_PATH, "requirements", "pip.txt")
def install_venv_deps(pip, requirements_file, python2):
# type: (str, str, bool) -> None
pip_requirements = os.path.join(ZULIP_PATH, "requirements", "pip2.txt" if python2 else "pip.txt")
run([pip, "install", "--force-reinstall", "--require-hashes", "--requirement", pip_requirements])
run([pip, "install", "--no-deps", "--require-hashes", "--requirement", requirements_file])
@@ -330,10 +330,10 @@ def do_setup_virtualenv(venv_path, requirements_file, python2):
add_cert_to_pipconf()
try:
install_venv_deps(pip, requirements_file)
install_venv_deps(pip, requirements_file, python2)
except subprocess.CalledProcessError:
# Might be a failure due to network connection issues. Retrying...
print(WARNING + "`pip install` failed; retrying..." + ENDC)
install_venv_deps(pip, requirements_file)
install_venv_deps(pip, requirements_file, python2)
run_as_root(["chmod", "-R", "a+rX", venv_path])