diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index cbc9d581..247c6b82 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -30,6 +30,7 @@ echo "Configure pip" SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" # Install Python certificates. Required at least for emsdk installation open /Applications/Python\ 3.9/Install\ Certificates.command 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 73695f23..26cc4876 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 @@ -262,6 +262,10 @@ keyring --disable pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" #OpenSSLVersion="$(openssl version |cut -b 9-14)" 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 209afc53..42b62022 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 @@ -169,6 +169,8 @@ 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 sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_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. sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses 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 7d236160..14dec198 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 @@ -170,6 +170,8 @@ 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" +# For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the +# system python3.11. sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses 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 299ed222..d0facbe9 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,6 +186,12 @@ sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requireme sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/usr/local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" + # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 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 79d0f1b2..51558ea0 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 @@ -76,3 +76,8 @@ pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_PATH" "/usr/local/bin" + +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" 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 d5c899e5..653ef084 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 @@ -253,5 +253,10 @@ pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 2939f46c..3e6e92f8 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 @@ -255,5 +255,10 @@ pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 0aed8bb7..4ba0c1db 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 @@ -258,5 +258,10 @@ pip config --user set global.extra-index-url https://pypi.org/simple/ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 7f7d867a..e6b15cb9 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 @@ -17,3 +17,8 @@ python3.11 -m pip install selenium netifaces scache webdriver-manager python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11" + +# Provisioning during installation says: +# 'Defaulting to user installation because normal site-packages is not writeable' +# So it implicitly uses pip install --user, hence the path. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index 11a157cf..ef90d763 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -18,6 +18,11 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" # Use 3.9 as a default python SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + # QtWebengine still requires python2 pyenv install 2.7.18 SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/" diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index 11a157cf..ef90d763 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -18,6 +18,11 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" # Use 3.9 as a default python SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + # QtWebengine still requires python2 pyenv install 2.7.18 SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/" diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 36bbc0e1..2a03b217 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -18,4 +18,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" # Use 3.9 as a default python SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + echo "python3 = 3.9.7" >> ~/versions.txt