From 866b4cedaf4f4cc76a6ec415120327b4da5f46d1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 17 Jul 2024 16:57:41 +0200 Subject: [PATCH] coin: Fix pip3 installation on macOS arm The pip3 install calls contained the word 'install' twice. Starting with newer pip versions, this seems to fail with: /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib ERROR: Could not find a version that satisfies the requirement install (from versions: none) ERROR: No matching distribution found for install Make sure install only appears once. Pick-to: 6.8 Change-Id: I1bfc784d4e3d6a1c34d112e72e2739678d2f07ae Reviewed-by: Ville-Pekka Karhu --- coin/provisioning/qtci-macos-11-arm/25-python3.sh | 2 +- coin/provisioning/qtci-macos-12-arm/25-python.sh | 2 +- coin/provisioning/qtci-macos-13-arm/25-python.sh | 2 +- coin/provisioning/qtci-macos-14-arm/25-python.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-macos-11-arm/25-python3.sh b/coin/provisioning/qtci-macos-11-arm/25-python3.sh index 5a0df739..bbf8cad1 100755 --- a/coin/provisioning/qtci-macos-11-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-11-arm/25-python3.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index 0e05f593..11a157cf 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index 0e05f593..11a157cf 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 761fcf01..36bbc0e1 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"