Merge pull request #532 from AntaresSimulatorTeam/dev

Fix output parameter reader
AntaresSimulatorTeam · Sep 30, 2021 · 5ab10b4 · 5ab10b4
2 parents e5896eb + cdef83f
commit 5ab10b4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/antarest/__init__.py b/antarest/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 
 from pathlib import Path
 

diff --git a/antarest/study/storage/rawstudy/model/filesystem/config/files.py b/antarest/study/storage/rawstudy/model/filesystem/config/files.py
@@ -156,7 +156,9 @@ def parse_simulation(path: Path) -> "Simulation":
 
     @staticmethod
     def _parse_outputs_parameters(path: Path) -> Tuple[int, bool, bool]:
-        par: JSON = IniReader().read(path / "about-the-study/parameters.ini")
+        par: JSON = MultipleSameKeysIniReader(["+", "-"]).read(
+            path / "about-the-study/parameters.ini"
+        )
         return (
             par["general"]["nbyears"],
             par["general"]["year-by-year"],

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="AntaREST",
-    version="2.0.0",
+    version="2.0.1",
     description="Antares Server",
     long_description=long_description,
     long_description_content_type="text/markdown",

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -3,4 +3,4 @@ sonar.projectKey=AntaresSimulatorTeam_api-iso-antares
 sonar.sources=antarest
 sonar.language=python
 sonar.python.coverage.reportPaths=coverage.xml
-sonar.projectVersion=2.0
+sonar.projectVersion=2.0.1
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antares-web",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.35",

diff --git a/webapp/src/components/UserBadge.tsx b/webapp/src/components/UserBadge.tsx
@@ -11,8 +11,6 @@ import { getUser } from '../services/api/user';
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
     root: {
-      width: '160px',
-      height: '210px',
       display: 'flex',
       flexDirection: 'column',
     },