From afa8e93495c276d418d78cd8cb359c55b85dd690 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Sat, 24 May 2025 14:21:28 +0200 Subject: [PATCH] Fix Dockerfile and Python version --- Dockerfile | 3 ++- poetry.lock | 25 +++++++++++++++++++++++-- pyproject.toml | 2 +- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3441ec8..2faf042 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ FROM docker.io/library/debian:12-slim AS builder RUN apt-get update && \ - apt-get install --no-install-suggests --no-install-recommends --yes pipx + apt-get install --no-install-suggests --no-install-recommends --yes python3 pipx ENV PATH="/root/.local/bin:${PATH}" RUN pipx install poetry RUN pipx inject poetry poetry-plugin-bundle WORKDIR /src COPY . . +RUN ln -s /usr/bin/python3 /usr/bin/python RUN poetry bundle venv --python=/usr/bin/python3 --only=main /venv FROM gcr.io/distroless/python3-debian12 diff --git a/poetry.lock b/poetry.lock index 35d2ad4..6004cd3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -25,8 +25,10 @@ files = [ ] [package.dependencies] +exceptiongroup = {version = ">=1.0.2", markers = "python_version < \"3.11\""} idna = ">=2.8" sniffio = ">=1.1" +typing_extensions = {version = ">=4.5", markers = "python_version < \"3.13\""} [package.extras] doc = ["Sphinx (>=8.2,<9.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx_rtd_theme"] @@ -404,6 +406,25 @@ files = [ [package.dependencies] packaging = "*" +[[package]] +name = "exceptiongroup" +version = "1.3.0" +description = "Backport of PEP 654 (exception groups)" +optional = false +python-versions = ">=3.7" +groups = ["main"] +markers = "python_version < \"3.11\"" +files = [ + {file = "exceptiongroup-1.3.0-py3-none-any.whl", hash = "sha256:4d111e6e0c13d0644cad6ddaa7ed0261a0b36971f6d23e7ec9b4b9097da78a10"}, + {file = "exceptiongroup-1.3.0.tar.gz", hash = "sha256:b241f5885f560bc56a59ee63ca4c6a8bfa46ae4ad651af316d4e81817bb9fd88"}, +] + +[package.dependencies] +typing-extensions = {version = ">=4.6.0", markers = "python_version < \"3.13\""} + +[package.extras] +test = ["pytest (>=6)"] + [[package]] name = "gevent" version = "25.5.1" @@ -970,5 +991,5 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"] [metadata] lock-version = "2.1" -python-versions = ">=3.13,<4.0" -content-hash = "1cd04a86b43b8f694998f367e70ff2b73fc51ebb0eb44eb4f05ca811d96fbc44" +python-versions = ">=3.10,<4.0" +content-hash = "9627c61073856a113d4be1bb089450044a1be720e2959e77f677231a74ee6421" diff --git a/pyproject.toml b/pyproject.toml index db90869..c3b1a27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ authors = [ ] license = {text = "Apache-2.0"} readme = "README.md" -requires-python = ">=3.13,<4.0" +requires-python = ">=3.10,<4.0" dependencies = [ "bottle-websocket (>=0.2.9,<0.3.0)", "bottleoidc (>=21.8.30,<22.0.0)",