From ec3be8bdfe8a78ca3af47e7168b8d491103813dd Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Tue, 22 Oct 2024 22:05:32 +0200 Subject: [PATCH] Use python 3.13 Signed-off-by: Christian Berendt --- Containerfile | 18 ++++++++++-------- requirements.ansible.txt | 2 -- requirements.openstack-flavor-manager.txt | 1 - requirements.openstack-image-manager.txt | 1 - 4 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 requirements.ansible.txt delete mode 100644 requirements.openstack-flavor-manager.txt delete mode 100644 requirements.openstack-image-manager.txt diff --git a/Containerfile b/Containerfile index 15222649..63cc3ba2 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -ARG PYTHON_VERSION=3.12.3 +ARG PYTHON_VERSION=3.13 FROM python:${PYTHON_VERSION}-slim AS builder COPY . /src @@ -22,9 +22,9 @@ apt-get install -y --no-install-recommends \ mkdir /wheels python3 -m pip --no-cache-dir install -U 'pip==24.2' python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.txt -python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.ansible.txt -python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.openstack-image-manager.txt -python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.openstack-flavor-manager.txt +python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels 'ansible-core==2.17.5' +python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels 'openstack-image-manager==0.20240906.0' +python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels 'openstack-flavor-manager==0.20240904.0' # install openstack-project-manager git clone --depth 1 https://github.com/osism/openstack-project-manager.git /openstack-project-manager @@ -67,14 +67,16 @@ apt-get install -y --no-install-recommends \ less \ openssh-client \ procps \ - tini + tini \ + build-essential \ + gcc # install python packages python3 -m pip --no-cache-dir install -U 'pip==24.2' python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.txt -python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.ansible.txt -python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.openstack-image-manager.txt -python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.openstack-flavor-manager.txt +python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels 'ansible-core==2.17.5' +python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels 'openstack-image-manager==0.20240906.0' +python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels 'openstack-flavor-manager==0.20240904.0' # install python-osism python3 -m pip --no-cache-dir install --no-index /src diff --git a/requirements.ansible.txt b/requirements.ansible.txt deleted file mode 100644 index 669e328c..00000000 --- a/requirements.ansible.txt +++ /dev/null @@ -1,2 +0,0 @@ -ansible-runner==2.4.0 -ansible-core==2.17.5 diff --git a/requirements.openstack-flavor-manager.txt b/requirements.openstack-flavor-manager.txt deleted file mode 100644 index f4b310f5..00000000 --- a/requirements.openstack-flavor-manager.txt +++ /dev/null @@ -1 +0,0 @@ -openstack-flavor-manager==0.20240904.0 diff --git a/requirements.openstack-image-manager.txt b/requirements.openstack-image-manager.txt deleted file mode 100644 index 9c86207f..00000000 --- a/requirements.openstack-image-manager.txt +++ /dev/null @@ -1 +0,0 @@ -openstack-image-manager==0.20240906.0