Merge pull request #11779 from camptocamp/fix

Don't add and ignore apihelp phantomjs check
camptocamp · Mar 5, 2025 · 95741de · 95741de
2 parents 3435595 + 53cd40a
commit 95741de
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/...rtal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml b/...rtal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml
@@ -290,8 +290,6 @@ vars:
     #         longitudeFirst: True
     #         layers: []
     #       legend: {}
-    phantomjs:
-      disable: [apihelp]
 
   check_collector:
     hosts: []

diff --git a/...2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml b/...2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml
@@ -1233,9 +1233,6 @@ vars:
             no_redirect: 'true'
           environment: *phantomjs-env
           level: 6
-        - name: apihelp
-          environment: *phantomjs-env
-          level: 6
     routes:
       disable: []
       routes:

diff --git a/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py b/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2024, Camptocamp SA
+# Copyright (c) 2014-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -867,7 +867,7 @@ def step14(self, _: int) -> None:
         print("")
         branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode("utf-8").strip()
         print("Now all your files are committed; you should do a git push:")
-        print(f"git push {self.options.git_remote} {branch}.")
+        print(f"git push {self.options.git_remote} {branch}")
 
 
 def check_git_status_output(args: list[str] | None = None) -> str: