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

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.125.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.125
+Version: 2.8.1.126
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

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

@@ -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.125.dist-info/METADATA,sha256=xyY2SZnYXpLkaoIDjTjzsfGUELHqFffGVd2ve6K9n1k,2140
-c2cgeoportal_geoportal-2.8.1.125.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.125.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.125.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.125.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,,