Poetry test

opendatahub-io · Jun 25, 2024 · d3a335f · d3a335f
1 parent 8461fce
commit d3a335f
Show file tree

Hide file tree

Showing 167 changed files with 176,439 additions and 112,676 deletions.
diff --git a/base/c9s-python-3.9/.python-version b/base/c9s-python-3.9/.python-version
@@ -0,0 +1 @@
+3.9
diff --git a/base/c9s-python-3.9/Dockerfile b/base/c9s-python-3.9/Dockerfile
@@ -15,8 +15,8 @@ WORKDIR /opt/app-root/bin
 # Install micropipenv to deploy packages from Pipfile.lock
 RUN pip install --no-cache-dir -U "micropipenv[toml]"
 
-# Install Python dependencies from Pipfile.lock file
-COPY Pipfile.lock ./
+# Install Python dependencies from pyproject.toml and poetry.lock file
+COPY pyproject.toml poetry.lock ./
 
 # OS Packages needs to be installed as root
 USER root
@@ -27,7 +27,7 @@ RUN dnf install -y mesa-libGL && dnf clean all && rm -rf /var/cache/yum
 # Other apps and tools installed as default user
 USER 1001
 
-RUN echo "Installing softwares and packages" && micropipenv install && rm -f ./Pipfile.lock && \
+RUN echo "Installing softwares and packages" && micropipenv install --method poetry && rm -f ./pyproject.toml ./poetry.lock && \
     # Install the oc client \
     curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz \
         -o /tmp/openshift-client-linux.tar.gz && \

diff --git a/base/c9s-python-3.9/Pipfile b/base/c9s-python-3.9/Pipfile
diff --git a/base/c9s-python-3.9/Pipfile.lock b/base/c9s-python-3.9/Pipfile.lock
diff --git a/base/c9s-python-3.9/poetry.lock b/base/c9s-python-3.9/poetry.lock
diff --git a/base/c9s-python-3.9/pyproject.toml b/base/c9s-python-3.9/pyproject.toml
@@ -0,0 +1,15 @@
+[tool.poetry]
+package-mode = false
+
+[tool.poetry.dependencies]
+python = ">=3.9.0,<3.10.0"
+wheel = "~=0.43.0"
+setuptools = "~=69.2.0"
+
+
+[tool.poetry.group.dev.dependencies]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
diff --git a/base/ubi8-python-3.8/.python-version b/base/ubi8-python-3.8/.python-version
@@ -0,0 +1 @@
+3.8
diff --git a/base/ubi8-python-3.8/Dockerfile b/base/ubi8-python-3.8/Dockerfile
@@ -15,10 +15,10 @@ WORKDIR /opt/app-root/bin
 # Install micropipenv to deploy packages from Pipfile.lock
 RUN pip install --no-cache-dir -U "micropipenv[toml]"
 
-# Install Python dependencies from Pipfile.lock file
-COPY Pipfile.lock ./
+# Install Python dependencies from pyproject.toml and poetry.lock file
+COPY pyproject.toml poetry.lock ./
 
-RUN echo "Installing softwares and packages" && micropipenv install && rm -f ./Pipfile.lock
+RUN echo "Installing softwares and packages" && micropipenv install --method poetry && rm -f ./pyproject.toml ./poetry.lock
 
 # OS Packages needs to be installed as root
 USER root

diff --git a/base/ubi8-python-3.8/Pipfile b/base/ubi8-python-3.8/Pipfile
diff --git a/base/ubi8-python-3.8/Pipfile.lock b/base/ubi8-python-3.8/Pipfile.lock
diff --git a/base/ubi8-python-3.8/poetry.lock b/base/ubi8-python-3.8/poetry.lock
diff --git a/base/ubi8-python-3.8/pyproject.toml b/base/ubi8-python-3.8/pyproject.toml
@@ -0,0 +1,15 @@
+[tool.poetry]
+package-mode = false
+
+[tool.poetry.dependencies]
+python = ">=3.8.0,<3.9.0"
+wheel = "~=0.43.0"
+setuptools = "~=69.2.0"
+
+
+[tool.poetry.group.dev.dependencies]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
diff --git a/base/ubi9-python-3.9/.python-version b/base/ubi9-python-3.9/.python-version
@@ -0,0 +1 @@
+3.9
diff --git a/base/ubi9-python-3.9/Dockerfile b/base/ubi9-python-3.9/Dockerfile
@@ -15,10 +15,10 @@ WORKDIR /opt/app-root/bin
 # Install micropipenv to deploy packages from Pipfile.lock
 RUN pip install --no-cache-dir -U "micropipenv[toml]"
 
-# Install Python dependencies from Pipfile.lock file
-COPY Pipfile.lock ./
+# Install Python dependencies from pyproject.toml and poetry.lock file
+COPY pyproject.toml poetry.lock ./
 
-RUN echo "Installing softwares and packages" && micropipenv install && rm -f ./Pipfile.lock
+RUN echo "Installing softwares and packages" && micropipenv install --method poetry && rm -f ./pyproject.toml ./poetry.lock
 
 # OS Packages needs to be installed as root
 USER root

diff --git a/base/ubi9-python-3.9/Pipfile b/base/ubi9-python-3.9/Pipfile
diff --git a/base/ubi9-python-3.9/Pipfile.lock b/base/ubi9-python-3.9/Pipfile.lock
diff --git a/base/ubi9-python-3.9/poetry.lock b/base/ubi9-python-3.9/poetry.lock
diff --git a/base/ubi9-python-3.9/pyproject.toml b/base/ubi9-python-3.9/pyproject.toml
@@ -0,0 +1,15 @@
+[tool.poetry]
+package-mode = false
+
+[tool.poetry.dependencies]
+python = ">=3.9.0,<3.10.0"
+wheel = "~=0.43.0"
+setuptools = "~=69.2.0"
+
+
+[tool.poetry.group.dev.dependencies]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
diff --git a/codeserver/ubi9-python-3.9/.python-version b/codeserver/ubi9-python-3.9/.python-version
@@ -0,0 +1 @@
+3.9
diff --git a/codeserver/ubi9-python-3.9/Dockerfile b/codeserver/ubi9-python-3.9/Dockerfile
@@ -17,13 +17,13 @@ USER 0
 
 WORKDIR /opt/app-root/bin
 
-# Install usefull packages from Pipfile.lock
-COPY Pipfile.lock ./
+# Install usefull packages from pyproject.toml and poetry.lock
+COPY pyproject.toml poetry.lock ./
 
 # Install packages and cleanup
 RUN echo "Installing softwares and packages" && \
-    micropipenv install && \
-    rm -f ./Pipfile.lock && \
+    micropipenv install --method poetry && \
+    rm -f ./pyproject.toml ./poetry.lock && \
     # Fix permissions to support pip in Openshift environments \
     chmod -R g+w /opt/app-root/lib/python3.9/site-packages && \
     fix-permissions /opt/app-root -P