c2cgeoportal-geoportal 2.8.1.121__py2.py3-none-any.whl → 2.8.1.125__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}}/ci/docker-compose-check

@@ -11,7 +11,7 @@ def _main() -> None:
 
     services = [
         s.strip()
-        for s in subprocess.run(["docker-compose", "ps"], check=True, stdout=subprocess.PIPE)
+        for s in subprocess.run(["docker", "compose", "ps"], check=True, stdout=subprocess.PIPE)
         .stdout.decode("utf-8")
         .splitlines()
     ]

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt

@@ -1 +1 @@
-c2cciutils[checks,publish]==1.4.17
+c2cciutils[checks,publish]==1.4.18

{c2cgeoportal_geoportal-2.8.1.121.dist-info → c2cgeoportal_geoportal-2.8.1.125.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.8.1.121.dist-info → c2cgeoportal_geoportal-2.8.1.125.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,12 +78,12 @@ 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=6gDur4jWECA1vaotrEeWksc5GwR1yYk_NMeKLYr-1vs,612
-c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt,sha256=cgEcUypqz4yoGsMG-4oRz1WZQBNG33JkV9jSOY5kaQ4,35
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check,sha256=7lnVTaaoUrC5MPGpwH2IWbzYc2KaeQMWguahsoY9Rf8,615
+c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt,sha256=kPFzRZUf8r79TTfRpX5wv3RCS0UTe1sstEakEDpOxa0,35
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml,sha256=fj2cC59FhAQeE7TDSpX0ZNY-XOksOolt3r7bRknisio,11635
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/locale/en/LC_MESSAGES/{{cookiecutter.package}}_geoportal-client.po,sha256=hKLs5f7EJz05ACRtyTlCtssCo99PMuj-FfOJXchMZFk,162
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/robot.txt.tmpl,sha256=JR_vIqMlHq1oSgyWPN2mtZyEpsqhjKQQecaW2pxvK54,88
@@ -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.121.dist-info/METADATA,sha256=BHKhy-6F6BmA708JzIqzYfOHnW8hyCLdMhkA_48h6Ic,2140
-c2cgeoportal_geoportal-2.8.1.121.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-c2cgeoportal_geoportal-2.8.1.121.dist-info/entry_points.txt,sha256=w0xGr1Bo8q5GBFiP4JgqbSIg-bNhG7bsGoEaGSTfzaE,1415
-c2cgeoportal_geoportal-2.8.1.121.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.8.1.121.dist-info/RECORD,,
+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,,