Merge pull request #1116 from aflat/develop

use versions specified in base.txt when doing pip installs
This commit is contained in:
Nicole Thomas 2017-08-07 16:54:41 -04:00 committed by GitHub
commit 198de60551

View file

@ -1129,6 +1129,14 @@ __install_python_and_deps() {
__yum_install_noinput "${__PACKAGES}" || return 1
_PIP_PACKAGES="tornado PyYAML msgpack-python jinja2 pycrypto zmq"
if [ -f "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt" ]; then
for SINGLE_PACKAGE in $_PIP_PACKAGES; do
__REQUIRED_VERSION="$(grep "${SINGLE_PACKAGE}" "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")"
if [ "${__REQUIRED_VERSION}" != "" ]; then
_PIP_PACKAGES=$(echo "$_PIP_PACKAGES" | sed "s/${SINGLE_PACKAGE}/${__REQUIRED_VERSION}/")
fi
done
fi
if [ "$_INSTALL_CLOUD" -eq $BS_TRUE ]; then
_PIP_PACKAGES="${_PIP_PACKAGES} apache-libcloud"
fi