diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-11-11 16:44:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-11-20 11:13:09 +0100 |
| commit | 83b4afd584b6c5b7267d8a288ef43f55fc12f5eb (patch) | |
| tree | 55b3f8264b619e76e2403fa1fb23a573106234e5 /coin | |
| parent | 806685f6f7dc8643140dc65599578befbb8bbd91 (diff) | |
Add python3 html5lib
Needed for qtwebengine in 6.3
Change-Id: I6dc941fabe4e28e3dce19db8f7812be034be8586
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
8 files changed, 8 insertions, 4 deletions
diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index 1f240993..7e3d820c 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -52,7 +52,7 @@ InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" InstallPip python3.9 -/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install virtualenv wheel +/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install virtualenv wheel html5lib SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh index 89adbd5c..eceb26a1 100755 --- a/coin/provisioning/common/unix/python_modules.sh +++ b/coin/provisioning/common/unix/python_modules.sh @@ -36,3 +36,4 @@ # needed by packaging scripts pip3 install bs4 pip3 install sh +pip3 install html5lib diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 874f2f06..5268e42c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -90,7 +90,7 @@ if (IsProxyEnabled) { Write-Host "Upgrade pip3 to the latest version available." Run-Executable "$install_path\python.exe" "-m pip install --upgrade pip" -Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel" +Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel html5lib" # Install all needed packages in a special wheel cache directory $python3_wheel_dir="$install_path\python3-wheels" diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index 17ce3b87..e466ca97 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -89,6 +89,7 @@ installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) +installPackages+=(python3-html5lib) # For Android builds installPackages+=(java-11-openjdk-devel) # For receiving shasum diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index a9d98ab1..24a60875 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -89,6 +89,7 @@ installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) +installPackages+=(python3-html5lib) # For Android builds installPackages+=(java-11-openjdk-devel) # For receiving shasum diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index 28cd31e4..deeedd25 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -94,6 +94,7 @@ installPackages+=(libxkbfile-dev) installPackages+=(libxshmfence-dev) installPackages+=(libxss-dev) installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated +installPackages+=(python3-html5lib) # Common event loop handling installPackages+=(libglib2.0-dev) diff --git a/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh b/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh index fbbcd919..7adafe4d 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh @@ -43,7 +43,7 @@ brew install ${BASH_SOURCE%/*}/pyenv.rb pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install 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.0-arm/25-python3.sh b/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh index fbbcd919..7adafe4d 100755 --- a/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-12.0-arm/25-python3.sh @@ -43,7 +43,7 @@ brew install ${BASH_SOURCE%/*}/pyenv.rb pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install 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/" |