diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index b6a497dc..e58a236d 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -24,7 +24,7 @@ echo "Configure pip" /Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 config --user set global.extra-index-url https://pypi.org/simple/ /Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install virtualenv wheel html5lib -/Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/sbom_requirements.txt +/Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/requirements.txt SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin" SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin" diff --git a/coin/provisioning/common/shared/requirements.txt b/coin/provisioning/common/shared/requirements.txt new file mode 100644 index 00000000..cde698e9 --- /dev/null +++ b/coin/provisioning/common/shared/requirements.txt @@ -0,0 +1,2 @@ +# Requirements for running sbom +-r sbom_requirements.txt diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 1422fc5b..2ae87b25 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -85,7 +85,7 @@ Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wh # The lowest version available on all windows platforms that we currently run on that satisfies # these requirements is 3.10. if ([version]::Parse($version) -gt [version]::Parse("3.10")) { - Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install -r $PSScriptRoot\..\shared\sbom_requirements.txt" + Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install -r $PSScriptRoot\..\shared\requirements.txt" # Set the environment variable for the build system to know which python path to use for SBOM # processing. Set-EnvironmentVariable "SBOM_PYTHON_APPS_PATH" "$install_path\Scripts" diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh index a6ecb6ad..a1594508 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh @@ -260,7 +260,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install cmake apt-cacher-ng -t # Disable keyring password prompt keyring --disable -pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 62a37bd9..f2c71ec6 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -171,7 +171,7 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel sudo python3.11 -m pip install virtualenv wheel html5lib -sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" # For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the # system python3.11. diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index b2477251..b083fbec 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -171,7 +171,7 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel # Just make sure we have virtualenv to run with python3.8 -m virtualenv sudo python3.11 -m pip install virtualenv wheel -sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" # For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the # system python3.11. diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index ed091f0e..fbe3b480 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -186,10 +186,10 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel # Just make sure we have virtualenv to run with python3.8 -m virtualenv sudo python -m pip install virtualenv wheel -sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" sudo /usr/bin/pip3 install wheel -sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" # Provisioning during installation says: # 'The script sbom2doc is installed in '/usr/local/bin' which is not on PATH.' diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index 15d5c3fe..db579884 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -188,10 +188,10 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel # Just make sure we have virtualenv to run with python3.8 -m virtualenv sudo python -m pip install virtualenv wheel -sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" sudo /usr/bin/pip3 install wheel -sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" # Provisioning during installation says: # 'The script sbom2doc is installed in '/usr/local/bin' which is not on PATH.' diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh index 51558ea0..ebe413e1 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh @@ -71,7 +71,7 @@ python3 --version | grep -F "$python3Version" pip3 install --user wheel pip3 install --user virtualenv -pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/08-pythondev.sh index f4d37b83..3c53bf58 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/08-pythondev.sh @@ -71,7 +71,7 @@ python3 --version | grep -F "$python3Version" pip3 install --user wheel pip3 install --user virtualenv -pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index e4dade0d..9696efc2 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -255,7 +255,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins # Configure pip pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache pip config --user set global.extra-index-url https://pypi.org/simple/ -pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index 5f318010..84cebda4 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -250,7 +250,7 @@ pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_ pip config --user set global.extra-index-url https://pypi.org/simple/ # Ubuntu 24.04 comes with a newer pip that disallows installing into the system site-packages, # so we explicitly ask it to allow it. -pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" --break-system-packages +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" --break-system-packages source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index be9d3e04..98a541a9 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -261,7 +261,7 @@ pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_ pip config --user set global.extra-index-url https://pypi.org/simple/ # Ubuntu 24.04 comes with a newer pip that disallows installing into the system site-packages, # so we explicitly ask it to allow it. -pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" --break-system-packages +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" --break-system-packages source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh index eaa047bf..b6721cc1 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh @@ -14,7 +14,7 @@ sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python311-base python311-devel python311-pip python311-virtualenv python311-wheel python3.11 -m pip install selenium netifaces scache -python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh index 2d66798b..54776fdd 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/08-pythondev.sh @@ -14,7 +14,7 @@ sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python311-base python311-devel python311-pip python311-virtualenv python311-wheel python3.11 -m pip install selenium netifaces scache -python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11" diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index bc0857a5..9c43cb03 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /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 +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt 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-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index bc0857a5..9c43cb03 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /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 +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt 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-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 37c61881..3a97f70c 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /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 +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt 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-15-arm/25-python.sh b/coin/provisioning/qtci-macos-15-arm/25-python.sh index 37c61881..3a97f70c 100755 --- a/coin/provisioning/qtci-macos-15-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-15-arm/25-python.sh @@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /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 +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"