From 69ec2bc452e1a7c6332ae783335d2bf5248d12e7 Mon Sep 17 00:00:00 2001 From: Moritz Maxeiner <mm@ucw.sh> Date: Tue, 9 Feb 2021 13:43:42 +0100 Subject: [PATCH] [centos,windows] python: update system-wide pip, pin cryptography to <3.4 --- centos/Dockerfile | 14 +++++++++++--- windows/base/Dockerfile | 6 ++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/centos/Dockerfile b/centos/Dockerfile index 4390524..7aad0f1 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -346,6 +346,8 @@ RUN yum install -y \ libepoxy-devel \ && \ yum clean all && \ + python3.6 -m pip --no-cache-dir install -U pip && \ + python3.6 -m pip --no-cache-dir install 'cryptography<3.4' && \ python3.6 -m pip --no-cache-dir install \ wheel \ twine @@ -440,7 +442,9 @@ RUN version=3.9.1 && \ ldconfig # Python 3.7 packages -RUN python3.7 -m pip --no-cache-dir install \ +RUN python3.7 -m pip --no-cache-dir install -U pip && \ + python3.7 -m pip --no-cache-dir install 'cryptography<3.4' && \ + python3.7 -m pip --no-cache-dir install \ wheel \ twine \ pytest \ @@ -448,7 +452,9 @@ RUN python3.7 -m pip --no-cache-dir install \ h5py # Python 3.8 packages -RUN python3.8 -m pip --no-cache-dir install \ +RUN python3.8 -m pip --no-cache-dir install -U pip && \ + python3.8 -m pip --no-cache-dir install 'cryptography<3.4' && \ + python3.8 -m pip --no-cache-dir install \ wheel \ twine \ pytest \ @@ -456,7 +462,9 @@ RUN python3.8 -m pip --no-cache-dir install \ h5py # Python 3.9 packages -RUN python3.9 -m pip --no-cache-dir install \ +RUN python3.9 -m pip --no-cache-dir install -U pip && \ + python3.9 -m pip --no-cache-dir install 'cryptography<3.4' && \ + python3.9 -m pip --no-cache-dir install \ wheel \ twine \ pytest \ diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile index 36cc6c9..df56e23 100644 --- a/windows/base/Dockerfile +++ b/windows/base/Dockerfile @@ -90,6 +90,8 @@ 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 \ @@ -97,6 +99,8 @@ RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; 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 \ @@ -104,6 +108,8 @@ RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; 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 \ -- GitLab