diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile index cba615bd6645f2000ba94c6bf3b2abeebd326cef..36cce7a8bb97a1a4225a096b77fd61d63d6aecd0 100644 --- a/windows/base/Dockerfile +++ b/windows/base/Dockerfile @@ -20,9 +20,11 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl curl \ 7zip \ wixtoolset; \ - Must-Run choco install -y python --version 3.7.8; \ + Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \ + Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \ $env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \ - Must-Run python -m pip --no-cache-dir install --no-warn-script-location wheel; \ + Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location wheel; \ + Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location wheel; \ Must-Run choco install -y visualstudio2017buildtools; \ Must-Run choco install -y visualstudio2017-workload-vctools; \ Start-Process "\"C:/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe\"" -NoNewWindow -Wait -ArgumentList 'modify --installPath \"C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools\" --quiet --norestart --remove Microsoft.VisualStudio.Component.VC.CMake.Project --add Microsoft.VisualStudio.Component.VC.Tools.14.16 --add Microsoft.VisualStudio.Component.VC.ATL' diff --git a/windows/devel/Dockerfile b/windows/devel/Dockerfile index e4f510fc2e86f035437930cb90f4f153676a8aee..cc36bff6cddd1404abe46aa76b69e58f757882cb 100644 --- a/windows/devel/Dockerfile +++ b/windows/devel/Dockerfile @@ -22,6 +22,10 @@ RUN cd $env:VCPKG_DIR; \ Remove-Item -Force -Recurse ./buildtrees; \ Remove-Item -Force -Recurse ./packages; -RUN Must-Run python -m pip --no-cache-dir install --no-warn-script-location \ +RUN Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \ + pytest \ + h5py + +RUN Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \ pytest \ h5py