v2.12.2 (#1347)

Co-authored-by: AssilMa <[email protected]>
Co-authored-by: MANSOURI Assil Ext <[email protected]>

antarest/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.12.1"
+__version__ = "2.12.2"
 
 from pathlib import Path
 

antarest/core/logging/utils.py

@@ -3,7 +3,7 @@
 import os
 import re
 import uuid
-from pythonjsonlogger.jsonlogger import JsonFormatter  # type: ignore
+from pythonjsonlogger.jsonlogger import JsonFormatter
 from contextvars import ContextVar, Token
 from typing import Optional, Type, Any, Dict
 

antarest/launcher/extensions/adequacy_patch/resources/post-processing-legacy.R

@@ -1,5 +1,6 @@
 library(AdequacyPatch)
 library(antaresRead)
+library(antaresEditObject)
 library(yaml)
 library(parallel)
 library(data.table)
@@ -10,7 +11,7 @@ opts <- setSimulationPath(".")
 print(readLayout(opts = opts))
 
 config <- read_yaml("user/adequacypatch/config.yml", fileEncoding = "UTF-8", text)
-areas = config$areas
+areas = setdiff(config$areas, config$excluded_areas)
 virutal_areas = config$areas
 mcYears = config$mcYears
 antaresfbzone = config$antaresfbzone
@@ -77,3 +78,4 @@ for (output in list.files("output")) {
     }
 }
 
+cleanUpOutput(areas = config$areas, opts = opts)

antarest/launcher/extensions/adequacy_patch/resources/post-processing.R

@@ -1,5 +1,6 @@
 library(AdequacyPatch)
 library(antaresRead)
+library(antaresEditObject)
 library(yaml)
 library(parallel)
 library(data.table)
@@ -11,7 +12,7 @@ print(readLayout(opts = opts))
 
 config <- read_yaml("user/adequacypatch/config.yml", fileEncoding = "UTF-8", text)
 
-areas = config$areas
+areas = setdiff(config$areas, config$excluded_areas)
 virutal_areas = config$areas
 mcYears = config$mcYears
 antaresfbzone = config$antaresfbzone
@@ -78,4 +79,4 @@ for (output in list.files("output")) {
     }
 }
 
-
+cleanUpOutput(areas = config$areas, opts = opts)

requirements.txt

@@ -3,34 +3,34 @@
 mistune~=0.8.4
 m2r~=0.2.1
 
-jsonref~=0.2
-PyYAML~=5.4.1
-filelock~=3.4.2
-SQLAlchemy~=1.4.31
-redis~=4.1.2
-requests~=2.27.1
-pandas~=1.4.0
-numpy~=1.22.1
-fastapi[all]~=0.73.0
-fastapi-jwt-auth~=0.5.0
-python-multipart~=0.0.5
 aiofiles~=0.8.0
-Jinja2~=3.0.3
-uvicorn[standard]~=0.15.0
+alembic~=1.7.5
+asgi-ratelimit[redis]==0.7.0
 bcrypt~=3.2.0
+checksumdir~=1.2.0
+click~=8.0.3
 contextvars~=2.4
-scandir~=1.10.0
-starlette~=0.17.1
+fastapi-jwt-auth~=0.5.0
+fastapi[all]~=0.73.0
+filelock~=3.4.2
+gunicorn~=20.1.0
+Jinja2~=3.0.3
+jsonref~=0.2
 locust~=2.7.0
 MarkupSafe~=2.0.1
-checksumdir~=1.2.0
-pydantic~=1.9.0
-gunicorn~=20.1.0
-alembic~=1.7.5
+numpy~=1.22.1
+pandas~=1.4.0
+plyer~=2.0.0
 psycopg2-binary==2.9.4
-python-json-logger~=2.0.2
-click~=8.0.3
+pydantic~=1.9.0
 PyQt5~=5.15.6
-plyer~=2.0.0
-asgi-ratelimit[redis]==0.7.0
-xarray
+python-json-logger~=2.0.7
+python-multipart~=0.0.5
+PyYAML~=5.4.1
+redis~=4.1.2
+requests~=2.27.1
+scandir~=1.10.0
+SQLAlchemy~=1.4.46
+starlette~=0.17.1
+uvicorn[standard]~=0.15.0
+xarray

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="AntaREST",
-    version="2.12.1",
+    version="2.12.2",
     description="Antares Server",
     long_description=long_description,
     long_description_content_type="text/markdown",

sonar-project.properties

@@ -6,5 +6,5 @@ sonar.exclusions=antarest/gui.py,antarest/main.py
 sonar.python.coverage.reportPaths=coverage.xml
 sonar.python.version=3.8
 sonar.javascript.lcov.reportPaths=webapp/coverage/lcov.info
-sonar.projectVersion=2.12.1
+sonar.projectVersion=2.12.2
 sonar.coverage.exclusions=antarest/gui.py,antarest/main.py,antarest/singleton_services.py,antarest/worker/archive_worker_service.py,webapp/**/*

webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antares-web",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "private": true,
   "dependencies": {
     "@emotion/react": "11.10.0",