v2.17.6

Merge pull request #2159 from AntaresSimulatorTeam/release/2.17.6

.github/workflows/deploy.yml

@@ -18,6 +18,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: true
 
       - name: 🔗 Install wget for Windows
         if: matrix.os == 'windows-latest'
@@ -57,13 +58,16 @@ jobs:
         run: bash ./package_antares_web.sh
         working-directory: scripts
 
-      - name: 📜 Install changelog requirements
-        run: npm install -g auto-changelog
+      - name: Add installer to package
+        shell: bash
+        run: |
+          pip install hatch
+          ./package_antares_installer.sh
+        working-directory: scripts
 
-      - name: 📜️ Generate changelog file
+      - name: 📜️ Copy changelog file
         run: |
-          auto-changelog -l false --hide-empty-releases
-          mv CHANGELOG.md dist/package/CHANGELOG.md
+          cp docs/CHANGELOG.md dist/package/CHANGELOG.md
 
       - name: 📦 Archive Antares Desktop for Windows
         if: matrix.os == 'windows-latest'

.github/workflows/license_header.yml

@@ -0,0 +1,25 @@
+name: check license headers
+on:
+  push:
+    branches:
+      - "**"
+
+jobs:
+  check-license-headers:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout github repo (+ download lfs dependencies)
+        uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install click
+      - name: Check licenses header
+        run: |
+          python license_checker_and_adder.py --path=../antarest/ --action=check-strict
+          python license_checker_and_adder.py --path=../tests/  --action=check-strict
+        working-directory: scripts

.github/workflows/main.yml

@@ -53,46 +53,99 @@ jobs:
           pip install -r requirements-dev.txt
       - name: Test with pytest
         run: |
-          pytest --cov antarest --cov-report xml
-      - name: Fix code coverage paths
-        if: matrix.os == 'ubuntu-20.04'
-        run: |
-          sed -i 's/\/home\/runner\/work\/AntaREST\/AntaREST/\/github\/workspace/g' coverage.xml
+          pytest --cov antarest --cov-report xml -n auto
       - name: Archive code coverage results
         if: matrix.os == 'ubuntu-20.04'
         uses: actions/upload-artifact@v4
         with:
           name: python-code-coverage-report
           path: coverage.xml
 
-  npm-test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-20.04]
+  npm-setup:
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout github repo
         uses: actions/checkout@v4
-      - name: Set up Node.js ${{ matrix.node-version }}
+      - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 18.16.1
+      - name: Cache node modules
+        uses: actions/cache@v4
+        with:
+          path: webapp/node_modules
+          key: ${{ runner.os }}-webapp-node-modules-${{ hashFiles('webapp/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-webapp-node-modules-
+            ${{ runner.os }}-
+          save-always: true
       - name: Install dependencies
         run: npm install
         working-directory: webapp
-      - name: Build
-        run: npm run build
-        working-directory: webapp
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192
-          DISABLE_ESLINT_PLUGIN: true
+
+  npm-lint:
+    needs: npm-setup
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout github repo
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.16.1
+      - name: Restore node modules
+        uses: actions/cache@v4
+        with:
+          path: webapp/node_modules
+          key: ${{ runner.os }}-webapp-node-modules-${{ hashFiles('webapp/package-lock.json') }}
+          save-always: true
       - name: Lint
         run: npm run lint
         working-directory: webapp
+
+  npm-test:
+    needs: npm-setup
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout github repo
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.16.1
+      - name: Restore node modules
+        uses: actions/cache@v4
+        with:
+          path: webapp/node_modules
+          key: ${{ runner.os }}-webapp-node-modules-${{ hashFiles('webapp/package-lock.json') }}
+          save-always: true
       - name: Test
         run: npm run test
         working-directory: webapp
 
+  npm-build:
+    needs: npm-setup
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout github repo
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.16.1
+      - name: Restore node modules
+        uses: actions/cache@v4
+        with:
+          path: webapp/node_modules
+          key: ${{ runner.os }}-webapp-node-modules-${{ hashFiles('webapp/package-lock.json') }}
+          save-always: true
+      - name: Build
+        run: npm run build
+        working-directory: webapp
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
+          DISABLE_ESLINT_PLUGIN: true
+
   sonarcloud:
     runs-on: ubuntu-20.04
     needs: [python-test, npm-test]

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "installer"]
+	path = installer
+	url = https://github.com/AntaresSimulatorTeam/antares-web-installer.git

AUTHORS.txt

@@ -0,0 +1,25 @@
+Github identifiers of authors, in alphabetical order:
+
+3lbanna
+a-zakir
+cbion
+flomnes
+FrancoisJ
+GPivette
+hdinia
+Hyralc
+insatomcat
+laurent-laporte-pro
+mabw-rte
+makdeuneuv
+MartinBelthle
+maugde
+olfamizen
+pl-buiquang
+qdesmedt
+romeoadanhounme
+sgatto
+skamril
+sylvlecl
+TLAIDI
+Wintxer

antarest/__init__.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 """
 Antares Web
 
@@ -7,9 +19,9 @@
 
 # Standard project metadata
 
-__version__ = "2.17.5"
+__version__ = "2.17.6"
 __author__ = "RTE, Antares Web Team"
-__date__ = "2024-08-02"
+__date__ = "2024-09-25"
 # noinspection SpellCheckingInspection
 __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"
 

antarest/core/__init__.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.

antarest/core/cache/__init__.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.

antarest/core/cache/business/__init__.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.

antarest/core/cache/business/local_chache.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 import logging
 import threading
 import time

antarest/core/cache/business/redis_cache.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 import json
 import logging
 from typing import List, Optional

antarest/core/cache/main.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 import logging
 from typing import Optional
 

antarest/core/config.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 import multiprocessing
 import tempfile
 from dataclasses import asdict, dataclass, field

antarest/core/configdata/__init__.py

@@ -0,0 +1,11 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.

antarest/core/configdata/model.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 from enum import Enum
 from typing import Any, Optional
 

antarest/core/configdata/repository.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 import json
 from operator import and_
 from typing import Optional

antarest/core/core_blueprint.py

@@ -1,3 +1,15 @@
+# Copyright (c) 2024, RTE (https://www.rte-france.com)
+#
+# See AUTHORS.txt
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This file is part of the Antares project.
+
 import logging
 from typing import Any