c2cgeoportal-geoportal 2.7.1.156__py2.py3-none-any.whl → 2.8.1.87__py2.py3-none-any.whl

c2cgeoportal_geoportal/lib/wmstparsing.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2024, Camptocamp SA
+# Copyright (c) 2013-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -131,7 +131,7 @@ class TimeExtentValue:
         max_def_value: Optional[datetime.datetime],
     ):
         """
-        Initialise.
+        Initialize.
 
         Arguments:
 
@@ -212,20 +212,16 @@ class TimeExtentInterval:
         self.min_def_value = (
             self.min_def_value
             if extent.min_def_value is None
-            else (
-                extent.min_def_value
-                if self.min_def_value is None
-                else min_none(self.min_def_value, extent.min_def_value)
-            )
+            else extent.min_def_value
+            if self.min_def_value is None
+            else min_none(self.min_def_value, extent.min_def_value)
         )
         self.max_def_value = (
             self.max_def_value
             if extent.max_def_value is None
-            else (
-                extent.max_def_value
-                if self.max_def_value is None
-                else max_none(self.max_def_value, extent.max_def_value)
-            )
+            else extent.max_def_value
+            if self.max_def_value is None
+            else max_none(self.max_def_value, extent.max_def_value)
         )
 
     def to_dict(self) -> Dict[str, Any]:

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/Dockerfile

@@ -5,9 +5,8 @@ FROM camptocamp/geomapfish-tools:{{cookiecutter.geomapfish_version_tag_env}} as
 LABEL maintainer Camptocamp "info@camptocamp.com"
 
 COPY requirements.txt /tmp/requirements.txt
-RUN \
-  python3 -m pip install --disable-pip-version-check --no-cache-dir --requirement=/tmp/requirements.txt && \
-  rm --recursive --force /tmp/* /var/tmp/* /root/.cache/*
+RUN --mount=type=cache,target=/root/.cache \
+    python3 -m pip install --disable-pip-version-check --requirement=/tmp/requirements.txt
 
 WORKDIR /app
 COPY webpack.*.js Makefile CONST_Makefile /app/
@@ -16,7 +15,6 @@ RUN make apps
 
 COPY . /app
 
-RUN make checks
 RUN make build
 RUN mv webpack.apps.js webpack.apps.js.tmpl
 
@@ -28,9 +26,8 @@ CMD [ "webpack-dev-server", "--mode=development", "--debug", "--watch", "--no-in
 FROM camptocamp/geomapfish:{{cookiecutter.geomapfish_major_version_tag_env}} as runner
 
 COPY requirements.txt /tmp/requirements.txt
-RUN \
-  python3 -m pip install --disable-pip-version-check --no-cache-dir --requirement=/tmp/requirements.txt && \
-  rm --recursive --force /tmp/* /var/tmp/* /root/.cache/*
+RUN --mount=type=cache,target=/root/.cache \
+    python3 -m pip install --disable-pip-version-check --requirement=/tmp/requirements.txt
 
 WORKDIR /app
 COPY . /app
@@ -41,10 +38,11 @@ COPY --from=builder /etc/static-ngeo/* /etc/static-ngeo/
 COPY --from=builder /app/alembic.ini /app/alembic.yaml ./
 RUN chmod go+w /etc/static-ngeo/
 
-RUN python3 -m pip install --disable-pip-version-check --no-cache-dir --editable=/app/ && \
-    python3 -m compileall -q /usr/local/lib/python3.* \
-        -x '/(debugpy|pipenv|.*pydev.*|networkx)/' && \
-    python3 -m compileall -q /app/{{cookiecutter.package}}_geoportal -x /app/{{cookiecutter.package}}_geoportal/static.*
+RUN --mount=type=cache,target=/root/.cache \
+    python3 -m pip install --disable-pip-version-check --editable=/app/ \
+    && python3 -m compileall -q /usr/local/lib/python3.* \
+        -x '/(ptvsd|.*pydev.*|networkx)/' \
+    && python3 -m compileall -q /app/{{cookiecutter.package}}_geoportal -x /app/{{cookiecutter.package}}_geoportal/static.*
 
 ARG GIT_HASH
 RUN c2cwsgiutils-genversion ${GIT_HASH}

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/development.ini

@@ -48,7 +48,7 @@ use = egg:PasteDeploy#prefix
 prefix = %(VISIBLE_ENTRY_POINT)s
 
 [pipeline:main]
-pipeline = egg:c2cwsgiutils#client_info egg:c2cwsgiutils#profiler egg:c2cwsgiutils#sentry app
+pipeline = egg:c2cwsgiutils#client_info egg:c2cwsgiutils#sentry app
 
 ###
 # logging configuration

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/gunicorn.conf.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2019-2024, Camptocamp SA
+# Copyright (c) 2019-2023, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -49,6 +47,8 @@ max_requests_jitter = int(os.environ.get("GUNICORN_MAX_REQUESTS_JITTER", 100))
 worker_tmp_dir = "/dev/shm"  # nosec
 limit_request_line = int(os.environ.get("GUNICORN_LIMIT_REQUEST_LINE", 8190))
 
+preload = "true"
+
 accesslog = "-"
 access_log_format = os.environ.get(
     "GUNICORN_ACCESS_LOG_FORMAT",

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/requirements.txt

@@ -1,2 +1,2 @@
-#debugpy  # Remote debugging
+#ptvsd  # Remote debugging
 #wsgi-lineprof  # Profiling

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.api.js

@@ -7,9 +7,7 @@ const babelPresets = [
   [
     require.resolve('@babel/preset-env'),
     {
-      targets: {
-        browsers: ['> 0.7% in CH', '> 0.7% in FR', 'Firefox ESR'],
-      },
+      targets: 'defaults, > 0.1% in CH, > 0.1% in FR, Firefox ESR and supports es6-class and not iOS < 10',
       modules: false,
       loose: true,
     },
@@ -32,7 +30,11 @@ module.exports = (env, argv) => {
               presets: babelPresets,
               babelrc: false,
               comments: false,
-              plugins: [require.resolve('babel-plugin-angularjs-annotate')],
+              plugins: [
+                require.resolve('babel-plugin-angularjs-annotate'),
+                require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
+                require.resolve('@babel/plugin-proposal-optional-chaining'),
+              ],
             },
           },
         },

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js

@@ -34,9 +34,7 @@ const babelPresets = [
   [
     require.resolve('@babel/preset-env'),
     {
-      targets: {
-        browsers: ['> 0.7% in CH', '> 0.7% in FR', 'Firefox ESR'],
-      },
+      targets: 'defaults, > 0.1% in CH, > 0.1% in FR, Firefox ESR and supports es6-class and not iOS < 10',
       modules: false,
       loose: true,
     },

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.commons.js

@@ -5,6 +5,7 @@ const config = commons({
   DllReferencePluginOptions: {
     context: '/usr/lib/',
   },
+  browsers: 'defaults, > 0.1% in CH, > 0.1% in FR, Firefox ESR and supports es6-class and not iOS < 10',
 });
 
 for (const plugin of config.plugins) {

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/__init__.py

@@ -1,11 +1,9 @@
-import distutils.core
-
 from pyramid.config import Configurator
 
 import {{cookiecutter.package}}_geoportal.authentication
 import {{cookiecutter.package}}_geoportal.dev
 import {{cookiecutter.package}}_geoportal.multi_organization
-from c2cgeoportal_geoportal import INTERFACE_TYPE_NGEO, add_interface_config, locale_negotiator
+from c2cgeoportal_geoportal import add_interface_config, locale_negotiator
 from c2cgeoportal_geoportal.lib.i18n import LOCALE_PATH
 from {{cookiecutter.package}}_geoportal.resources import Root
 
@@ -28,10 +26,7 @@ def main(global_config, **settings):
 
     config.add_translation_dirs(LOCALE_PATH)
 
-    # Workaround to not have the error: distutils.errors.DistutilsArgError: no commands supplied
-    distutils.core._setup_stop_after = "config"  # pylint: disable=protected-access
     config.include("c2cgeoportal_geoportal")
-    distutils.core._setup_stop_after = None  # pylint: disable=protected-access
 
     config.include({{cookiecutter.package}}_geoportal.multi_organization.includeme)
 

c2cgeoportal_geoportal/scaffolds/advance_update/{{cookiecutter.project}}/geoportal/CONST_Makefile

@@ -43,32 +43,12 @@ VALIDATE_PY_FOLDERS = admin/$(PACKAGE)_admin \
 	$(PACKAGE)_geoportal/scripts $(PACKAGE)_geoportal/views
 VALIDATE_PY_TEST_FOLDERS = $(PACKAGE)_geoportal/tests
 
-PY_FILES = $(shell find $(PACKAGE) -type f -name '*.py' -print 2> /dev/null)
-
-# Templates
-
-
 # Disabling Make built-in rules to speed up execution time
 .SUFFIXES:
 
 .PHONY: build
 build: $(BUILD_RULES)
 
-.PHONY: checks
-checks: prospector eslint
-
-.PHONY: prospector
-prospector:
-	prospector
-
-.PHONY: eslint
-eslint: $(APP_JS_FILES)
-	eslint $?
-
-.PHONY: eslint-fix
-eslint-fix: $(APP_JS_FILES)
-	eslint --fix $?
-
 # Server localisation
 
 PO_FILES = $(addprefix $(PACKAGE)_geoportal/locale/, $(addsuffix /LC_MESSAGES/$(PACKAGE)_geoportal-server.po, $(LANGUAGES)))

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml

@@ -5,12 +5,9 @@ on:
   push:
 
 # To publish the images to be used on Kubernetes
-#env:
-#  PROJECT: {{cookiecutter.package}}
-#  HAS_SECRETS: ${{'{{'}} secrets.HAS_SECRETS }}
-#  # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
-#  # The release branches
-#  HELM_RELEASE_NAMES: int-{{cookiecutter.geomapfish_main_version_dash}},prod-{{cookiecutter.geomapfish_main_version_dash}}
+# env:
+#   PROJECT: {{cookiecutter.package}}
+#   HAS_SECRETS: ${{'{{'}} secrets.HAS_SECRETS }}
 
 jobs:
   main:
@@ -32,11 +29,28 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
 
+      # Can be used to have some secrets (with mask)
+      # - run: make secrets
+      # - run: cat env.secrets |grep '^[# A-Z0-9_]\+='|sed -e 's/^[# A-Z0-9_]\+=\(.*\)/::add-mask::\1/g'
+
       - name: Checks
         run: c2cciutils-checks
 
+      # - name: Initialize the acceptance tests
+      #   run: make acceptance-init
+      # - run: c2cciutils-docker-logs
+      #   if: always()
+
+      # - name: Run the acceptance tests
+      #   run: make acceptance
+      # - run: c2cciutils-docker-logs
+      #   if: always()
+
       - name: Build
-        run: ./build --docker-compose-version-2
+        run: ./build
+
+      - name: Application checks
+        run: make checks
 
       # To publish the images to be used on Kubernetes
       # - name: Publish

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml

@@ -40,7 +40,7 @@ jobs:
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
 
       - name: Build
-        run: ./build --docker-compose-version-2
+        run: ./build
 
       - name: Publish
         run: c2cciutils-publish --branch=${{'{{'}} matrix.branch }} --type=rebuild

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   l10n:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     name: Update l10n cron job
     timeout-minutes: 10
 
@@ -59,6 +59,7 @@ jobs:
                   'Authorization': 'Bearer ${{'{{'}} secrets.GOPASS_CI_GITHUB_TOKEN {{'}}'}}',
                   'Content-Type': 'application/json',
               },
+              timeout=120,
           )
           # 422 is the return code when the pull request already exists
           assert response.status_code < 300 or response.status_code == 422, f'{response.status_code} - {response.text}'"

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile

@@ -14,7 +14,7 @@ ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqla
     dbsessions urllogin host_forward_host headers_whitelist headers_blacklist \
     smtp c2c.base_path welcome_email \
     lingua_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport \
-    vector_tiles i18next
+    vector_tiles i18next main_ogc_server
 
 COPY . /tmp/config/
 
@@ -27,14 +27,14 @@ ARG PGSCHEMA
 ENV PGSCHEMA=$PGSCHEMA
 
 RUN \
-    cd /tmp/config/geoportal/ && \
-    c2c-template --vars ${VARS_FILE} \
+    cd /tmp/config/geoportal/ \
+    && c2c-template --vars ${VARS_FILE} \
         --get-config {{cookiecutter.package}}_geoportal/config.yaml \
-        ${CONFIG_VARS} && \
-    pykwalify --data-file {{cookiecutter.package}}_geoportal/config.yaml \
-        --schema-file CONST_config-schema.yaml && \
-    rm CONST_* vars.yaml && \
-    qgisserver-plugin-config {{cookiecutter.package}}_geoportal/config.yaml ../qgisserver/geomapfish.yaml.tmpl
+        ${CONFIG_VARS} \
+    && pykwalify --data-file {{cookiecutter.package}}_geoportal/config.yaml \
+        --schema-file CONST_config-schema.yaml \
+    && rm CONST_* vars.yaml \
+    && qgisserver-plugin-config {{cookiecutter.package}}_geoportal/config.yaml ../qgisserver/geomapfish.yaml.tmpl
 
 ###############################################################################
 
@@ -46,26 +46,26 @@ ENV PGSCHEMA=$PGSCHEMA
 COPY --from=builder /tmp/config/ /tmp/config/
 
 RUN \
-    if [ -e /tmp/config/mapserver ]; then mv /tmp/config/mapserver /etc/; fi && \
-    if [ -e /tmp/config/tilegeneration ]; then mv /tmp/config/tilegeneration /etc/; fi && \
-    if [ -e /tmp/config/qgisserver ]; then mv /tmp/config/qgisserver /etc/qgisserver; fi && \
-    if [ -e /tmp/config/haproxy ]; then mv /tmp/config/haproxy/* /etc/haproxy/; fi && \
-    mkdir --parent /usr/local/tomcat/webapps/ROOT/ && \
-    if [ -e /tmp/config/print ]; then mv /tmp/config/print/print-apps /usr/local/tomcat/webapps/ROOT/; fi && \
-    mv /tmp/config/geoportal/{{cookiecutter.package}}_geoportal/ /etc/geomapfish/ && \
-    mv /tmp/config/geoportal/* /etc/geomapfish/ || true && \
-    chmod g+w -R \
+    mvif /tmp/config/mapserver /etc/ \
+    && mvif /tmp/config/tilegeneration /etc/ \
+    && mvif /tmp/config/qgisserver /etc/qgisserver \
+    && mvif /tmp/config/haproxy/* /etc/haproxy/ \
+    && mkdir --parent /usr/local/tomcat/webapps/ROOT/ \
+    && mvif /tmp/config/print /tmp/config/print/print-apps /usr/local/tomcat/webapps/ROOT/ \
+    && mv /tmp/config/geoportal/{{cookiecutter.package}}_geoportal/ /etc/geomapfish/ \
+    && mv /tmp/config/geoportal/* /etc/geomapfish/ || true \
+    && chmod g+w -R \
         /etc/geomapfish \
         /etc/mapserver \
         /etc/qgisserver \
         /etc/tilegeneration \
         /usr/local/tomcat/webapps/ROOT/print-apps \
         /etc/haproxy_dev \
-        /etc/haproxy && \
-    adduser www-data root && \
-    sed 's#bind :80#bind *:443 ssl crt /etc/haproxy_dev/localhost.pem#g' /etc/haproxy/haproxy.cfg.tmpl \
-        > /etc/haproxy_dev/haproxy.cfg.tmpl && \
-    echo '    http-request set-header X-Forwarded-Proto https' >> /etc/haproxy_dev/haproxy.cfg.tmpl
+        /etc/haproxy \
+    && adduser www-data root \
+    && sed 's#bind :80#bind *:443 ssl crt /etc/haproxy_dev/localhost.pem#g' /etc/haproxy/haproxy.cfg.tmpl \
+        > /etc/haproxy_dev/haproxy.cfg.tmpl \
+    && echo '    http-request set-header X-Forwarded-Proto https' >> /etc/haproxy_dev/haproxy.cfg.tmpl
 
 VOLUME /etc/geomapfish \
     /etc/mapserver \

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile

@@ -1,7 +1,16 @@
 PROJECT_PUBLIC_URL=https://example.camptocamp.com/
+DUMP_FILE=dump.backup
 PACKAGE={{cookiecutter.package}}
 LANGUAGES=en fr de it
 
+.PHONY: help
+help: ## Display this help message
+	@echo "Usage: make <target>"
+	@echo
+	@echo "Available targets:"
+	@grep --extended-regexp --no-filename '^[a-zA-Z_-]+:.*## ' $(MAKEFILE_LIST) | sort | \
+		awk 'BEGIN {FS = ":.*?## "}; {printf "	%-20s%s\n", $$1, $$2}'
+
 .PHONY: update-po-from-url
 update-po-from-url: ## Update the po files from the URL provide by PROJECT_PUBLIC_URL
 	curl --fail --retry 5 --retry-delay 1 \
@@ -10,5 +19,52 @@ update-po-from-url: ## Update the po files from the URL provide by PROJECT_PUBLI
 	docker-compose run --rm -T tools update-po-only `id --user` `id --group` $(LANGUAGES)
 
 .PHONY: update-po
-update-po:
-	docker-compose exec -T tools sh -c "USER_ID=`id --user` GROUP_ID=`id --group` make -C geoportal update-po"
+update-po: ## Update the po files from the running composition
+	docker-compose exec -T tools sh -c "USER_ID=`id --user` GROUP_ID=`id --group` make --directory=geoportal update-po"
+
+.PHONY: checks
+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
+
+.PHONY: eslint
+eslint: ## Runs the eslint checks
+	docker-compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \
+		eslint $(find {{cookiecutter.package}} -type f -name '*.js' -print 2> /dev/null)
+	docker-compose run --entrypoint= --no-deps --rm --volume=$(CURDIR)/geoportal:/app geoportal \
+		eslint $(find {{cookiecutter.package}} -type f -name '*.ts' -print 2> /dev/null)
+
+.PHONY: qgis
+qgis: ## Run QGIS desktop
+	docker-compose -f docker-compose.yaml -f docker-compose-qgis.yaml run --rm qgis
+
+secrets.tar.bz2.gpg: env.secrets ## Encrypt the secrets for committing changes
+	tar -jcf secrets.tar.bz2 $^
+	rm -f $@
+	gpg --symmetric --cipher-algo AES256 --batch \
+		--passphrase=$(shell gopass show gs/ci/large-secret-passphrase) secrets.tar.bz2
+	rm secrets.tar.bz2
+
+.PHONY: secrets
+secrets: ## Decrypt the secrets.tar.bz2.gpg file
+	gpg --quiet --batch --yes --decrypt --passphrase=$(shell gopass show gs/ci/large-secret-passphrase) \
+		--output secrets.tar.bz2 secrets.tar.bz2.gpg
+	tar --touch -jxf secrets.tar.bz2
+	rm secrets.tar.bz2
+
+.PHONY: acceptance-init
+acceptance-init: ## Initialize the acceptance tests
+	docker-compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d db tools
+	docker-compose exec -T tools wait-db
+	docker-compose exec -T tools psql --command="DROP EXTENSION IF EXISTS postgis CASCADE"
+	scripts/db-restore --docker-compose-file=docker-compose.yaml --docker-compose-file=docker-compose-db.yaml \
+		--arg=--clean --arg=--if-exists --arg=--verbose $(DUMP_FILE)
+	docker-compose --file=docker-compose.yaml --file=docker-compose-db.yaml up -d
+
+.PHONY: acceptance
+acceptance: ## Run the acceptance tests
+	docker-compose exec -T tools pytest -vv tests/
+	ci/docker-compose-check

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build

@@ -5,26 +5,42 @@ import os
 import os.path
 import platform
 import re
+import shlex
 import shutil
 import stat
 import subprocess
 import sys
 import urllib.request
-from typing import Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, List, Optional
 
 import yaml
 
+CompletedProcess = subprocess.CompletedProcess[str] if TYPE_CHECKING else subprocess.CompletedProcess
 
-def run(args: argparse.Namespace, command: List[str], **kwargs: Any) -> None:
+
+def run(
+    args: argparse.Namespace, command: List[str], exit_on_error: bool = True, **kwargs: Any
+) -> Optional[CompletedProcess]:
     if args.verbose or args.dry_run:
-        print(" ".join(command))
-    if not args.dry_run:
-        subprocess.run(command, **kwargs)  # nosec
+        print(" ".join([shlex.quote(c) for c in command]))
+    if not args.dry_run or "stdout" in kwargs:
+        if args.stack_trace and exit_on_error and not "checks" in kwargs:
+            kwargs["check"] = True
+        process = subprocess.run(command, **kwargs)  # nosec
+        if exit_on_error and process.returncode != 0:
+            print(
+                "An error occurred during execution of `{}`".format(
+                    " ".join([shlex.quote(c) for c in command])
+                )
+            )
+            sys.exit(process.returncode)
+        return process
+    return None
 
 
 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("--verbose", action="store_true", help="Display the Docker build commands")
     parser.add_argument(
         "--dry-run", action="store_true", help="Display the docker build commands without executing them"
     )
@@ -34,9 +50,11 @@ def main() -> None:
     parser.add_argument("--not-simple", action="store_true", help="Force not simple application mode")
     parser.add_argument("--upgrade", help="Start upgrading the project to version")
     parser.add_argument(
-        "--fast-reload",
-        action="store_true",
-        help="Restart the composition without Redis to don't lost the cache",
+        "--reload",
+        nargs="?",
+        action="store",
+        const="",
+        help="Comma separate list of services that will be reloaded after the build",
     )
     parser.add_argument(
         "--no-pull",
@@ -47,9 +65,7 @@ def main() -> None:
     parser.add_argument(
         "--debug", help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure"
     )
-    parser.add_argument(
-        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
-    )
+    parser.add_argument("--stack-trace", action="store_true", help="Display the stack trace on error")
     parser.add_argument("env_files", nargs="*", help="The environment config")
     args = parser.parse_args()
 
@@ -61,7 +77,7 @@ def main() -> None:
         match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9a-z]+\.[0-9]+$", args.upgrade)
         if match is not None:
             major_version = match.group(1)
-        full_version = args.upgrade if args.upgrade != "master" else "latest"
+        full_version = args.upgrade
         with open("upgrade", "w", encoding="utf-8") as f:
             with urllib.request.urlopen(  # nosec
                 "https://raw.githubusercontent.com/camptocamp/c2cgeoportal/{major_version}/scripts/upgrade".format(
@@ -80,9 +96,9 @@ def main() -> None:
         os.chmod("upgrade", os.stat("upgrade").st_mode | stat.S_IXUSR)
         try:
             if platform.system() == "Windows":
-                run(args, ["python", "upgrade", full_version] + debug_args, check=True)
+                run(args, ["python", "upgrade", full_version] + debug_args)
             else:
-                run(args, ["./upgrade", full_version] + debug_args, check=True)
+                run(args, ["./upgrade", full_version] + debug_args)
         except subprocess.CalledProcessError:
             sys.exit(1)
         sys.exit(0)
@@ -110,25 +126,20 @@ def main() -> None:
             if args.not_simple:
                 simple = False
 
-            git_hash = (
-                subprocess.run(["git", "rev-parse", "HEAD"], check=True, stdout=subprocess.PIPE)
-                .stdout.strip()
-                .decode()
-            )
+            git_hash = run(args, ["git", "rev-parse", "HEAD"], stdout=subprocess.PIPE).stdout.decode().strip()
 
             dest.write("SIMPLE={}\n".format(str(simple).upper()))
             dest.write("GIT_HASH={git_hash}\n".format(git_hash=git_hash))
 
         dest.write("# Used env files: {}\n".format(", ".join(env_files)))
 
-    docker_compose = ["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]
     if not args.env:
-        docker_compose_build_cmd = [*docker_compose, "build"]
+        docker_compose_build_cmd = ["docker-compose", "build"]
 
         if not args.no_pull:
             # Pull all the images
             if not args.service:
-                run(args, [*docker_compose, "pull", "--ignore-pull-failures"], check=True)  # nosec
+                run(args, ["docker-compose", "pull", "--ignore-pull-failures"])  # nosec
             docker_compose_build_cmd.append("--pull")
 
         if args.service:
@@ -138,24 +149,33 @@ def main() -> None:
         print_args = [a.replace('"', '\\"') for a in print_args]
         print_args = [a.replace("'", "\\'") for a in print_args]
         try:
-            run(args, docker_compose_build_cmd, check=True)  # nosec
+            env = {"DOCKER_BUILDKIT": "1", "COMPOSE_DOCKER_CLI_BUILD": "1"}
+            env.update(os.environ)
+            run(args, docker_compose_build_cmd, env=env)  # nosec
         except subprocess.CalledProcessError as e:
             print("Error with command: " + " ".join(print_args))
             sys.exit(e.returncode)
 
-    if args.fast_reload:
+    if args.reload:
+        services = args.reload.split(",")
+    elif args.reload == "":
         services = [
             service
-            for service in subprocess.run(
-                [*docker_compose, "ps", "--services", "--all"], stdout=subprocess.PIPE, check=True
+            for service in run(
+                args,
+                ["docker-compose", "ps", "--services", "--all"],
+                stdout=subprocess.PIPE,
+                exit_on_error=True,
             )
             .stdout.decode()
             .splitlines()
             if not service.startswith("redis")
         ]
 
-        run(args, [*docker_compose, "rm", "--stop", "--force"] + services, check=True)
-        run(args, [*docker_compose, "up", "-d"], check=True)
+    if args.reload is not None:
+        run(args, ["docker-compose", "rm", "--force", "-v", "config"])
+        for service in services:
+            run(args, ["docker-compose", "up", "--detach", "--force-recreate", service])
 
 
 if __name__ == "__main__":

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml

@@ -1,11 +1,7 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.4/c2cciutils/schema.json
 
 checks:
-  black: False
-  isort: False
-  prettier: False
   codespell: False
-  eof: False
   required_workflows: False
   dependabot_config: False
   prospector_config: False
@@ -21,5 +17,6 @@ version:
 publish:
   pypi: false
   docker:
+    dispatch: {}
     images:
       - name: camptocamp/{{cookiecutter.package}}-config

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check

@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+import sys
+
+
+def _main() -> None:
+    argparser = argparse.ArgumentParser("Tests that's all the services are running")
+    argparser.parse_args()
+
+    services = [
+        s.strip()
+        for s in subprocess.run(["docker-compose", "ps"], check=True, stdout=subprocess.PIPE)
+        .stdout.decode("utf-8")
+        .splitlines()
+    ]
+    errors_statuses = [s for s in services if " Exit " in s and not s.endswith(" Exit 0")]
+    if errors_statuses:
+        print("\n".join(errors_statuses))
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    _main()