mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 05:19:40 +08:00
Provisioning: Remove the special wheel cache for python3 packages
It should be replaced with a global pip cache in the long run.
Removing it should make the maintenance of the required packages easier
as it can be done within the modules instead of in the global
provisioing scripts.
Change-Id: Ief9832a8a640ce98325cda015d0a9e89d6cb16af
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit b87b44168c)
This commit is contained in:
@@ -98,17 +98,6 @@ Run-Executable "$install_path\python.exe" "-m pip install --upgrade pip"
|
||||
|
||||
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"
|
||||
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt"
|
||||
|
||||
Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE-$version-$archVer" "$python3_wheel_dir"
|
||||
# PYTHON3_WHEEL_CACHE is already in use so we should keep it pointing to 64 bit default
|
||||
# wheel cache
|
||||
if (($setDefault) -And ($archVer -eq 64)) {
|
||||
Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir"
|
||||
}
|
||||
|
||||
# Install PyPDF2 for QSR documentation
|
||||
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user