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

provision: Move CentOS & Fedora venv deps construction to setup_venv.py.

Browse Source 
They will be reused in production setup.
This commit is contained in:
rht
2018-12-19 01:45:32 +00:00
committed by Tim Abbott
parent 17ffbdabe2
commit c190959b58
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/lib/setup_venv.py
View File

@@ -62,6 +62,20 @@ COMMON_YUM_VENV_DEPENDENCIES = [
"jq", "jq",
] ]
REDHAT_VENV_DEPENDENCIES = COMMON_YUM_VENV_DEPENDENCIES + [
"python34-devel",
"python34-pip",
"python34-six",
"python-virtualenv",
]
FEDORA_VENV_DEPENDENCIES = COMMON_YUM_VENV_DEPENDENCIES + [
"python3-devel",
"python3-pip",
"python3-six",
"virtualenv", # see https://unix.stackexchange.com/questions/27877/install-virtualenv-on-fedora-16
]
codename = parse_lsb_release()["DISTRIB_CODENAME"] codename = parse_lsb_release()["DISTRIB_CODENAME"]
if codename != "trusty": if codename != "trusty":

21
tools/lib/provision.py
View File

@@ -17,8 +17,9 @@ sys.path.append(ZULIP_PATH)
from scripts.lib.zulip_tools import run, subprocess_text_output, OKBLUE, ENDC, WARNING, \ from scripts.lib.zulip_tools import run, subprocess_text_output, OKBLUE, ENDC, WARNING, \
get_dev_uuid_var_path, FAIL, parse_lsb_release, file_or_package_hash_updated get_dev_uuid_var_path, FAIL, parse_lsb_release, file_or_package_hash_updated
from scripts.lib.setup_venv import ( from scripts.lib.setup_venv import (
setup_virtualenv, VENV_DEPENDENCIES, COMMON_YUM_VENV_DEPENDENCIES, setup_virtualenv, VENV_DEPENDENCIES, REDHAT_VENV_DEPENDENCIES,
THUMBOR_VENV_DEPENDENCIES, YUM_THUMBOR_VENV_DEPENDENCIES THUMBOR_VENV_DEPENDENCIES, YUM_THUMBOR_VENV_DEPENDENCIES,
FEDORA_VENV_DEPENDENCIES
) )
from scripts.lib.node_cache import setup_node_modules, NODE_MODULES_CACHE_PATH from scripts.lib.node_cache import setup_node_modules, NODE_MODULES_CACHE_PATH
@@ -169,7 +170,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
"freetype-devel", "freetype-devel",
"fontconfig-devel", "fontconfig-devel",
"libstdc++" "libstdc++"
] + COMMON_YUM_VENV_DEPENDENCIES + YUM_THUMBOR_VENV_DEPENDENCIES ] + YUM_THUMBOR_VENV_DEPENDENCIES
if vendor in ["Ubuntu", "Debian"]: if vendor in ["Ubuntu", "Debian"]:
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [ SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
@@ -187,12 +188,7 @@ elif vendor in ["CentOS", "RedHat"]:
"postgresql{0}-devel", "postgresql{0}-devel",
"postgresql{0}-pgroonga", "postgresql{0}-pgroonga",
] ]
] + [ # venv dependencies ] + REDHAT_VENV_DEPENDENCIES
"python34-devel",
"python34-pip",
"python34-six",
"python-virtualenv",
]
elif vendor == "Fedora": elif vendor == "Fedora":
SYSTEM_DEPENDENCIES = COMMON_YUM_DEPENDENCIES + [ SYSTEM_DEPENDENCIES = COMMON_YUM_DEPENDENCIES + [
pkg.format(POSTGRES_VERSION) for pkg in [ pkg.format(POSTGRES_VERSION) for pkg in [
@@ -200,12 +196,7 @@ elif vendor == "Fedora":
"postgresql{0}", "postgresql{0}",
"postgresql{0}-devel", "postgresql{0}-devel",
] ]
] + [ # venv dependencies ] + FEDORA_VENV_DEPENDENCIES
"python3-devel",
"python3-pip",
"python3-six",
"virtualenv", # see https://unix.stackexchange.com/questions/27877/install-virtualenv-on-fedora-16
]
if family == 'redhat': if family == 'redhat':
TSEARCH_STOPWORDS_PATH = "/usr/pgsql-%s/share/tsearch_data/" % (POSTGRES_VERSION,) TSEARCH_STOPWORDS_PATH = "/usr/pgsql-%s/share/tsearch_data/" % (POSTGRES_VERSION,)