diff --git a/api/Dockerfile b/api/Dockerfile index a0961566f..56b45456a 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,6 +1,6 @@ # WARNING: Update taskcluster/docker/k8s-image/Dockerfile file when you update # this one. Or better, find a way to use the same Dockerfile -FROM python:3.9 +FROM python:3.12 RUN groupadd --gid 10001 app && \ useradd -g app --uid 10001 --shell /usr/sbin/nologin --create-home --home-dir /app app diff --git a/api/Dockerfile.public b/api/Dockerfile.public index 9c1e7db60..2a67afdfe 100644 --- a/api/Dockerfile.public +++ b/api/Dockerfile.public @@ -1,6 +1,6 @@ # WARNING: Update taskcluster/docker/k8s-image/Dockerfile file when you update # this one. Or better, find a way to use the same Dockerfile -FROM python:3.9 +FROM python:3.12 RUN groupadd --gid 10001 app && \ useradd -g app --uid 10001 --shell /usr/sbin/nologin --create-home --home-dir /app app diff --git a/api/tox.ini b/api/tox.ini index 86e486df3..95f297dc0 100644 --- a/api/tox.ini +++ b/api/tox.ini @@ -7,8 +7,8 @@ passenv = PYTHON_VERSION TOXENV setenv = - PYTHON_VERSION=3.9.18 - TOXENV=check,py39 + PYTHON_VERSION=3.12.8 + TOXENV=check,py312 deps = usedevelop = false depends = @@ -46,7 +46,7 @@ passenv = COVERAGE_REPORT_COMMAND commands = poetry install --only test poetry run {env:COVERAGE_REPORT_COMMAND:coverage report} -depends = py39 +depends = py312 parallel_show_output = true [testenv:check] diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml index 5c1af9699..3ec50319c 100644 --- a/taskcluster/kinds/docker-image/kind.yml +++ b/taskcluster/kinds/docker-image/kind.yml @@ -11,10 +11,10 @@ transforms: - taskgraph.transforms.task:transforms tasks: - python39: + python312: definition: python args: - PYTHON_VERSION: "3.9.13" + PYTHON_VERSION: "3.12.8" node14: definition: node args: diff --git a/taskcluster/kinds/k8s-image/kind.yml b/taskcluster/kinds/k8s-image/kind.yml index 01d689fe2..d60d0386a 100644 --- a/taskcluster/kinds/k8s-image/kind.yml +++ b/taskcluster/kinds/k8s-image/kind.yml @@ -15,7 +15,7 @@ tasks: shipit-admin: definition: shipit args: - PYTHON_VERSION: "3.9" + PYTHON_VERSION: "3.12" APP_TYPE: admin # Use plain text "" instead of using {"task-reference": # ""}, because the docker_image transform expects args to be @@ -25,7 +25,7 @@ tasks: shipit-public: definition: shipit args: - PYTHON_VERSION: "3.9" + PYTHON_VERSION: "3.12" APP_TYPE: public # Use plain text "" instead of using {"task-reference": # ""}, because the docker_image transform expects args to be diff --git a/taskcluster/kinds/tests/kind.yml b/taskcluster/kinds/tests/kind.yml index ea5197605..c67730bbb 100644 --- a/taskcluster/kinds/tests/kind.yml +++ b/taskcluster/kinds/tests/kind.yml @@ -28,7 +28,7 @@ tasks: api-python: description: "{name} tox-py{substitute_version}" substitute-versions: - - 39 + - 312 attributes: artifact_prefix: public worker: @@ -45,7 +45,7 @@ tasks: command: - sh - -lxce - # --no-ansi is needed due to https://github.com/python-oetry/poetry/issues/7148 + # --no-ansi is needed due to https://github.com/python-poetry/poetry/issues/7148 - >- cd api && poetry install --only tox --no-root --no-ansi && poetry run tox --parallel -e clean,check,py{substitute_version},report frontend-node: