From 98205c75704b383398ad6d9b286036c9451688c0 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 24 Feb 2020 09:06:54 +0000 Subject: [PATCH] We need to install tornado using pip on 2019.2 python3 --- bootstrap-salt.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index eecdf43..15e9423 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -5240,7 +5240,12 @@ install_amazon_linux_ami_2_git_deps() { # We're on the master branch, install whichever tornado is on the requirements file __REQUIRED_TORNADO="$(grep tornado "${_SALT_GIT_CHECKOUT_DIR}/requirements/base.txt")" if [ "${__REQUIRED_TORNADO}" != "" ]; then - __PACKAGES="${__PACKAGES} ${pkg_append}${PY_PKG_VER}-tornado" + if [ -n "$_PY_EXE" ] && [ "$_PY_MAJOR_VERSION" -eq "3" ]; then + __PACKAGES="${__PACKAGES} python3-pip" + __PIP_PACKAGES="${__PIP_PACKAGES} tornado<$_TORNADO_MAX_PY3_VERSION" + else + __PACKAGES="${__PACKAGES} ${pkg_append}${PY_PKG_VER}-tornado" + fi fi fi