From 096d09d1a55c48b26e334c6fa296a9f8208edc2e Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 20 Dec 2024 08:55:14 +0100 Subject: [PATCH] Add html5lib to python.3.11 RHEL 8 installs python3-html5lib, however this only affects installed pythnon 3.6, webengine should use 3.11 therefore add it to pip installer. The change for switching webengine to 3.11 is in so installing of python3-htmllib can be removed. Fixes: QTBUG-132584 Change-Id: Ia6f4262971f60b960a61a466f418750c0d956cbc Reviewed-by: Volker Hilsheimer (cherry picked from commit f8e873b1889f392923a4df97fb85663759889241) Reviewed-by: Jani Heikkinen --- .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 42b62022..7e3120b5 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 @@ -86,7 +86,6 @@ installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) -installPackages+=(python3-html5lib) installPackages+=(libatomic) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) # For Android builds @@ -167,7 +166,7 @@ sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/py 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 virtualenv wheel html5lib 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.