Interrupted upgrade to master

Continuous integration · Continuous integration · commit c65b295d91a2 · 2025-11-07T16:25:49.000Z
diff --git a/.UPGRADE_INSTRUCTIONS b/.UPGRADE_INSTRUCTIONS
@@ -0,0 +1,6 @@
+The `create.diff` file is a recommendation of the changes that you should apply to your project.
+You should apply the changes shown in the diff file on `CONST_create_template/<file>` on your project's `<file>`.
+Some advice to be more efficient: if the changes on a file concern a file that you never customize, you can simply copy the new file from `CONST_create_template` (`cp CONST_create_template/<file> <file>`).You can furthermore add this file to the `unmanaged_files` section of the `project.yaml` file, to avoid its contents appearing in the diff file for the next upgrade.
+Note that you can also apply them using: git apply --3way create.diff
+To continue, type:
+./upgrade 2.10 11
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -42,7 +42,7 @@ jobs:
       - run: pre-commit run --all-files
       - run: git diff --exit-code --patch > /tmp/pre-commit.patch || true
         if: failure()
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: Apply pre-commit fix.patch
           path: /tmp/pre-commit.patch
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -47,6 +47,7 @@ repos:
   - repo: https://github.com/sbrunner/integrity-updater
     rev: 1.0.2
     hooks:
