Support Ubuntu Resolute 26.04

.github/workflows/dependencies.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        python-version: ['3.10']
+        python-version: ['3.12']
 
     permissions:
       contents: write

.github/workflows/doc.yml

@@ -28,7 +28,7 @@ jobs:
       - uses: astral-sh/setup-uv@v7
         with:
             version: "latest"
-            python-version: "3.10"
+            python-version: "3.12"
             enable-cache: true
             cache-suffix: "sphinx"
             activate-environment: true

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: astral-sh/setup-uv@v7
         with:
             version: "latest"
-            python-version: "3.10"
+            python-version: "3.12"
             enable-cache: true
             cache-suffix: "ruff"
             activate-environment: true

.github/workflows/test.yml

@@ -53,7 +53,7 @@ jobs:
 
     strategy:
       matrix:
-        os: ['focal-3.10', 'jammy-3.10', 'noble-3.12']
+        os: ['noble-3.12', 'resolute-3.13']
         tests-env: ['tests', 'tests_nds']
 
     env:
@@ -107,18 +107,12 @@ jobs:
            libxml2-dev \
            libxslt-dev \
            libpangocairo-1.0-0 \
-           libgdk-pixbuf2.0-dev \
+           libgdk-pixbuf*2.0-dev \
            libffi-dev \
            libvips
         apt-get install -y --no-install-recommends postgis
 
-    - name: Install python venv for focal
-      if: ${{ matrix.os == 'focal-3.10'}}
-      run: |
-          uv venv -p python3.10 venv
-
     - name: Install python venv
-      if: ${{ matrix.os != 'focal-3.10'}}
       run: |
           uv venv venv
 
@@ -166,7 +160,7 @@ jobs:
     needs: [ test ]
     strategy:
       matrix:
-        os: ['focal-3.10', 'jammy-3.10', 'noble-3.12']
+        os: ['noble-3.12', 'resolute-3.13']
         tests-env: ['tests', 'tests_nds']
 
     env:
@@ -217,14 +211,12 @@ jobs:
       runs-on: ubuntu-latest
       strategy:
           matrix:
-              os: ['focal', 'jammy', 'noble']
+              os: ['noble', 'resolute']
               include:
-                  - os: 'focal'
-                    code: '20.04'
-                  - os: 'jammy'
-                    code: '22.04'
                   - os: 'noble'
                     code: '24.04'
+                  - os: 'resolute'
+                    code: '26.04'
 
       env:
           OS: ${{ matrix.os }}
@@ -338,12 +330,13 @@ jobs:
     needs: [ build_deb ]
     strategy:
       matrix:
-          os: ['jammy', 'noble']
+          os: ['noble', 'resolute']
           include:
-              - os: 'jammy'
-                code: '22.04'
+
               - os: 'noble'
                 code: '24.04'
+              - os: 'resolute'
+                code: '26.04'
     env:
       CYPRESS_BASE_URL: http://geotrek.local
       CYPRESS_CACHE_FOLDER: ~/cypress/cache
@@ -429,23 +422,17 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Download 20.04 debian artifact
-        uses: actions/download-artifact@v7
-        if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
-        with:
-          name: focal
-
-      - name: Download 22.04 debian artifact
+      - name: Download 24.04 debian artifact
         if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
         uses: actions/download-artifact@v7
         with:
-          name: jammy
+          name: noble
 
-      - name: Download 24.04 debian artifact
+      - name: Download 26.04 debian artifact
         if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
         uses: actions/download-artifact@v7
         with:
-          name: noble
+          name: resolute
 
       - name: Download docker image
         uses: ishworkh/[email protected]
@@ -505,13 +492,11 @@ jobs:
           echo "${{ github.ref }} : Publishing as $DEB_COMPONENT package"
           scp -P ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no /home/runner/work/Geotrek-admin/Geotrek-admin/geotrek-admin_*_amd64.deb ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:/srv/packages/incoming/$DEB_COMPONENT/
           if [[ "${{ github.ref }}" == *"dev"* ]]; then
-            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make focal_dev -C /srv/packages
-            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make jammy_dev -C /srv/packages
             ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make noble_dev -C /srv/packages
+            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make resolute_dev -C /srv/packages
           else
-            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make focal_main -C /srv/packages
-            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make jammy_main -C /srv/packages
             ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make noble_main -C /srv/packages
