saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Testing fixes for PyPI requirements clashes

Browse source
This commit is contained in:
David Murphy 2024-11-26 15:06:24 -07:00
parent e4b3164136
commit 9b3055b1bd
No known key found for this signature in database
GPG key ID: 9D7724F37A7424D8
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
bootstrap-salt.sh
View file

@ -2815,27 +2815,47 @@ __install_salt_from_repo() {
fi fi
fi fi
echoinfo "Downloading Salt Dependencies from PyPi" ## DGM echoinfo "Downloading Salt Dependencies from PyPi"
if [ "${OS_NAME}" = "Linux" ]; then ## DGM if [ "${OS_NAME}" = "Linux" ]; then
echodebug "Solving jaraco.functools splat issue, installing jaraco.functools v4.0.0" ## DGM echodebug "Solving jaraco.functools splat issue, installing jaraco.functools v4.0.0"
${_pip_cmd} install "jaraco.functools==4.0.0" || return 1 ## DGM ${_pip_cmd} install "jaraco.functools==4.0.0" || return 1
echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt" ## DGM echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt"
${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt" ## DGM ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
else ## DGM else
echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'" ## DGM echodebug "Running '${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .'"
${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} . ## DGM ${_pip_cmd} download -d /tmp/git/deps ${_PIP_DOWNLOAD_ARGS} .
fi ## DGM fi
## DGM # shellcheck disable=SC2181
## DGM if [ $? -ne 0 ]; then
## DGM echo "Failed to download salt dependencies"
## DGM return 1
## DGM fi
## DGM echoinfo "Installing Downloaded Salt Dependencies"
## DGM echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/*'"
## DGM ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
rm -f /tmp/git/deps/*
## DGM different attempt, try installing requirements
echoinfo "DGM Installing Salt reuqirements from PyPi, ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt"
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
# shellcheck disable=SC2181 # shellcheck disable=SC2181
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Failed to download salt dependencies" echo "Failed to install salt requirements for the version of Python ${_py_version}"
return 1 return 1
fi fi
if [ "${OS_NAME}" = "Linux" ]; then
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.functools==4.1.0" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.text==4.0.0" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.collections==5.1.0" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.context==6.0.1" || return 1
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed --upgrade ${_PIP_INSTALL_ARGS} "jaraco.classes==3.4.0" || return 1
echoinfo "Installing Downloaded Salt Dependencies" ${_pip_cmd} list
echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/*'" fi
${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} /tmp/git/deps/* || return 1
rm -f /tmp/git/deps/*
echoinfo "Building Salt Python Wheel" echoinfo "Building Salt Python Wheel"
if [ "$_ECHO_DEBUG" -eq $BS_TRUE ]; then if [ "$_ECHO_DEBUG" -eq $BS_TRUE ]; then