From 8dfe45a76266bd333fba031be5b66fd0d44eb964 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 27 Oct 2023 08:13:15 +0200 Subject: [PATCH] tools/docker: add mypy package --- tools/docker/images/alpine-edge.Dockerfile | 2 +- tools/docker/images/archlinux.Dockerfile | 2 +- tools/docker/images/centos-7.Dockerfile | 2 +- tools/docker/images/debian-10.Dockerfile | 2 +- tools/docker/images/debian-11.Dockerfile | 2 +- tools/docker/images/debian-sid.Dockerfile | 2 +- tools/docker/images/fedora-37.Dockerfile | 2 +- tools/docker/images/fedora-38.Dockerfile | 2 +- tools/docker/images/fedora-39.Dockerfile | 2 +- tools/docker/images/opensuse-leap.Dockerfile | 2 +- tools/docker/images/ubuntu-20.04.Dockerfile | 2 +- tools/docker/images/ubuntu-22.04.Dockerfile | 2 +- tools/docker/test/alpine-edge/python.Dockerfile | 2 +- tools/docker/test/archlinux/python.Dockerfile | 2 +- tools/docker/test/opensuse-leap/python.Dockerfile | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/docker/images/alpine-edge.Dockerfile b/tools/docker/images/alpine-edge.Dockerfile index 9521530903..19d8808419 100644 --- a/tools/docker/images/alpine-edge.Dockerfile +++ b/tools/docker/images/alpine-edge.Dockerfile @@ -46,7 +46,7 @@ RUN apk add --no-cache openjdk8 maven RUN apk add --no-cache python3-dev py3-pip py3-wheel \ py3-numpy py3-pandas py3-matplotlib py3-scipy RUN rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED \ -&& python3 -m pip install absl-py mypy-protobuf +&& python3 -m pip install absl-py mypy mypy-protobuf ################ ## OR-TOOLS ## diff --git a/tools/docker/images/archlinux.Dockerfile b/tools/docker/images/archlinux.Dockerfile index 6890dc2637..5fb9055a54 100644 --- a/tools/docker/images/archlinux.Dockerfile +++ b/tools/docker/images/archlinux.Dockerfile @@ -27,7 +27,7 @@ RUN pacman -Syu --noconfirm python python-pip \ python-wheel python-virtualenv \ python-numpy python-pandas RUN python -m pip install --break-system-package \ - absl-py mypy-protobuf + absl-py mypy mypy-protobuf ################ ## OR-TOOLS ## diff --git a/tools/docker/images/centos-7.Dockerfile b/tools/docker/images/centos-7.Dockerfile index 0bd0ee546a..edcdb76335 100644 --- a/tools/docker/images/centos-7.Dockerfile +++ b/tools/docker/images/centos-7.Dockerfile @@ -69,7 +69,7 @@ RUN yum -y update \ && yum clean all \ && rm -rf /var/cache/yum \ && echo "source /opt/rh/rh-python38/enable" >> /etc/bashrc -RUN python -m pip install absl-py mypy-protobuf +RUN python -m pip install absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/images/debian-10.Dockerfile b/tools/docker/images/debian-10.Dockerfile index 450a3bb40e..351b1a6084 100644 --- a/tools/docker/images/debian-10.Dockerfile +++ b/tools/docker/images/debian-10.Dockerfile @@ -46,7 +46,7 @@ RUN apt-get update -qq \ && apt-get install -qq python3 python3-dev python3-pip python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/images/debian-11.Dockerfile b/tools/docker/images/debian-11.Dockerfile index e06ecef0bc..1f3de4beb1 100644 --- a/tools/docker/images/debian-11.Dockerfile +++ b/tools/docker/images/debian-11.Dockerfile @@ -46,7 +46,7 @@ RUN apt-get update -qq \ && apt-get install -qq python3 python3-dev python3-pip python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/images/debian-sid.Dockerfile b/tools/docker/images/debian-sid.Dockerfile index 006c1e5060..37ff35bf24 100644 --- a/tools/docker/images/debian-sid.Dockerfile +++ b/tools/docker/images/debian-sid.Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update -qq \ python3-venv python3-virtualenv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install --break-system-package absl-py mypy-protobuf +RUN python3 -m pip install --break-system-package absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/images/fedora-37.Dockerfile b/tools/docker/images/fedora-37.Dockerfile index d48bfa5fd3..82903082f0 100644 --- a/tools/docker/images/fedora-37.Dockerfile +++ b/tools/docker/images/fedora-37.Dockerfile @@ -36,7 +36,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk RUN dnf -y update \ && dnf -y install python3 python3-devel python3-pip \ && dnf clean all -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ################ ## OR-TOOLS ## diff --git a/tools/docker/images/fedora-38.Dockerfile b/tools/docker/images/fedora-38.Dockerfile index 50daae9500..4fd9dde855 100644 --- a/tools/docker/images/fedora-38.Dockerfile +++ b/tools/docker/images/fedora-38.Dockerfile @@ -36,7 +36,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk RUN dnf -y update \ && dnf -y install python3 python3-devel python3-pip \ && dnf clean all -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ################ ## OR-TOOLS ## diff --git a/tools/docker/images/fedora-39.Dockerfile b/tools/docker/images/fedora-39.Dockerfile index be5d03c536..30e84c96d3 100644 --- a/tools/docker/images/fedora-39.Dockerfile +++ b/tools/docker/images/fedora-39.Dockerfile @@ -36,7 +36,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-openjdk RUN dnf -y update \ && dnf -y install python3 python3-devel python3-pip \ && dnf clean all -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ################ ## OR-TOOLS ## diff --git a/tools/docker/images/opensuse-leap.Dockerfile b/tools/docker/images/opensuse-leap.Dockerfile index cb2db0f51d..f099edc6bd 100644 --- a/tools/docker/images/opensuse-leap.Dockerfile +++ b/tools/docker/images/opensuse-leap.Dockerfile @@ -59,7 +59,7 @@ RUN zypper install -y java-1_8_0-openjdk java-1_8_0-openjdk-devel maven \ # Install Python RUN zypper install -y python311-devel python311-pip \ && zypper clean -a -RUN python3.11 -m pip install absl-py mypy-protobuf +RUN python3.11 -m pip install absl-py mypy mypy-protobuf ################ ## OR-TOOLS ## diff --git a/tools/docker/images/ubuntu-20.04.Dockerfile b/tools/docker/images/ubuntu-20.04.Dockerfile index 1c08a7e5db..79c2a7940b 100644 --- a/tools/docker/images/ubuntu-20.04.Dockerfile +++ b/tools/docker/images/ubuntu-20.04.Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update -qq \ && apt-get install -qq python3 python3-dev python3-pip python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/images/ubuntu-22.04.Dockerfile b/tools/docker/images/ubuntu-22.04.Dockerfile index 0d634b6617..216cd1386c 100644 --- a/tools/docker/images/ubuntu-22.04.Dockerfile +++ b/tools/docker/images/ubuntu-22.04.Dockerfile @@ -42,7 +42,7 @@ RUN apt-get update -qq \ && apt-get install -qq python3 python3-dev python3-pip python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf ENV TZ=America/Los_Angeles RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/tools/docker/test/alpine-edge/python.Dockerfile b/tools/docker/test/alpine-edge/python.Dockerfile index f649060d12..970ce7f5f9 100644 --- a/tools/docker/test/alpine-edge/python.Dockerfile +++ b/tools/docker/test/alpine-edge/python.Dockerfile @@ -12,7 +12,7 @@ RUN apk add --no-cache make RUN apk add --no-cache python3-dev py3-pip py3-wheel \ py3-numpy py3-pandas py3-matplotlib py3-scipy RUN rm -f /usr/lib/python3.*/EXTERNALLY-MANAGED \ -&& python3 -m pip install absl-py mypy-protobuf +&& python3 -m pip install absl-py mypy mypy-protobuf ENTRYPOINT ["/bin/sh", "-c"] CMD ["/bin/sh"] diff --git a/tools/docker/test/archlinux/python.Dockerfile b/tools/docker/test/archlinux/python.Dockerfile index adafc4b8ff..ec88717efa 100644 --- a/tools/docker/test/archlinux/python.Dockerfile +++ b/tools/docker/test/archlinux/python.Dockerfile @@ -12,7 +12,7 @@ CMD [ "/bin/bash" ] # Install Python RUN pacman -Syu --noconfirm python python-pip python-numpy -RUN python -m pip install absl-py mypy-protobuf +RUN python -m pip install absl-py mypy mypy-protobuf WORKDIR /root ADD or-tools_amd64_alpine-edge_python_v*.tar.gz . diff --git a/tools/docker/test/opensuse-leap/python.Dockerfile b/tools/docker/test/opensuse-leap/python.Dockerfile index f432f6a0c0..4787b02722 100644 --- a/tools/docker/test/opensuse-leap/python.Dockerfile +++ b/tools/docker/test/opensuse-leap/python.Dockerfile @@ -14,7 +14,7 @@ CMD ["/usr/bin/bash"] # Python Install RUN zypper install -y python3-devel python3-pip python3-wheel \ && zypper clean -a -RUN python3 -m pip install absl-py mypy-protobuf +RUN python3 -m pip install absl-py mypy mypy-protobuf WORKDIR /root ADD or-tools_amd64_opensuse-leap_python_v*.tar.gz .