Distgen generated content

sclorg · Sep 9, 2024 · ffd3b11 · ffd3b11
1 parent b9929ad
commit ffd3b11
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 68 deletions.
diff --git a/3.11-minimal/Dockerfile.c9s b/3.11-minimal/Dockerfile.c9s
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.11 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.11-minimal/Dockerfile.fedora b/3.11-minimal/Dockerfile.fedora
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.11 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.11-minimal/Dockerfile.rhel8 b/3.11-minimal/Dockerfile.rhel8
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.11 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.11/Dockerfile.c9s b/3.11/Dockerfile.c9s
@@ -65,9 +65,8 @@ COPY 3.11/root/opt/wheels /opt/wheels
 #   under random UID.
 RUN python3.11 -m venv ${APP_ROOT} && \
 # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-# We have to upgrade pip to a newer verison because: \
-# * pip < 9 does not support different packages' versions for Python 2/3 \
-# * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+# We have to upgrade pip to a newer verison because \
+# pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
 #   support platforms like ppc64le, aarch64 or armv7 \
 # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
 # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.11/Dockerfile.fedora b/3.11/Dockerfile.fedora
@@ -64,9 +64,8 @@ COPY 3.11/root/opt/wheels /opt/wheels
 #   under random UID.
 RUN python3.11 -m venv ${APP_ROOT} && \
 # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-# We have to upgrade pip to a newer verison because: \
-# * pip < 9 does not support different packages' versions for Python 2/3 \
-# * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+# We have to upgrade pip to a newer verison because \
+# pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
 #   support platforms like ppc64le, aarch64 or armv7 \
 # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
 # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.11/Dockerfile.rhel8 b/3.11/Dockerfile.rhel8
@@ -70,9 +70,8 @@ COPY 3.11/root/opt/wheels /opt/wheels
 RUN \
     python3.11 -m venv ${APP_ROOT} && \
     # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer verison because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.11/Dockerfile.rhel9 b/3.11/Dockerfile.rhel9
@@ -69,9 +69,8 @@ COPY 3.11/root/opt/wheels /opt/wheels
 RUN \
     python3.11 -m venv ${APP_ROOT} && \
     # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer verison because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12-minimal/Dockerfile.c9s b/3.12-minimal/Dockerfile.c9s
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.12 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12-minimal/Dockerfile.fedora b/3.12-minimal/Dockerfile.fedora
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.12 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12-minimal/Dockerfile.rhel8 b/3.12-minimal/Dockerfile.rhel8
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.12 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12/Dockerfile.c9s b/3.12/Dockerfile.c9s
@@ -65,9 +65,8 @@ COPY 3.12/root/opt/wheels /opt/wheels
 #   under random UID.
 RUN python3.12 -m venv ${APP_ROOT} && \
 # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-# We have to upgrade pip to a newer verison because: \
-# * pip < 9 does not support different packages' versions for Python 2/3 \
-# * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+# We have to upgrade pip to a newer verison because \
+# pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
 #   support platforms like ppc64le, aarch64 or armv7 \
 # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
 # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12/Dockerfile.fedora b/3.12/Dockerfile.fedora
@@ -64,9 +64,8 @@ COPY 3.12/root/opt/wheels /opt/wheels
 #   under random UID.
 RUN python3.12 -m venv ${APP_ROOT} && \
 # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-# We have to upgrade pip to a newer verison because: \
-# * pip < 9 does not support different packages' versions for Python 2/3 \
-# * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+# We have to upgrade pip to a newer verison because \
+# pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
 #   support platforms like ppc64le, aarch64 or armv7 \
 # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
 # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12/Dockerfile.rhel8 b/3.12/Dockerfile.rhel8
@@ -70,9 +70,8 @@ COPY 3.12/root/opt/wheels /opt/wheels
 RUN \
     python3.12 -m venv ${APP_ROOT} && \
     # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer verison because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.12/Dockerfile.rhel9 b/3.12/Dockerfile.rhel9
@@ -69,9 +69,8 @@ COPY 3.12/root/opt/wheels /opt/wheels
 RUN \
     python3.12 -m venv ${APP_ROOT} && \
     # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer verison because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.6/s2i/bin/assemble b/3.6/s2i/bin/assemble
@@ -58,9 +58,8 @@ mv /tmp/src/* "$HOME"
 fix-permissions /opt/app-root -P
 
 # Python <3.7 only code, Python 3.7+ uses bundled wheel from Fedora
-# We have to first upgrade pip to at least 19.3 because:
-# * pip < 9 does not support different packages' versions for Python 2/3
-# * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels
+# We have to first upgrade pip to at least 19.3 because
+# pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels
 #   support platforms like ppc64le, aarch64 or armv7
 echo "---> Upgrading pip to latest version supported for Python $PYTHON_VERSION ..."
 if ! pip install -U "pip"; then

diff --git a/3.9-minimal/Dockerfile.c9s b/3.9-minimal/Dockerfile.c9s
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.9 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.9-minimal/Dockerfile.rhel8 b/3.9-minimal/Dockerfile.rhel8
@@ -89,10 +89,8 @@ WORKDIR ${HOME}
 #   under random UID.
 RUN \
     python3.9 -m venv ${APP_ROOT} && \
-    # Python 3 only code, Python 2 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer version because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.9/Dockerfile.c9s b/3.9/Dockerfile.c9s
@@ -65,9 +65,8 @@ COPY 3.9/root/opt/wheels /opt/wheels
 #   under random UID.
 RUN python3.9 -m venv ${APP_ROOT} && \
 # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-# We have to upgrade pip to a newer verison because: \
-# * pip < 9 does not support different packages' versions for Python 2/3 \
-# * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+# We have to upgrade pip to a newer verison because \
+# pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
 #   support platforms like ppc64le, aarch64 or armv7 \
 # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
 # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.9/Dockerfile.rhel8 b/3.9/Dockerfile.rhel8
@@ -70,9 +70,8 @@ COPY 3.9/root/opt/wheels /opt/wheels
 RUN \
     python3.9 -m venv ${APP_ROOT} && \
     # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer verison because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \

diff --git a/3.9/Dockerfile.rhel9 b/3.9/Dockerfile.rhel9
@@ -69,9 +69,8 @@ COPY 3.9/root/opt/wheels /opt/wheels
 RUN \
     python3.9 -m venv ${APP_ROOT} && \
     # Python 3.7+ only code, Python <3.7 installs pip from PyPI in the assemble script. \
-    # We have to upgrade pip to a newer verison because: \
-    # * pip < 9 does not support different packages' versions for Python 2/3 \
-    # * pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
+    # We have to upgrade pip to a newer verison because \
+    # pip < 19.3 does not support manylinux2014 wheels. Only manylinux2014 (and later) wheels \
     #   support platforms like ppc64le, aarch64 or armv7 \
     # We are newly using wheel from one of the latest stable Fedora releases (from RPM python-pip-wheel) \
     # because it's tested better then whatever version from PyPI and contains useful patches. \