From 1d9f35816416ce5410b5a05ce8200602a37ec99d Mon Sep 17 00:00:00 2001 From: Dmitry Kovalenko Date: Thu, 18 Jun 2026 00:10:08 +0300 Subject: [PATCH 1/2] CI: Python 3.7.3 (4, 5) is added. Testgres supports py3.7.3+. --- .github/workflows/package-verification.yml | 6 ++++++ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/package-verification.yml b/.github/workflows/package-verification.yml index bc00815..ac337f3 100644 --- a/.github/workflows/package-verification.yml +++ b/.github/workflows/package-verification.yml @@ -75,6 +75,12 @@ jobs: fail-fast: false matrix: include: + - platform: "alpine" + python: "3.7.3" + - platform: "alpine" + python: "3.7.4" + - platform: "alpine" + python: "3.7.5" - platform: "alpine" python: "3.7" - platform: "alpine" diff --git a/pyproject.toml b/pyproject.toml index 604a88a..b763c56 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ keywords = [ "test", ] -requires-python = ">=3.7.17" +requires-python = ">=3.7.3" classifiers = [ "Intended Audience :: Developers", From 7395ba5932253599bc5b939e2717296ef90afae3 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalenko Date: Thu, 18 Jun 2026 00:25:07 +0300 Subject: [PATCH 2/2] CI: astralinux_1_7 is added --- .github/workflows/package-verification.yml | 2 ++ Dockerfile--alpine.tmpl | 4 ++- Dockerfile--astralinux_1_7.tmpl | 29 ++++++++++++++++++++++ run_tests3.sh | 2 +- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 Dockerfile--astralinux_1_7.tmpl diff --git a/.github/workflows/package-verification.yml b/.github/workflows/package-verification.yml index ac337f3..494a499 100644 --- a/.github/workflows/package-verification.yml +++ b/.github/workflows/package-verification.yml @@ -99,6 +99,8 @@ jobs: python: "3.13" - platform: "alpine" python: "3.14" + - platform: "astralinux_1_7" + python: "3" env: BASE_SIGN: "${{ matrix.platform }}-py${{ matrix.python }}" diff --git a/Dockerfile--alpine.tmpl b/Dockerfile--alpine.tmpl index 081a856..7593cec 100644 --- a/Dockerfile--alpine.tmpl +++ b/Dockerfile--alpine.tmpl @@ -1,8 +1,10 @@ -ARG PYTHON_VERSION +ARG PYTHON_VERSION=3.12 # --------------------------------------------- base1 FROM python:${PYTHON_VERSION}-alpine AS base1 +ENV PYTHON_BINARY=python3 + # --------------------------------------------- final FROM base1 AS final diff --git a/Dockerfile--astralinux_1_7.tmpl b/Dockerfile--astralinux_1_7.tmpl new file mode 100644 index 0000000..f1db1e3 --- /dev/null +++ b/Dockerfile--astralinux_1_7.tmpl @@ -0,0 +1,29 @@ +ARG PG_VERSION=17 +ARG PYTHON_VERSION=3 + +# --------------------------------------------- base1 +FROM packpack/packpack:astra-1.7 AS base1 + +# --------------------------------------------- base2_with_python-3 +FROM base1 AS base2_with_python-3 +RUN apt install -y python3 python3-dev python3-venv + +ENV PYTHON_BINARY=python3 + +# --------------------------------------------- final +FROM base2_with_python-${PYTHON_VERSION} AS final + +RUN useradd -m test + +ADD --chown=test:test . /home/test/testgres +WORKDIR /home/test/testgres +RUN mkdir /home/test/testgres/logs +RUN chown -R test:test /home/test/testgres/logs + +ENV LANG=C.UTF-8 + +USER test + +ENTRYPOINT sh -c " \ +set -eux; \ +bash run_tests3.sh;" diff --git a/run_tests3.sh b/run_tests3.sh index 5f3f639..03082a6 100755 --- a/run_tests3.sh +++ b/run_tests3.sh @@ -7,7 +7,7 @@ set -eux # prepare python environment VENV_PATH="/tmp/testgres_venv" rm -rf $VENV_PATH -python -m venv "${VENV_PATH}" +${PYTHON_BINARY} -m venv "${VENV_PATH}" export VIRTUAL_ENV_DISABLE_PROMPT=1 source "${VENV_PATH}/bin/activate"