c2cgeoportal-geoportal 2.7.1.117__py2.py3-none-any.whl → 2.7.1.119__py2.py3-none-any.whl

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

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

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

@@ -47,6 +47,9 @@ 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("env_files", nargs="*", help="The environment config")
     args = parser.parse_args()
 
@@ -118,13 +121,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"], check=True)  # nosec
+                run(args, [*docker_compose, "pull", "--ignore-pull-failures"], check=True)  # nosec
             docker_compose_build_cmd.append("--pull")
 
         if args.service:
@@ -143,15 +147,15 @@ def main() -> None:
         services = [
             service
             for service in subprocess.run(
-                ["docker-compose", "ps", "--services", "--all"], stdout=subprocess.PIPE, check=True
+                [*docker_compose, "ps", "--services", "--all"], stdout=subprocess.PIPE, check=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)
+        run(args, [*docker_compose, "rm", "--stop", "--force"] + services, check=True)
+        run(args, [*docker_compose, "up", "-d"], check=True)
 
 
 if __name__ == "__main__":

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021, 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",
                     "db",
                     "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, 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",
                     "db",

{c2cgeoportal_geoportal-2.7.1.117.dist-info → c2cgeoportal_geoportal-2.7.1.119.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.7.1.117.dist-info → c2cgeoportal_geoportal-2.7.1.119.dist-info}/RECORD

@@ -66,7 +66,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierrc.yam
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile,sha256=I7zAT84Zl0wnySi-tNtdcmEAKwdJE_EssMRh0cYpygU,3360
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile,sha256=XIQPnoU13Rbs2aW4o_J-XCS1VJb_AaEw4RB6X7FYgCI,715
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/README.rst,sha256=PvydIFv4NS8CMqmLrCTm2TvIS0GNkWgiI-VwQvWBF5o,423
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=wQlAoqaLdWq5LovlQmBPZ074GQOm2j9b3KbfK5seKzI,6167
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build,sha256=BX9vJe_BZbCOaGZFgG-PDL6QGLa2dzWnBI2TB2I1NAU,6388
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml,sha256=5RIgWl2euVaLISVCrNQaFZlVlslLPcDVK8YEZCYzHE4,12310
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml,sha256=xmO_qOwrz1Ebwv6sUsf3MDZ90yIGdLlxXp7kqditos4,2526
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml,sha256=BHj_UT6RpGEz-sue2MrTVOCENtKYSWZ_YTSbp5ud28E,2429
@@ -77,8 +77,8 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml,
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/run_alembic.sh,sha256=NuOhKZtrcv-UWVDkmTiNaT6Wcls9fXoHcO0oQjAdI6o,233
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/setup.cfg,sha256=_Oj7PwahkYUSneIrjn2mXwo0m6b27dTCZhAwWXFWqUA,221
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt,sha256=KTgED03w1otAkv8iINTId8NbctCOmms6-AE99xnv4uE,13
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml,sha256=qe-eeRDRyRyrSokCvbEcMzvbQMFi10cUEZt9i52uuUs,1257
-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=2b2gSzQ9qPmbw5MqDMPYQjoehZf60BDD-sh4fE3Ejc8,1284
+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=zOrcFS_Fhf3jUB5qxeq3Kgqg7aSa2PqalhJe69sHZuo,2216
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml,sha256=V8VoRZraesWsS3MwXyEVsJ0VmzvZ_EQepwVtvgag2_0,532
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt,sha256=ae22jZH3ftR2mGsZJg7B0yRJrvfSfpZJlG3x_qxmQ8g,18
@@ -125,8 +125,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=AkEBTh11f4R0xrhbtvIYebBz9Ss-NY6ftOKdJ-aCFYc,4243
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore,sha256=Tsw4hSNeELxL3y7kiZ_d04vdJDagAa1yXr_xSqnqDB4,4433
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup,sha256=g-lfrOCos04wc6c9Y_jYgqPU0YiGavgblH54U03LNM0,4443
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore,sha256=C4SEV-V7GQ0BJPRpVC2kcQuNUENkbWxHryxrbGejI1k,4634
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl,sha256=y-X8uAZP9mEq3k6NygBI_FynZeEQ_IatFPXkzWs5UAQ,6181
 c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json,sha256=x3FFn3b67GPGCsjg36iGXCudjaTSfwGHcwHS6HHVpPQ,539
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml,sha256=GUyQ0qiRKH58NwOGTwSQPSTZYL345FmOEDUZa0cReaM,6781
@@ -178,8 +178,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=CrYzEnYjowvDJxJp56gEAaUEk5vX
 tests/test_raster.py,sha256=oRyOc90WixD9Y-iR3pMdkHuR0JwKART9DxNH5QwyilM,12074
 tests/test_wmstparsing.py,sha256=ZAlL6OQkYmzFTKu70OQ6Xej-7ZNB7UltSs2V_PbXDac,9135
 tests/xmlstr.py,sha256=vIvIFWIE2GFUMfAtG0hTMZC2jx-pQBuzOOq2FjQlyjA,6010
-c2cgeoportal_geoportal-2.7.1.117.dist-info/METADATA,sha256=0d3OZmgxDqnR-qPR-9MBH4F-2bKDWoFoQeLy-OU-jEI,2036
-c2cgeoportal_geoportal-2.7.1.117.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.7.1.117.dist-info/entry_points.txt,sha256=_EqfKA_CKejpkgK0xWDTB9K8an0TKqIWHoyCJrRpU80,1414
-c2cgeoportal_geoportal-2.7.1.117.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.7.1.117.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.7.1.119.dist-info/METADATA,sha256=tbU8q-VJswydWo9hn4MB0UmsdcRrFa5PiPzcRW6XFn8,2036
+c2cgeoportal_geoportal-2.7.1.119.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+c2cgeoportal_geoportal-2.7.1.119.dist-info/entry_points.txt,sha256=_EqfKA_CKejpkgK0xWDTB9K8an0TKqIWHoyCJrRpU80,1414
+c2cgeoportal_geoportal-2.7.1.119.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.7.1.119.dist-info/RECORD,,