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

provision: Rename APT_DEPENDENCIES -> SYSTEM_DEPENDENCIES.

Browse Source
This commit is contained in:
rht
2018-12-10 13:33:46 +00:00
parent d54fb5f40d
commit e8c602ec58
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/subsystems/dependencies.md
View File

@@ -105,7 +105,7 @@ The exact lists of `apt` packages needed by Zulip are maintained in a
few places: few places:
* For production, in our puppet configuration, `puppet/zulip/`, using * For production, in our puppet configuration, `puppet/zulip/`, using
the `Package` and `SafePackage` directives. the `Package` and `SafePackage` directives.
* For development, in `APT_DEPENDENCIES` in `tools/lib/provision.py`. * For development, in `SYSTEM_DEPENDENCIES` in `tools/lib/provision.py`.
* The packages needed to build a Zulip virtualenv, in * The packages needed to build a Zulip virtualenv, in
`VENV_DEPENDENCIES` in `scripts/lib/setup_venv.py`. These are `VENV_DEPENDENCIES` in `scripts/lib/setup_venv.py`. These are
separate from the rest because (1) we may need to install a separate from the rest because (1) we may need to install a

6
tools/lib/provision.py
View File

@@ -156,7 +156,7 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
"libstdc++" "libstdc++"
] + YUM_VENV_DEPENDENCIES + YUM_THUMBOR_VENV_DEPENDENCIES ] + YUM_VENV_DEPENDENCIES + YUM_THUMBOR_VENV_DEPENDENCIES
APT_DEPENDENCIES = { SYSTEM_DEPENDENCIES = {
"stretch": UBUNTU_COMMON_APT_DEPENDENCIES + [ "stretch": UBUNTU_COMMON_APT_DEPENDENCIES + [
"postgresql-9.6", "postgresql-9.6",
"postgresql-9.6-tsearch-extras", "postgresql-9.6-tsearch-extras",
@@ -218,7 +218,7 @@ def install_apt_deps():
# setup-apt-repo does an `apt-get update` # setup-apt-repo does an `apt-get update`
run(["sudo", "./scripts/lib/setup-apt-repo"]) run(["sudo", "./scripts/lib/setup-apt-repo"])
# By doing list -> set -> list conversion we remove duplicates. # By doing list -> set -> list conversion we remove duplicates.
deps_to_install = list(set(APT_DEPENDENCIES[codename])) deps_to_install = list(set(SYSTEM_DEPENDENCIES[codename]))
run(["sudo", "apt-get", "-y", "install", "--no-install-recommends"] + deps_to_install) run(["sudo", "apt-get", "-y", "install", "--no-install-recommends"] + deps_to_install)
def main(options): def main(options):
@@ -232,7 +232,7 @@ def main(options):
# hash the apt dependencies # hash the apt dependencies
sha_sum = hashlib.sha1() sha_sum = hashlib.sha1()
for apt_depedency in APT_DEPENDENCIES[codename]: for apt_depedency in SYSTEM_DEPENDENCIES[codename]:
sha_sum.update(apt_depedency.encode('utf8')) sha_sum.update(apt_depedency.encode('utf8'))
# hash the content of setup-apt-repo # hash the content of setup-apt-repo
sha_sum.update(open('scripts/lib/setup-apt-repo', 'rb').read()) sha_sum.update(open('scripts/lib/setup-apt-repo', 'rb').read())