From 6946766b4f648464b94d2f1ad61f27274c298d92 Mon Sep 17 00:00:00 2001 From: Lev Gorodetskiy Date: Mon, 15 Sep 2025 22:44:20 -0300 Subject: [PATCH] Update base docker image to alpine3.22 --- .bumpversion.cfg | 17 ----------------- README.md | 4 ++-- michelson-kernel.dockerfile | 7 ++++--- pyproject.toml | 5 ++--- pytezos.dockerfile | 7 ++++--- 5 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 .bumpversion.cfg diff --git a/.bumpversion.cfg b/.bumpversion.cfg deleted file mode 100644 index 43aa6075..00000000 --- a/.bumpversion.cfg +++ /dev/null @@ -1,17 +0,0 @@ -[bumpversion] -current_version = 3.12.0 -commit = True -tag = True -tag_name = {new_version} - -[bumpversion:file:pyproject.toml] -search = version = "{current_version}" -replace = version = "{new_version}" - -[bumpversion:file:src/pytezos/__init__.py] -search = __version__ = '{current_version}' -replace = __version__ = '{new_version}' - -[bumpversion:file:src/michelson_kernel/__init__.py] -search = __version__ = '{current_version}' -replace = __version__ = '{new_version}' diff --git a/README.md b/README.md index 1ac54801..4484c7f6 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ ## Installation -Make sure you have Python 3.8 to 3.12 installed and set as default in the system. +Make sure you have Python 3.9 to 3.13 installed and set as default in the system. You also need to install cryptographic packages before installing the library/building the project: @@ -129,7 +129,7 @@ $ docker-compose up -d notebook Requirements: -* Python 3.8 to 3.12 +* Python 3.9 to 3.13 * libsodium, coincurve, gmp * make diff --git a/michelson-kernel.dockerfile b/michelson-kernel.dockerfile index 5175f5b2..9601058c 100644 --- a/michelson-kernel.dockerfile +++ b/michelson-kernel.dockerfile @@ -1,4 +1,5 @@ -FROM python:3.12-alpine3.17 AS compile-image +FROM python:3.12-alpine3.22 AS compile-image +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ RUN apk add --update --no-cache \ build-base \ libtool \ @@ -20,9 +21,9 @@ ENV PYTHON_PATH="/opt/pytezos/src:$PATH" COPY pyproject.toml requirements.txt README.md /opt/pytezos/ -RUN /usr/local/bin/pip install --prefix /opt/pytezos --no-cache-dir --disable-pip-version-check --no-deps -r /opt/pytezos/requirements.txt -e . +RUN uv pip install --prefix /opt/pytezos --no-cache-dir --disable-pip-version-check --no-deps -r /opt/pytezos/requirements.txt -e . -FROM python:3.12-alpine3.17 AS build-image +FROM python:3.12-alpine3.22 AS build-image RUN apk add --update --no-cache \ binutils \ gmp-dev \ diff --git a/pyproject.toml b/pyproject.toml index bd08e7db..dedad664 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,8 +11,7 @@ authors = [ "Roman Serikov", ] maintainers = [ - "Lev Gorodetskii ", - "Igor Sereda ", + "Baking Bad team ", ] readme = "README.md" repository = "https://github.com/baking-bad/pytezos" @@ -101,7 +100,7 @@ force_single_line = true [tool.black] line-length = 120 -target-version = ['py39', 'py310', 'py311', 'py312'] +target-version = ['py39', 'py310', 'py311', 'py312', 'py313'] skip-string-normalization = true [tool.ruff] diff --git a/pytezos.dockerfile b/pytezos.dockerfile index aa8a9b5e..b1f61853 100644 --- a/pytezos.dockerfile +++ b/pytezos.dockerfile @@ -1,4 +1,5 @@ -FROM python:3.12-alpine3.17 AS compile-image +FROM python:3.12-alpine3.22 AS compile-image +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ RUN apk add --update --no-cache \ build-base \ libtool \ @@ -20,9 +21,9 @@ ENV PYTHON_PATH="/opt/pytezos/src:$PATH" COPY pyproject.toml requirements.slim.txt README.md /opt/pytezos/ -RUN /usr/local/bin/pip install --prefix /opt/pytezos --no-cache-dir --disable-pip-version-check --no-deps -r /opt/pytezos/requirements.slim.txt -e . +RUN uv pip install --prefix /opt/pytezos --no-cache-dir --disable-pip-version-check --no-deps -r /opt/pytezos/requirements.slim.txt -e . -FROM python:3.12-alpine3.17 AS build-image +FROM python:3.12-alpine3.22 AS build-image RUN apk add --update --no-cache \ binutils \ gmp-dev \