+            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make resolute_main -C /srv/packages
           fi
 
       - name: Attach debian packages as release binaries

.readthedocs.yaml

@@ -6,9 +6,9 @@ version: 2
 
 # Set the OS, Python version and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.11"
+    python: "3.12"
     # You can also specify other tool versions:
     # nodejs: "20"
     # rust: "1.70"

debian/control

@@ -11,9 +11,9 @@ Build-Depends:
  dh-virtualenv (>= 1.0),
  git,
  python3-django,
- python3.10 | python3.12,
- python3.10-venv | python3.12-venv,
- python3.10-dev | python3.12-dev,
+ python3.12 | python3.13,
+ python3.12-venv | python3.13-venv,
+ python3.12-dev | python3.13-dev,
  libgdal-dev (>= 2.2),
  libffi-dev (>= 3),
  libxml2-dev (>= 2.9.2),
@@ -38,6 +38,6 @@ Depends:
  screamshotter (>= 2.0.9),
  screamshotter (<< 3.0.0),
  convertit,
- python3.10 | python3.12,
+ python3.12 | python3.13,
  libvips
 Description: Manage and promote your trails and tourist content and activities.

debian/rules

@@ -9,7 +9,7 @@ export DH_UPGRADE_SETUPTOOLS
 
 override_dh_virtualenv:
 	dh_virtualenv \
-	--python /usr/bin/python3.10 \
+	--python /usr/bin/python3.12 \
 	--upgrade-pip \
 	--preinstall wheel \
 	--preinstall django \

docker-compose.yml

@@ -6,8 +6,8 @@ x-images:
       dockerfile: ./docker/Dockerfile
       target: dev
       args:
-        BASE_IMAGE: ${DEV_BASE_IMAGE:-ubuntu:jammy}
-        PYTHON_VERSION: ${DEV_PYTHON_VERSION:-3.10}
+        BASE_IMAGE: ${DEV_BASE_IMAGE:-ubuntu:noble}
+        PYTHON_VERSION: ${DEV_PYTHON_VERSION:-3.12}
     user: ${UID:-1000}:${GID:-1000}
     env_file:
       - .env

docker/Dockerfile

@@ -1,5 +1,5 @@
-ARG BASE_IMAGE=ubuntu:noble
-ARG PYTHON_VERSION=3.12
+ARG BASE_IMAGE=ubuntu:resolute
+ARG PYTHON_VERSION=3.13
 
 FROM ${BASE_IMAGE} AS base
 
@@ -63,7 +63,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
         libxml2-dev \
         libxslt-dev \
         libpangocairo-1.0-0 \
-        libgdk-pixbuf2.0-dev \
+        libgdk-pixbuf*2.0-dev \
         libffi-dev \
         fonts-dejavu-core \
         libvips && \

docker/Dockerfile.debian.builder

@@ -1,17 +1,11 @@
-ARG DISTRO=ubuntu:noble
+ARG DISTRO=ubuntu:resolute
 
 FROM ${DISTRO} AS base
 
 
 RUN apt-get update -qq -o Acquire::Languages=none && \
-    env DEBIAN_FRONTEND=noninteractive apt-get install -yqq curl lsb-release && \
-    if test "$(lsb_release -cs)" = 'focal' ; then \
-       env DEBIAN_FRONTEND=noninteractive apt-get install -yqq software-properties-common; \
-       install -d /usr/share/geotrek; \
-       curl -o /usr/share/geotrek/apt.geotrek.org.key --fail https://packages.geotrek.fr/geotrek.gpg.key; \
-       echo "deb [signed-by=/usr/share/geotrek/apt.geotrek.org.key] https://packages.geotrek.fr/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/geotrek.list; \
-       add-apt-repository ppa:jyrki-pulliainen/dh-virtualenv; fi &&\
     env DEBIAN_FRONTEND=noninteractive apt-get install -yqq \
+    lsb-release \
     nano \
     dpkg-dev \
     debhelper \
@@ -20,7 +14,6 @@ RUN apt-get update -qq -o Acquire::Languages=none && \
     devscripts \
     equivs
 
-
 WORKDIR /dpkg-build
 
 FROM base AS builder
@@ -37,8 +30,8 @@ COPY VERSION ./VERSION
 COPY manage.py ./manage.py
 COPY MANIFEST.in ./MANIFEST.in
 
