c2cgeoportal-geoportal 2.8.1.124__py2.py3-none-any.whl → 2.8.1.126__py2.py3-none-any.whl

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

@@ -47,7 +47,7 @@ jobs:
       #   if: always()
 
       - name: Build
-        run: ./build
+        run: ./build --docker-compose-version-2
 
       - name: Application checks
         run: make checks

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
+        run: ./build --docker-compose-version-2
 
       - name: Publish
         run: c2cciutils-publish --branch=${{'{{'}} matrix.branch }} --type=rebuild

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

@@ -66,6 +66,9 @@ def main() -> None:
         "--debug", help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure"
     )
     parser.add_argument("--stack-trace", action="store_true", help="Display the stack trace on error")
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("env_files", nargs="*", help="The environment config")
     args = parser.parse_args()
 
@@ -133,13 +136,14 @@ def main() -> None:
 
         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"])  # nosec
+                run(args, [*docker_compose, "pull", "--ignore-pull-failures"])  # nosec
             docker_compose_build_cmd.append("--pull")
 
         if args.service:
@@ -163,7 +167,7 @@ def main() -> None:
             service
             for service in run(
                 args,
-                ["docker-compose", "ps", "--services", "--all"],
+                [*docker_compose, "ps", "--services", "--all"],
                 stdout=subprocess.PIPE,
                 exit_on_error=True,
             )
@@ -173,9 +177,9 @@ def main() -> None:
         ]
 
     if args.reload is not None:
-        run(args, ["docker-compose", "rm", "--force", "-v", "config"])
+        run(args, [*docker_compose, "rm", "--force", "-v", "config"])
         for service in services:
-            run(args, ["docker-compose", "up", "--detach", "--force-recreate", service])
+            run(args, [*docker_compose, "up", "--detach", "--force-recreate", service])
 
 
 if __name__ == "__main__":

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,9 @@ def main() -> None:
         default=[],
         help="Additional pg_dump argument, example: '--arg=--schema=main', may be used multiple times.",
     )
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("file", help="The file path to backup")
     args = parser.parse_args()
 
@@ -89,15 +92,15 @@ def main() -> None:
         else:
             subprocess.run(
                 [
-                    "docker-compose",
+                    *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
                     "exec",
                     "-T",
                     "tools",
                     "bash",
                     "-c",
                     'pg_dump --format=c --dbname="$PGDATABASE"',
-                ]
-                + args.arg,
+                    *args.arg,
+                ],
                 stdout=file_out,
                 check=True,
             )

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021-2023, Camptocamp SA
+# Copyright (c) 2021-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,9 @@ def main() -> None:
         default=[],
         help="Additional pg_restore argument, example: '--arg=--schema=main', may be used multiple times.",
     )
+    parser.add_argument(
+        "--docker-compose-version-2", action="store_true", help="Use Docker Compose version 2"
+    )
     parser.add_argument("file", help="The file path to restore")
     args = parser.parse_args()
 
