Merge remote-tracking branch 'origin/dev' into dev

g3w-suite · Dec 3, 2024 · ef2bf73 · ef2bf73
2 parents 0e8bdb5 + 72d80fa
commit ef2bf73
Show file tree

Hide file tree

Showing 19 changed files with 143 additions and 2,019 deletions.
diff --git a/.github/workflows/test_runner.yml b/.github/workflows/test_runner.yml
@@ -30,23 +30,23 @@ jobs:
 
     - name: Installing Python requirements
       run: |
-        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r requirements_docker.txt && pip3 install -r requirements_huey.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r requirements_docker.txt --break-system-packages && pip3 install -r requirements_huey.txt --break-system-packages"
 
     - name: Installing Caching Python requirements
       run: |
-        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/caching/requirements.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/caching/requirements.txt --break-system-packages"
 
     - name: Installing Filemanager Python requirements
       run: |
-        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/filemanager/requirements.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/filemanager/requirements.txt --break-system-packages"
 
     - name: Installing Qplotly Python requirements
       run: |
-        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/qplotly/requirements.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/qplotly/requirements.txt --break-system-packages"
 
     - name: Installing Openrouteservice Python requirements
       run: |
-        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/openrouteservice/requirements.txt && pip3 install -r g3w-admin/openrouteservice/requirements_testing.txt"
+        docker compose -f docker-compose.${{ matrix.qgis_version }}.yml exec -T g3w-suite sh -c "cd /code/ && pip3 install -r g3w-admin/openrouteservice/requirements.txt --break-system-packages && pip3 install -r g3w-admin/openrouteservice/requirements_testing.txt --break-system-packages"
 
     - name: Building g3w-suite
       run: |

diff --git a/README.md b/README.md
@@ -13,20 +13,20 @@ Admin server for G3W-SUITE written in Python, based on **Django** LTS (v3.2) and
 
 Software releases follow theese main branches as described in the compatibility table:
 
-| Branch     | Python         | Django         | QGIS          | [client]     | First release | Status         |
-|------------|----------------|----------------|---------------|--------------|---------------|----------------|
-| [dev]      | 3.10           | 3.2            | 3.34          | dev          | Unreleased    | ⚠️️ Unstable    |
-| [v.3.8.x]  | 3.10           | 3.2            | 3.34          | 3.10.3       | Sep 2024      | 🪲️ Bug fixing  |
-| [v.3.7.x]  | 3.10           | 3.2            | 3.34          | 3.9.6        | Dec 2023      | 🪲️ Bug fixing  |
-| [v.3.6.x]  | 3.10           | 3.2            | 3.28          | 3.8.15       | May 2023      | 🚨 End of Life |
-| [v.3.5.x]  | 3.10           | 2.2            | 3.22          | 3.7          | Nov 2022      | 🚨 End of Life |
-| [v.3.4.x]  | 3.8            | 2.2            | 3.22          | 3.4          | Mar 2022      | 🚨 End of Life |
-| [v.3.3.x]  | 3.6            | 2.2            | 3.16          | 3.3          | Sep 2021      | 🚨 End of Life | 
-| [v.3.2.x]  | 3.6            | 2.2            | 3.16          | 3.2          | Apr 2021      | 🚨 End of Life |
-| [v.3.1.x]  | 3.6            | 2.2            | 3.10          | 3.1          | Nov 2020      | 🚨 End of Life |
-| [v.3.0.x]  | 3.6            | 2.2            | 3.10          | 3.0          | Nov 2020      | 🚨 End of Life |
-| [dj22-py3] | 3.6            | 2.2            | [🔗]          |              |               | 🚨 End of Life |
-| [py2]      | 2.7            | 1.11           | [🔗]          |              |               | 🚨 End of Life |
+| Branch     | Python | Django         | QGIS          | [client]     | First release | Status         |
+|------------|--------|----------------|---------------|--------------|---------------|----------------|
+| [dev]      | 3.12   | 3.2            | 3.34          | dev          | Unreleased    | ⚠️️ Unstable    |
+| [v.3.8.x]  | 3.10   | 3.2            | 3.34          | 3.10.3       | Sep 2024      | 🪲️ Bug fixing  |
+| [v.3.7.x]  | 3.10   | 3.2            | 3.34          | 3.9.6        | Dec 2023      | 🪲️ Bug fixing  |
+| [v.3.6.x]  | 3.10   | 3.2            | 3.28          | 3.8.15       | May 2023      | 🚨 End of Life |
+| [v.3.5.x]  | 3.10   | 2.2            | 3.22          | 3.7          | Nov 2022      | 🚨 End of Life |
+| [v.3.4.x]  | 3.8    | 2.2            | 3.22          | 3.4          | Mar 2022      | 🚨 End of Life |
+| [v.3.3.x]  | 3.6    | 2.2            | 3.16          | 3.3          | Sep 2021      | 🚨 End of Life | 
+| [v.3.2.x]  | 3.6    | 2.2            | 3.16          | 3.2          | Apr 2021      | 🚨 End of Life |
+| [v.3.1.x]  | 3.6    | 2.2            | 3.10          | 3.1          | Nov 2020      | 🚨 End of Life |
+| [v.3.0.x]  | 3.6    | 2.2            | 3.10          | 3.0          | Nov 2020      | 🚨 End of Life |
+| [dj22-py3] | 3.6    | 2.2            | [🔗]          |              |               | 🚨 End of Life |
+| [py2]      | 2.7    | 1.11           | [🔗]          |              |               | 🚨 End of Life |
 
 [dev]: https://github.com/g3w-suite/g3w-admin/tree/dev
 [v.3.8.x]: https://github.com/g3w-suite/g3w-admin/tree/v.3.8.x

