Release/1.2.1 (#718)

* v1.2.0 * checkout files from release/1.1.0 --------- Co-authored-by: Jason Marechal <jason.marechal+github@gmail.com>
AntaresSimulatorTeam · Nov 17, 2023 · c0c7cef · c0c7cef
1 parent 436742c
commit c0c7cef
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 # Project configuration
 # ===========================================================================
 
-PROJECT(antaresXpansion VERSION 1.1.0)
+PROJECT(antaresXpansion VERSION 1.2.0)
 set(ANTARES_XPANSION_RC 0)
 
 # ===========================================================================

diff --git a/antares-version.json b/antares-version.json
@@ -1,7 +1,7 @@
 {
   "antares_version": "8.8.0-rc2",
   "antares_version_executable": "8.8",
-  "antares_xpansion_version": "1.1.0",
+  "antares_xpansion_version": "1.2.0",
   "antares_deps_version": "2.0.7",
   "minizip_ng_version": "3.0.6"
 }
diff --git a/docs/changelog/CHANGELOG.md b/docs/changelog/CHANGELOG.md
@@ -1,6 +1,19 @@
 Antares-Xpansion changelog
 =================
-v1.1 (TBA)
+
+v1.2 (10/2023)
+--------------------------------------------------------
+
+### Features
+
+- Support "named mps" from Antares simulator
+- Use Antares Simulator 8.8.0-rc2
+
+### Bug fixes
+
+- Fix issue on windows with concurrent access to log files
+
+v1.1 (09/2023)
 --------------------
 
 ### Features

diff --git a/docs/user-guide/performance-history/perf-graphs.ipynb b/docs/user-guide/performance-history/perf-graphs.ipynb
diff --git a/docs/user-guide/performance-history/perf_data.json b/docs/user-guide/performance-history/perf_data.json
@@ -34,6 +34,13 @@
                     "antares": 368,
                     "problem_generation": 440,
                     "benders": 2129
+                },
+                {
+                    "version": 1.1,
+                    "batch_size": 96,
+                    "antares": 363,
+                    "problem_generation": 453,
+                    "benders": 1111
                 }
             ]
         },
@@ -71,6 +78,13 @@
                     "antares": 436,
                     "problem_generation": 425,
                     "benders": 1805
+                },
+                {
+                    "version": 1.1,
+                    "batch_size": 96,
+                    "antares": 434,
+                    "problem_generation": 444,
+                    "benders": 980
                 }
             ]
         },
@@ -108,6 +122,13 @@
                     "antares": 364,
                     "problem_generation": 441,
                     "benders": 1497
+                },
+                {
+                    "version": 1.1,
+                    "batch_size": 96,
+                    "antares": 383,
+                    "problem_generation": 435,
+                    "benders": 1014
                 }
             ]
         },
@@ -145,6 +166,13 @@
                     "antares": 556,
                     "problem_generation": 472,
                     "benders": 859
+                },
+                {
+                    "version": 1.1,
+                    "batch_size": 96,
+                    "antares": 517,
+                    "problem_generation": 569,
+                    "benders": 521
                 }
             ]
         }

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.projectName=antares-xpansion
 sonar.projectKey=AntaresSimulatorTeam_antares-xpansion
 sonar.organization=antaressimulatorteam
-sonar.projectVersion=1.1.0
+sonar.projectVersion=1.2.0
 
 # =====================================================
 #   Properties that will be shared amongst all modules