@@ -92,9 +95,9 @@ def main() -> None:
             )
         else:
             subprocess.run(
-                ["docker-compose"]
-                + ["--file={}".format(f) for f in args.docker_compose_file]
-                + [
+                [
+                    *(["docker", "compose"] if args.docker_compose_version_2 else ["docker-compose"]),
+                    *("--file={}".format(f) for f in args.docker_compose_file),
                     "exec",
                     "-T",
                     "tools",

{c2cgeoportal_geoportal-2.8.1.124.dist-info → c2cgeoportal_geoportal-2.8.1.126.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.8.1.124
+Version: 2.8.1.126
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.8.1.124.dist-info → c2cgeoportal_geoportal-2.8.1.126.dist-info}/RECORD

@@ -65,7 +65,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierrc.yam
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile,sha256=zJzSNMMy78GdhegVkwEj0jSIU-r_bu9i0_e9-c25MU0,3194
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile,sha256=pundFNNNv1t9NRCADjBINz4NIwPGKk_zHU6Zflpvlmg,3079
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/README.rst,sha256=PvydIFv4NS8CMqmLrCTm2TvIS0GNkWgiI-VwQvWBF5o,423
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=fgDxmhnZhW4GzYUJWmZe2kaIOUQyCs_vUJ_CZYU1OCU,7110
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=QPDeazuKeoh0POcQPInNkubIGjq7tpDx9xV-hW35D5c,7331
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml,sha256=JE5fBz3d3kYoBeUbCDvbKYNhu8QOzD0KLDeJD8AKMZI,534
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=C4XrC7DNkHG_qITcpmOKhDvXokcjoX-83E-q3XaaVuw,12687
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml,sha256=jllE7NrAnwljsyknDZWYl2FA9s-R-K_KBaJS3ubhJZE,590
@@ -78,8 +78,8 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml,
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/run_alembic.sh,sha256=VcrDFPAGlrxXtn4N8RcPhI90uZ8shDrGowALuwx8gnM,235
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/setup.cfg,sha256=_Oj7PwahkYUSneIrjn2mXwo0m6b27dTCZhAwWXFWqUA,221
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt,sha256=xREYVDbYmOz5vpSU0A6Lijb_I--zz6JSTmirxyX0dwI,30
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml,sha256=wOqz5rtWp7v_FoaqO9EongpMZbkdDEysmuOn9W-2K0g,1567
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml,sha256=CFRzu5Eh6BBI5VX8OeG-u7UXTY6X_Eh2iESsbQ1sJmg,1287
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml,sha256=AlYwOIOPjoroT75_EIm0OZwkpIF39sliNqTfjIE9T2k,1594
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml,sha256=mPS3D0gwSPasPwEARAbHhUwDYJHND7D3fewoiBtvU-8,1314
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml,sha256=AQZvF8Jc-R6IQtMXOsKlTj6CcCgqY-Y3CvlXy4HNDGQ,2335
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml,sha256=wYdG43pQEqgOvrNQQdENe5vnD7Y1wbXt4G2N43l4b5A,485
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check,sha256=7lnVTaaoUrC5MPGpwH2IWbzYc2KaeQMWguahsoY9Rf8,615
@@ -128,8 +128,8 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-app
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/north.svg,sha256=rnHO-cNiy9ZyfwvI-o2dYipzuu-vh9rn0nE45FjfOPo,2925
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/results.jrxml,sha256=gf5grUvt-oG_H0LnsNvBWMDGqvH3uuW_wfy0O-n5ui4,1309
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/qgisserver/pg_service.conf.tmpl,sha256=WcjfsfsfNLHAfbg84HgEIb64EDnnJJWGnyAdPTXD0PI,296
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup,sha256=ICon_ZLnjNcE3GM9RNulkyDvAG2Dn9uOgxr9xK_ki7A,4251
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore,sha256=ZfWPZY0tcmQ32aEjlMdFjRB_7IlmwCPjAHDC6fWhBrc,4441
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup,sha256=nE7vMj42Eoi3A2HivX9b9KSjioKrG9sksWOJy0Je36Q,4446
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore,sha256=_AeXNkjTmhsBPJ4JrGzbl3uEpQw0VLVAIqLBOFJ6t1A,4637
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py,sha256=VBcCdHJokg4UKA2hzM_xVElQCnBqJ7O8NVO1Iro7-t0,1564
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl,sha256=y-X8uAZP9mEq3k6NygBI_FynZeEQ_IatFPXkzWs5UAQ,6181
@@ -184,8 +184,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.8.1.124.dist-info/METADATA,sha256=t1OWZHhe9H5gYJwLEQuY37nbg3mIrzf29NFxtoqQC0I,2140
-c2cgeoportal_geoportal-2.8.1.124.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.124.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.124.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.124.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.8.1.126.dist-info/METADATA,sha256=bj7ZK6NjP-Pt4uldDJK1h94OIslszbTNmWnosraeV6o,2140
+c2cgeoportal_geoportal-2.8.1.126.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.8.1.126.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
+c2cgeoportal_geoportal-2.8.1.126.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.8.1.126.dist-info/RECORD,,