diff --git a/ci_scripts/Dockerfile.deps b/ci_scripts/Dockerfile.deps
@@ -1,30 +1,30 @@
-FROM ubuntu:jammy
-LABEL maintainer="Gis3w" Description="This image is used to prepare build requirements for g3w-suite CI testing" Vendor="Gis3w" Version="1.3"
+FROM ubuntu:noble
+LABEL maintainer="Gis3w" Description="This image is used to prepare build requirements for g3w-suite CI testing" Vendor="Gis3w"
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN chown root:root /tmp && chmod ugo+rwXt /tmp
 RUN apt-get update && apt install -y \
     git \
     libxml2-dev \
     libxslt-dev \
-    postgresql-server-dev-all \
     libgdal-dev \
     python3-dev \
-    libgdal30 \
+    libgdal34t64 \
     python3-gdal \
     python3-pip \
     curl \
+    wait-for-it \
     wget \
     vim \
-    wait-for-it \
     gdal-bin \
     libsqlite3-mod-spatialite \
     dirmngr \
-    xvfb
+    xvfb \
+    postgresql-client
 
 # PyQGIS latest version
 RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu jammy main" | \
+    echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu noble main" | \
     tee /etc/apt/sources.list.d/qgis.list && \
     apt-get update && apt-get install -y python3-qgis qgis-server
 

diff --git a/ci_scripts/Dockerfile.ltr.deps b/ci_scripts/Dockerfile.ltr.deps
@@ -1,30 +1,30 @@
-FROM ubuntu:jammy
-LABEL maintainer="Gis3w" Description="This image is used to prepare build requirements for g3w-suite CI testing" Vendor="Gis3w" Version="1.3"
+FROM ubuntu:noble
+LABEL maintainer="Gis3w" Description="This image is used to prepare build requirements for g3w-suite CI testing" Vendor="Gis3w"
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN chown root:root /tmp && chmod ugo+rwXt /tmp
 RUN apt-get update && apt install -y \
     git \
     libxml2-dev \
     libxslt-dev \
-    postgresql-server-dev-all \
     libgdal-dev \
     python3-dev \
-    libgdal30 \
+    libgdal34t64 \
     python3-gdal \
     python3-pip \
     curl \
+    wait-for-it \
     wget \
     vim \
-    wait-for-it \
     gdal-bin \
     libsqlite3-mod-spatialite \
     dirmngr \
-    xvfb
+    xvfb \
+    postgresql-client
 
 # PyQGIS
 RUN curl -sS https://download.qgis.org/downloads/qgis-archive-keyring.gpg > /etc/apt/keyrings/qgis-archive-keyring.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr jammy main" | \
+    echo "deb [signed-by=/etc/apt/keyrings/qgis-archive-keyring.gpg] https://qgis.org/ubuntu-ltr noble main" | \
     tee /etc/apt/sources.list.d/qgis.list && \
     apt-get update && apt-get install -y python3-qgis qgis-server
 

diff --git a/g3w-admin/base/settings/base.py b/g3w-admin/base/settings/base.py
@@ -182,7 +182,7 @@
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 
-LANGUAGE_CODE = 'it-it'
+LANGUAGE_CODE = 'en'
 
 TIME_ZONE = 'UTC'
 
@@ -199,16 +199,16 @@
 
 gettext = lambda s: s
 LANGUAGES = (
-    ('it', 'Italian'),
     ('en', 'English'),
+    ('it', 'Italian'),
     ('fr', 'French'),
     ('fi', 'Finnish'),
     ('se', 'Swedish'), # FIXME: correct language code should be "sv"
     ('ro', 'Romanian'),
     ('de', 'Deutsch'),
 )
 
-MODELTRANSLATION_DEFAULT_LANGUAGE = 'it'
+MODELTRANSLATION_DEFAULT_LANGUAGE = 'en'
 
 # if prefix for default language put in to url
 PREFIX_DEFAULT_LANGUAGE = True