+<<<<<<< ours
       - id: integrity-updater
         files: |-
           (?x)^(
@@ -132,6 +133,11 @@ repos:
       - id: renovate-config-validator
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.13.1
+=======
+      - id: autoflake
+  - repo: https://github.com/PyCQA/isort
+    rev: 7.0.0
+>>>>>>> theirs
     hooks:
       - id: ruff-format
   - repo: https://github.com/sbrunner/python-versions-hook
diff --git a/.upgrade.yaml b/.upgrade.yaml
@@ -0,0 +1,67 @@
+---
+# The list (by include, exclude) of default files that will not be overwritten by the upgrade.
+# That that can be extended with managed_files or reduced with unmanaged_files from the
+# project.yaml file in the project root directory.
+default_project_file:
+  include:
+    - geoportal/setup\.py
+    - geoportal/vars\.yaml
+    - geoportal/Makefile
+    - geoportal/geomapfish_geoportal/__init__\.py
+    - geoportal/geomapfish_geoportal/templates/.*
+    - geoportal/geomapfish_geoportal/locale/.*
+    - geoportal/geomapfish_geoportal/static/.*
+    - geoportal/geomapfish_geoportal/static-ngeo/.*
+    - print/print-apps/.*
+    - mapserver/.*
+    - tilegeneration/config\.yaml\.tmpl
+    - project\.yaml
+    - docker-compose\.yaml
+    - env\.project
+    - README\.rst
+    - \.github/workflows/main\.yaml
+    - \.github/workflows/rebuild\.yaml
+  exclude:
+    - mapserver/demo\.map\.tmpl
+    - geoportal/geomapfish_geoportal/static-ngeo/js/apps/image/favicon\.ico
+
+# Files ignored when creating the diff files => will just be left untouched.
+no_diff:
+  - .*\.po
+  - CONST_.+
+  - .*/CONST_.+
+
+# Files that will be present in the CONST_create_template but will not be considered in the upgrade.
+# Used to provide the alt applications => does not disturb the user during upgrade.
+extra:
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/mobile_alt\.html\.ejs
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/oeedit\.html\.ejs
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile_alt\.js
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit\.js
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/mobile_alt\.scss
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_mobile_alt\.scss
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/oeedit\.scss
+  - geoportal/geomapfish_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss
+  - geoportal/interfaces/desktop_alt\.html\.mako
+  - geoportal/geomapfish_geoportal/static/images/background-layer-button\.png
+  - tests/test_testapp.py
+
+# Automated file system operations:
+# Remove some files or directories:
+#  - action: remove
+#    paths:
+#      - <one file or directory>
+# Move a file:
+#  - action: move
+#    from: <src file>
+#    to: <dst file>
+upgrade_files:
+  - action: remove
+    paths:
+      - geoportal/tools/extract-messages.js
+  - action: move
+    from: geoportal/lingua-server.cfg
+    to: geoportal/lingva-server.cfg
+  - action: move
+    from: geoportal/lingua-client.cfg
+    to: geoportal/lingva-client.cfg
diff --git a/CONST_create_template/.github/workflows/main.yaml b/CONST_create_template/.github/workflows/main.yaml
@@ -41,7 +41,7 @@ jobs:
       - run: pre-commit run --all-files
       - run: git diff --exit-code --patch > /tmp/pre-commit.patch || true
         if: failure()
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: Apply pre-commit fix.patch
           path: /tmp/pre-commit.patch
diff --git a/CONST_create_template/.pre-commit-config.yaml b/CONST_create_template/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
     hooks:
       - id: autoflake
   - repo: https://github.com/PyCQA/isort
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
diff --git a/create.diff b/create.diff
@@ -0,0 +1,26 @@
+diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
+index be9cd32..d6bc50d 100644
+--- a/.github/workflows/main.yaml
++++ b/.github/workflows/main.yaml
+@@ -41,7 +41,7 @@ jobs:
+       - run: pre-commit run --all-files
+       - run: git diff --exit-code --patch > /tmp/pre-commit.patch || true
+         if: failure()
+-      - uses: actions/upload-artifact@v4
++      - uses: actions/upload-artifact@v5
+         with:
+           name: Apply pre-commit fix.patch
+           path: /tmp/pre-commit.patch
+diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
+index 6449abb..3ad98ae 100644
+--- a/.pre-commit-config.yaml
++++ b/.pre-commit-config.yaml
+@@ -26,7 +26,7 @@ repos:
+     hooks:
+       - id: autoflake
+   - repo: https://github.com/PyCQA/isort
+-    rev: 6.1.0
++    rev: 7.0.0
+     hooks:
+       - id: isort
+   - repo: https://github.com/psf/black
diff --git a/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllerdesktop.js b/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllerdesktop.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016-2025 Camptocamp SA
+// Copyright (c) 2016-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleriframe_api.js b/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleriframe_api.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2015-2025 Camptocamp SA
+// Copyright (c) 2015-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile.js b/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controllermobile.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2015-2025 Camptocamp SA
+// Copyright (c) 2015-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit.js b/geoportal/geomapfish_geoportal/static-ngeo/js/apps/Controlleroeedit.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2016-2025 Camptocamp SA
+// Copyright (c) 2016-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/upgrade b/upgrade
@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+
+# Copyright (c) 2019-2025, Camptocamp SA
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of the FreeBSD Project.
+
+
+import argparse
+import os
+import platform
+import re
+import subprocess  # nosec
+import sys
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser(description="Upgrade the project")
+    parser.add_argument(
+        "--debug",
+        help="Path to c2cgeoportal source folder to be able to debug the upgrade procedure",
+    )
+    parser.add_argument("version", help="the version to upgrade to (master or x.y.z)")
+    parser.add_argument("step", nargs="?", help="the step to run")
+    parser_finalize = argparse.ArgumentParser(description="Upgrade the project", add_help=False)
+    parser_finalize.add_argument("--finalize", action="store_true", help="finalize the upgrade")
+    parser_finalize.add_argument("--help", action="help", help="show this help message and exit")
+    parser_finalize.add_argument("build_arg", nargs="*", help="build arguments")
+
+    if len(sys.argv) >= 2 and sys.argv[1] == "--finalize":
+        args = parser_finalize.parse_args()
+
+        if platform.system() == "Windows":
+            code = subprocess.call(["python", "build", *args.build_arg])
+        else:
+            code = subprocess.call(["./build", *args.build_arg])
+        if code != 0:
+            sys.exit(code)
+
+        subprocess.call(["docker", "compose", "down", "--remove-orphans"])
+        subprocess.call(
+            ["docker", "compose", "pull", "--ignore-pull-failures"],
+            env={**os.environ, "DOCKER_TAG": "unexisting"},
+        )
+        subprocess.check_call(["docker", "compose", "up", "-d"])
+        subprocess.check_call(
+            [
+                "docker",
+                "compose",
+                "exec",
+                "geoportal",
+                "alembic",
+                "--name=main",
+                "--config=alembic.ini",
+                "upgrade",
+                "head",
+            ],
+        )
+
+    else:
+        args = parser.parse_args()
+
+        c2cupgrade_args = ["--step", args.step] if args.step is not None else []
+
+        if os.environ.get("CI") != "true" and args.step is None:
+            major_version = args.version
+            match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9]+$", args.version)
+            if match is not None:
+                major_version = match.group(1)
+            match = re.match(r"^([0-9]+\.[0-9]+)\.[0-9a-z]+\.[0-9]+$", args.version)
+            if match is not None:
+                major_version = match.group(1)
+            if not args.debug:
+                subprocess.check_call(
+                    [
+                        "docker",
+                        "pull",
+                        f"ghcr.io/camptocamp/geomapfish:{major_version}",
+                    ],
+                )
+                subprocess.check_call(["docker", "pull", f"camptocamp/geomapfish-tools:{args.version}"])
+                subprocess.check_call(
+                    [
+                        "docker",
+                        "pull",
+                        f"ghcr.io/camptocamp/geomapfish-config:{major_version}",
+                    ],
+                )
+
+        additional_args = []
+        if args.debug:
+            additional_args.append(
+                f"--volume={args.debug}/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py:"
+                "/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal/scripts/c2cupgrade.py",
+            )
+
+        win = platform.system() == "Windows"
+        if not win:
+            home = os.path.expanduser("~")
+            additional_args.extend(
+                [
+                    # In the container the /tmp is the home directory of the user
+                    f"--volume={home}/.cache:/tmp/.cache",
+                ],
+            )
+
+            uid = subprocess.check_output(["id", "-u"]).decode().strip()
+            gid = subprocess.check_output(["id", "-g"]).decode().strip()
+            if not (uid.isdigit() and gid.isdigit()):
+                print("Error: Failed to retrieve numeric UID and GID from system commands.", file=sys.stderr)
+                sys.exit(1)
+            additional_args.append(f"--user={uid}:{gid}")
+
+        sys.exit(
+            subprocess.call(
+                [
+                    "docker",
+                    "run",
+                    "--rm",
+                    "--env=CI",
+                    f"--volume={os.getcwd()}:/src",
+                    *additional_args,
+                    f"ghcr.io/camptocamp/geomapfish-tools:{args.version}",
+                    "run-git",
+                    subprocess.check_output(["git", "config", "--get", "user.name"]).decode().strip(),
+                    subprocess.check_output(["git", "config", "--get", "user.email"]).decode().strip(),
+                    "/src",
+                    "c2cupgrade",
+                    *c2cupgrade_args,
+                ],
+            ),
+        )
+
+
+if __name__ == "__main__":
+    _main()
