From 9994eb84b08aade98f8be850bdd72d6917c6ec38 Mon Sep 17 00:00:00 2001 From: Jonathan Perret Date: Fri, 27 Feb 2026 16:22:33 +0100 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20(python)=20upgrade=20to=20?= =?UTF-8?q?Python=203.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping base image to avoid reported vulnerabilities. --- .github/workflows/ci-tests.yml | 4 ++-- Dockerfile | 8 ++++++-- docker/oidc-test-client/Dockerfile | 2 +- src/satosa/pyproject.toml | 10 ++++------ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 8e81bf8..022ef6e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -69,7 +69,7 @@ jobs: - name: Install Python uses: actions/setup-python@v3 with: - python-version: '3.11' + python-version: '3.14' - name: Install development dependencies run: | # Python's xmlsec requirement @@ -93,7 +93,7 @@ jobs: - name: Install Python uses: actions/setup-python@v3 with: - python-version: '3.11' + python-version: '3.14' - name: Install development dependencies run: | # Python's xmlsec requirement diff --git a/Dockerfile b/Dockerfile index dba7d2f..987b3d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,17 @@ # ---- base image to inherit from ---- -FROM python:3.11.12-slim-bookworm AS common +FROM python:3.14.3-slim-trixie AS common # Install xmlsec1 dependencies required for xmlsec (for SAML) # Needs to be kept before the `pip install` -RUN apt-get update && \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ apt-get -y upgrade && \ apt-get install -qy --no-install-recommends xmlsec1 && \ rm -rf /var/lib/apt/lists/* +# Silence pip warnings about running as root in a container +ENV PIP_ROOT_USER_ACTION=ignore + # We want the most up-to-date stable pip release RUN pip install --upgrade pip diff --git a/docker/oidc-test-client/Dockerfile b/docker/oidc-test-client/Dockerfile index 6a4b619..71b9360 100644 --- a/docker/oidc-test-client/Dockerfile +++ b/docker/oidc-test-client/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11 +FROM python:3.14 COPY . /app diff --git a/src/satosa/pyproject.toml b/src/satosa/pyproject.toml index 593c0a0..467330e 100644 --- a/src/satosa/pyproject.toml +++ b/src/satosa/pyproject.toml @@ -11,13 +11,14 @@ version = "0.1.0" authors = [{ "name" = "DINUM", "email" = "dev@mail.numerique.gouv.fr" }] classifiers = [ "Development Status :: 5 - Production/Stable", - "Intended Audience :: Developers", + "Intended Audience :: End Users/Desktop", + "Intended Audience :: System Administrators", "License :: OSI Approved :: MIT License", "Natural Language :: English", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.14", ] -description = "An application to handle contacts and teams." +description = "A gateway from RENATER's FER to ProConnect's OIDC provider, built on top of SATOSA." keywords = ["OIDC", "SAML", "Shibboleth", "FER", "RENATER"] license = { file = "LICENSE" } readme = "README.md" @@ -49,9 +50,6 @@ dev = [ packages = { find = { where = ["."], exclude = ["tests"] } } zip-safe = true -[tool.distutils.bdist_wheel] -universal = true - [tool.ruff] exclude = [ ".git",