Merge pull request #1815 from camptocamp/interrupted-upgrade-prod-2-10-master

Upgrade failed

Author: sbrunner

CONST_CHANGELOG.txt

@@ -1,5 +1,29 @@
 This file includes migration steps for each release of c2cgeoportal.
 
+==============
+Version 2.10.0
+==============
+
+Information to know before starting the upgrade
+===============================================
+
+1. The Binary Terrain (BT/VTP .bt 1.3) format is no longer supported by GDAL.
+   The raster files should be in a file readable by GDAL/OGR, such as GeoTIFF.
+   To translate the BT files to GeoTIFF, you can use the `gdal_translate` command:
+   ```bash
+   gdal_translate -of GTiff dem.bt dem.tiff
+   ```
+
+2. The Restriction area becomes a multipolygon and the `ST_Contains`
+   doesn't match with invalid geometries as before (impact also editing).
+
+Information
+===========
+
+Changes to apply
+================
+
+
 =============
 Version 2.9.0
 =============
@@ -95,13 +119,6 @@ Changes to apply
    Controller.$inject = ['$scope', '$injector'];
    ```
 
-4. The OGC Server 'source for image/png' is renamed to 'MapServer' and
-   'source for image/jpeg' is renamed to 'MapServer_JPEG'.
-   This is done to be able to add them in the URL path, for OGC API compatibility.
-   If you use one of them in the `vars.yaml` you have to update them. Concerned variables are:
-   `main_ogc_server`, `api.ogc_server`, `tinyowsproxy.ogc_server`,
-   `interfaces_config.<interface>.routes.ngeoPermalinkOgcserverUrl.params.ogcserver`.
-
 
 =============
 Version 2.8.0

CONST_create_template/.github/workflows/main.yaml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.13'
       - run: python3 -m pip install --requirement=ci/requirements.txt
       - name: Environment information
         run: c2cciutils-env

CONST_create_template/.github/workflows/rebuild.yaml

@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         branch:
-          - int-2-9
-          - prod-2-9
+          - int-2-10
+          - prod-2-10
 
     steps:
       - uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.13'
       - run: python3 -m pip install --requirement=ci/requirements.txt
       - name: Environment information
         run: c2cciutils-env

CONST_create_template/.github/workflows/update_l10n.yaml

@@ -15,9 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - branch: int-2-9
+          - branch: int-2-10
             base_url: int.customer.ch
-          - branch: prod-2-9
+          - branch: prod-2-10
             base_url: prod.customer.ch
 
     steps:

CONST_create_template/.pre-commit-config.yaml

@@ -26,10 +26,10 @@ repos:
     hooks:
       - id: autoflake
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black

CONST_create_template/Dockerfile

@@ -1,7 +1,7 @@
 ARG GEOMAPFISH_VERSION
 ARG GEOMAPFISH_MAIN_MINOR_VERSION
 
-FROM camptocamp/geomapfish-tools:${GEOMAPFISH_VERSION} AS builder
+FROM ghcr.io/camptocamp/geomapfish-tools:${GEOMAPFISH_VERSION} AS builder
 
 ENV VARS_FILE=vars.yaml
 ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqlalchemy.max_overflow \
@@ -39,7 +39,7 @@ RUN \
 
 ###############################################################################
 
-FROM camptocamp/geomapfish-config:${GEOMAPFISH_MAIN_MINOR_VERSION} AS gmf_config
+FROM ghcr.io/camptocamp/geomapfish-config:${GEOMAPFISH_MAIN_MINOR_VERSION} AS gmf_config
 
 ARG PGSCHEMA
 ENV PGSCHEMA=$PGSCHEMA

CONST_create_template/Makefile

@@ -28,7 +28,7 @@ checks: prospector eslint ## Runs the checks
 .PHONY: prospector
 prospector: ## Runs the Prospector checks
 	docker compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \
-		prospector --output-format=pylint --die-on-tool-error
+		prospector --without=ruff --output-format=pylint --die-on-tool-error
 
 .PHONY: eslint
 eslint: ## Runs the eslint checks

CONST_create_template/README.rst

@@ -1,7 +1,7 @@
 demo_geomapfish project
 ===================
 
-Read the `Documentation <https://camptocamp.github.io/c2cgeoportal/2.9/>`_
+Read the `Documentation <https://camptocamp.github.io/c2cgeoportal/2.10/>`_
 
 Checkout
 --------

CONST_create_template/build

@@ -37,6 +37,7 @@ def run(
 def main() -> None:
     parser = argparse.ArgumentParser(description="Build the project")
     parser.add_argument("--verbose", action="store_true", help="Display the Docker build commands")
+    parser.add_argument("--no-cache", action="store_true", help="Disable docker cache on build")
     parser.add_argument(
         "--dry-run", action="store_true", help="Display the docker build commands without executing them"
     )
@@ -133,6 +134,12 @@ def main() -> None:
     if not args.env:
         docker_compose_build_cmd = [*docker_compose_command, "build"]
 
+        if args.no_cache:
+            docker_compose_build_cmd.append("--no-cache")
+
+        if args.verbose:
+            docker_compose_build_cmd.append("--progress=plain")
+
         if not args.no_pull:
             # Pull all the images
             if not args.service:

CONST_create_template/ci/requirements.txt

@@ -1,2 +1,2 @@
 c2cciutils[checks,publish]==1.7.3
-pre-commit==4.2.0
+pre-commit==4.3.0