From db924b4e81d1db066ec5aadda052d3af05e996c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivo=20J=C3=A1nsk=C3=BD?= Date: Sat, 1 May 2021 14:59:26 +0200 Subject: [PATCH] Gentoo - relax setuptools version upper bound MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ivo Jánský --- bootstrap-salt.sh | 11 ++++++++--- kitchen.yml | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index b4b3de1..3cc175e 100644 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2739,9 +2739,14 @@ EOM echodebug "Installed pip version: $(${_pip_cmd} --version)" fi - # We also lock setuptools to <45 which is the latest release to support both py2 and py3 - echodebug "Running '${_pip_cmd} install wheel setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<45'" - ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "setuptools>=${_MINIMUM_SETUPTOOLS_VERSION},<45" + _setuptools_dep="setuptools>=${_MINIMUM_SETUPTOOLS_VERSION}" + if [ "$_PY_MAJOR_VERSION" -eq 2 ]; then + # We also lock setuptools to <45 which is the latest release to support both py2 and py3 + _setuptools_dep="${_setuptools_dep},<45" + fi + + echodebug "Running '${_pip_cmd} install wheel ${_setuptools_dep}'" + ${_pip_cmd} install ${_POST_NEON_PIP_INSTALL_ARGS} wheel "${_setuptools_dep}" echoinfo "Installing salt using ${_py_exe}" cd "${_SALT_GIT_CHECKOUT_DIR}" || return 1 diff --git a/kitchen.yml b/kitchen.yml index a24d32a..873c9a2 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -89,13 +89,13 @@ platforms: - sed -i 's/^PubkeyAcceptedKeyTypes.*$/&,ssh-rsa/' /etc/crypto-policies/back-ends/opensshserver.config - name: gentoo driver_config: - image: ksmanis/stage3:latest + image: gentoo/stage3:latest run_command: /sbin/init provision_command: - rc-update add sshd default - name: gentoo-systemd driver_config: - image: ksmanis/stage3:systemd + image: gentoo/stage3:systemd run_command: /lib/systemd/systemd provision_command: - systemctl enable sshd.service