From 3b8e593f84b71b5a4f076d4cee45e591aea0002b Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 25 Feb 2021 10:43:32 +0100
Subject: [PATCH] [windows] move python block after vcpkg blocks
---
windows/base/Dockerfile | 40 -----------------------------------
windows/cuda-devel/Dockerfile | 40 +++++++++++++++++++++++++++++++++++
windows/devel/Dockerfile | 40 +++++++++++++++++++++++++++++++----
3 files changed, 76 insertions(+), 44 deletions(-)
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index d9588b8..13f8bfc 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -85,43 +85,3 @@ RUN cd $env:VCPKG_DIR; \
Remove-Item -Force -Recurse ./downloads; \
Remove-Item -Force -Recurse ./buildtrees; \
Remove-Item -Force -Recurse ./packages;
-
-RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
- 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 /Python39/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
- Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
- Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location \
- wheel \
- twine \
- pytest \
- pytest-cov \
- testbook \
- jupyter \
- pandas \
- h5py \
- ; \
- Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
- Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
- Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
- wheel \
- twine \
- pytest \
- pytest-cov \
- testbook \
- jupyter \
- pandas \
- h5py \
- ; \
- Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
- Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
- Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
- wheel \
- twine \
- pytest \
- pytest-cov \
- testbook \
- jupyter \
- pandas \
- h5py
diff --git a/windows/cuda-devel/Dockerfile b/windows/cuda-devel/Dockerfile
index d9bfacd..3f2130a 100644
--- a/windows/cuda-devel/Dockerfile
+++ b/windows/cuda-devel/Dockerfile
@@ -32,3 +32,43 @@ RUN cd $env:VCPKG_DIR; \
Remove-Item -Force -Recurse ./downloads; \
Remove-Item -Force -Recurse ./buildtrees; \
Remove-Item -Force -Recurse ./packages;
+
+RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
+ 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 /Python39/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+ Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+ Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location \
+ wheel \
+ twine \
+ pytest \
+ pytest-cov \
+ testbook \
+ jupyter \
+ pandas \
+ h5py \
+ ; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
+ wheel \
+ twine \
+ pytest \
+ pytest-cov \
+ testbook \
+ jupyter \
+ pandas \
+ h5py \
+ ; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
+ wheel \
+ twine \
+ pytest \
+ pytest-cov \
+ testbook \
+ jupyter \
+ pandas \
+ h5py
diff --git a/windows/devel/Dockerfile b/windows/devel/Dockerfile
index cc36bff..710a6c1 100644
--- a/windows/devel/Dockerfile
+++ b/windows/devel/Dockerfile
@@ -22,10 +22,42 @@ RUN cd $env:VCPKG_DIR; \
Remove-Item -Force -Recurse ./buildtrees; \
Remove-Item -Force -Recurse ./packages;
-RUN Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
+RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
+ 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 /Python39/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+ Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+ Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location \
+ wheel \
+ twine \
pytest \
- h5py
-
-RUN Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
+ pytest-cov \
+ testbook \
+ jupyter \
+ pandas \
+ h5py \
+ ; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+ Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
+ wheel \
+ twine \
+ pytest \
+ pytest-cov \
+ testbook \
+ jupyter \
+ pandas \
+ h5py \
+ ; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+ Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
+ wheel \
+ twine \
pytest \
+ pytest-cov \
+ testbook \
+ jupyter \
+ pandas \
h5py
--
GitLab