-RUN if test "$(lsb_release -cs)" = 'noble' ; then \
-      sed -i 's/python3.10/python3.12/g' debian/rules; \
+RUN if test "$(lsb_release -cs)" = 'resolute' ; then \
+      sed -i 's/python3.12/python3.13/g' debian/rules; \
     fi
 
 RUN sed -i -re "1s/..UNRELEASED/.ubuntu$(lsb_release -rs)) $(lsb_release -cs)/" debian/changelog \

docs/requirements.txt

@@ -31,10 +31,6 @@ colorama==0.4.6
     # via sphinx-autobuild
 docutils==0.21.2
     # via sphinx
-exceptiongroup==1.3.1
-    # via
-    #   -c ../requirements.txt
-    #   anyio
 h11==0.16.0
     # via uvicorn
 idna==3.11
@@ -105,21 +101,16 @@ sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 starlette==0.49.1
     # via sphinx-autobuild
-tomli==2.3.0
-    # via sphinx
 typing-extensions==4.15.0
     # via
-    #   -c ../requirements-dev.txt
     #   -c ../requirements.txt
     #   anyio
-    #   exceptiongroup
     #   pydantic
     #   pydantic-core
     #   pydantic-extra-types
     #   sphinx-immaterial
     #   starlette
     #   typing-inspection
-    #   uvicorn
 typing-inspection==0.4.2
     # via pydantic
 urllib3==2.6.2

requirements-dev.txt

@@ -21,7 +21,7 @@ faker==19.3.1
     # via factory-boy
 freezegun==1.5.5
     # via -r requirements-dev.in
-lxml==4.9.3
+lxml==6.0.2
     # via
     #   -c requirements.txt
     #   -r requirements-dev.in
@@ -43,7 +43,3 @@ sqlparse==0.5.4
     #   django-debug-toolbar
 tblib==3.1.0
     # via -r requirements-dev.in
-typing-extensions==4.15.0
-    # via
-    #   -c requirements.txt
-    #   asgiref

requirements.txt

@@ -8,8 +8,6 @@ argdispatch==1.4.2
     # via pdfimpose
 asgiref==3.11.0
     # via django
-async-timeout==5.0.1
-    # via redis
 attrs==25.4.0
     # via
     #   fiona
@@ -239,7 +237,7 @@ large-image==1.33.5
     #   large-image-source-vips
 large-image-source-vips==1.33.5
     # via geotrek (setup.py)
-lxml==4.9.3
+lxml==6.0.2
     # via
     #   mapentity
     #   svglib
@@ -384,9 +382,7 @@ transaction==5.0
     # via zodb
 typing-extensions==4.15.0
     # via
-    #   asgiref
     #   beautifulsoup4
-    #   django-modeltranslation
     #   exceptiongroup
     #   large-image
     #   referencing

tools/install-dev.sh

@@ -4,10 +4,10 @@
 
 set -e
 
-if lsb_release -d | grep 'Ubuntu 24.04' || lsb_release -d | grep 'Ubuntu 22.04' > /dev/null; then
-	echo "Either, Ubuntu 24.04, 22.04 found"
+if lsb_release -d | grep 'Ubuntu 24.04' || lsb_release -d | grep 'Ubuntu 26.04' > /dev/null; then
+	echo "Either, Ubuntu 24.04, 26.04 found"
 else
-	echo "ERROR! Neither Ubuntu 24.04, Ubuntu 22.04 found."
+	echo "ERROR! Neither Ubuntu 24.04, Ubuntu 26.04 found."
 	exit 1
 fi
 

tools/install.sh

@@ -4,10 +4,10 @@
 
 set -e
 
-if lsb_release -d | grep 'Ubuntu 24.04' || lsb_release -d | grep 'Ubuntu 22.04' > /dev/null; then
-	echo "Either, Ubuntu 24.04, 22.04 found"
+if lsb_release -d | grep 'Ubuntu 24.04' || lsb_release -d | grep 'Ubuntu 26.04' > /dev/null; then
+	echo "Either, Ubuntu 24.04, 26.04 found"
 else
-	echo "ERROR! Neither Ubuntu 24.04, Ubuntu 22.04 found."
+	echo "ERROR! Neither Ubuntu 24.04, Ubuntu 26.04 found."
 	exit 1
 fi