[irods#89] Remove (most) Python 2 remnants

externals_builder.ubuntu18.Dockerfile

@@ -25,7 +25,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     apt-get install -y \
         sudo \
         git \
-        python \
         python3 \
         python3-distro \
     && \

irods_core_builder.centos7.Dockerfile

@@ -16,10 +16,7 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
     && \
     rm -rf /tmp/*
 
-# python 2 and 3 must be installed separately because yum will ignore/discard python2
 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     yum install -y \
         ccache \
         openssl \
@@ -30,17 +27,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
         unixODBC-devel \
         libjson-perl \
     && \
-    yum install -y \
-        python \
-        python-devel \
-        python-distro \
-        python2-packaging \
-        python2-pip \
-        python2-jsonschema \
-        python2-psutil \
-        python-requests \
-        pyodbc \
-    && \
     yum install -y \
         python36 \
         python3-devel \
@@ -51,7 +37,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
         python36-psutil \
         python36-requests \
     && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \

irods_core_builder.ubuntu18.Dockerfile

@@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     apt-get update && \
     apt-get install -y \
         apt-transport-https \
@@ -45,15 +43,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         ninja-build \
         odbc-postgresql \
         postgresql \
-        python \
-        python-dev \
-        python-pip \
-        python-distro \
-        python-jsonschema \
-        python-packaging \
-        python-psutil \
-        python-pyodbc \
-        python-requests \
         python3 \
         python3-pip \
         python3-distro \
@@ -68,7 +57,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         wget \
         zlib1g-dev \
     && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \

irods_runner.centos7.Dockerfile

@@ -20,22 +20,13 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
     && \
     rm -rf /tmp/*
 
-# python 2 and 3 must be installed separately because yum will ignore/discard python2
 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
     yum install -y \
         openssl-devel \
         lsof \
         postgresql-server \
         unixODBC-devel \
     && \
-    yum install -y \
-        python \
-        python-distro \
-        python2-jsonschema \
-        python2-psutil \
-        python-requests \
-        pyodbc \
-    && \
     yum install -y \
         python36 \
         python3-distro \

irods_runner.ubuntu18.Dockerfile

@@ -32,11 +32,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         sudo \
         gnupg \
         rsyslog \
-        python \
-        python-psutil \
-        python-requests \
-        python-jsonschema \
-        python-distro \
         python3 \
         python3-psutil \
         python3-requests \

plugin_builder.almalinux8.Dockerfile

@@ -24,15 +24,12 @@ RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \
 
 RUN --mount=type=cache,target=/var/cache/dnf,sharing=locked \
     --mount=type=cache,target=/var/cache/yum,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     dnf install -y \
         dnf-plugins-core \
         python3 \
         python3-devel \
         python3-pip \
     && \
-    python3 -m pip install --upgrade 'pip<21.0' && \
     dnf config-manager --set-enabled powertools && \
     rm -rf /tmp/*
 

plugin_builder.centos7.Dockerfile

@@ -19,21 +19,12 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
     && \
     rm -rf /tmp/*
 
-# python 2 and 3 must be installed separately because yum will ignore/discard python2
 RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     yum install -y \
         python3 \
         python3-devel \
         python3-pip \
     && \
-    yum install -y \
-        python \
-        python-devel \
-        python-pip \
-    && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 ENV python="python3"

plugin_builder.debian11.Dockerfile

@@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     apt-get update && \
     apt-get install --no-install-recommends -y \
         apt-utils \
@@ -38,7 +36,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         sudo \
         wget \
     && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 ENV python="python3"

plugin_builder.ubuntu18.Dockerfile

@@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     apt-get update && \
     apt-get install --no-install-recommends -y \
         apt-utils \
@@ -31,16 +29,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         gnupg \
         libxml2-dev \
         lsb-release \
-        python \
-        python-pip \
-        python-setuptools \
         python3 \
         python3-pip \
         python3-setuptools \
         sudo \
         wget \
     && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 ENV python="python3"

plugin_builder.ubuntu20.Dockerfile

@@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     apt-get update && \
     apt-get install --no-install-recommends -y \
         apt-utils \
@@ -38,7 +36,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         sudo \
         wget \
     && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 ENV python="python3"

plugin_builder.ubuntu22.Dockerfile

@@ -21,8 +21,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/root/.cache/pip,sharing=locked \
-    --mount=type=cache,target=/root/.cache/wheel,sharing=locked \
     apt-get update && \
     apt-get install --no-install-recommends -y \
         apt-utils \
@@ -38,7 +36,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         sudo \
         wget \
     && \
-    pip install --upgrade 'pip<21.0' && \
     rm -rf /tmp/*
 
 ENV python="python3"