From d54fb5f40db3f6077d9188bf13263cd0ae926c99 Mon Sep 17 00:00:00 2001 From: rht Date: Mon, 10 Dec 2018 13:31:38 +0000 Subject: [PATCH] provision: Add venv dependencies for Centos 7. --- scripts/lib/setup_venv.py | 30 ++++++++++++++++++++++++++++++ tools/lib/provision.py | 5 +++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/scripts/lib/setup_venv.py b/scripts/lib/setup_venv.py index c34fa93d7f..fd9a370ea9 100644 --- a/scripts/lib/setup_venv.py +++ b/scripts/lib/setup_venv.py @@ -45,6 +45,27 @@ VENV_DEPENDENCIES = [ "jq", # Used by scripts/lib/install-node to check yarn version ] +YUM_VENV_DEPENDENCIES = [ + "libffi-devel", + "freetype-devel", + "zlib-devel", + "libjpeg-turbo-devel", + "openldap-devel", + "libmemcached-devel", + "python34-devel", + "python-devel", + "python34-pip", + "python2-pip", + "python-virtualenv", + "python34-six", + "python-six", + "libxml2-devel", + "libxslt-devel", + "postgresql-libs", # libpq-dev on apt + "openssl-devel", + "jq", +] + codename = parse_lsb_release()["DISTRIB_CODENAME"] if codename != "trusty": @@ -60,6 +81,15 @@ THUMBOR_VENV_DEPENDENCIES = [ "gifsicle", ] +YUM_THUMBOR_VENV_DEPENDENCIES = [ + "libcurl-devel", + "libjpeg-turbo-devel", + "zlib-devel", + "freetype-devel", + "libpng-devel", + "gifsicle", +] + def install_venv_deps(requirements_file): # type: (str) -> None pip_requirements = os.path.join(ZULIP_PATH, "requirements", "pip.txt") diff --git a/tools/lib/provision.py b/tools/lib/provision.py index d36dcead6a..75527f4cca 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -16,7 +16,8 @@ sys.path.append(ZULIP_PATH) 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 from scripts.lib.setup_venv import ( - setup_virtualenv, VENV_DEPENDENCIES, THUMBOR_VENV_DEPENDENCIES + setup_virtualenv, VENV_DEPENDENCIES, YUM_VENV_DEPENDENCIES, + THUMBOR_VENV_DEPENDENCIES, YUM_THUMBOR_VENV_DEPENDENCIES ) from scripts.lib.node_cache import setup_node_modules, NODE_MODULES_CACHE_PATH @@ -153,7 +154,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [ "freetype-devel", "fontconfig-devel", "libstdc++" -] +] + YUM_VENV_DEPENDENCIES + YUM_THUMBOR_VENV_DEPENDENCIES APT_DEPENDENCIES = { "stretch": UBUNTU_COMMON_APT_DEPENDENCIES + [