v1.2.3

AntaresSimulatorTeam · Mar 15, 2023 · 1eaa2a6 · 1eaa2a6
2 parents 94d20b8 + 593b746
commit 1eaa2a6
Show file tree

Hide file tree

Showing 34 changed files with 512 additions and 430 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.2.3] - 2023-03-16
+
+- Correct download progress bar in logs [#40](https://github.com/AntaresSimulatorTeam/antares-launcher/pull/40)
+
+- Correct SLURM job status checking [#43](https://github.com/AntaresSimulatorTeam/antares-launcher/pull/43)
+
+### Fixes
+
 ## [1.2.2] - 2023-03-02
 
 ### Fixes
@@ -74,6 +82,8 @@
 - Remove unnecessary Optional
 - Enable ssh_config_file to be `None`
 
+[1.2.3]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.2.3
+
 [1.2.2]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.2.2
 
 [1.2.1]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.2.1

diff --git a/antareslauncher/__init__.py b/antareslauncher/__init__.py
@@ -9,9 +9,9 @@
 
 # Standard project metadata
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 __author__ = "RTE, Antares Web Team"
-__date__ = "2023-03-02"
+__date__ = "2023-03-16"
 # noinspection SpellCheckingInspection
 __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"
 

diff --git a/antareslauncher/main.py b/antareslauncher/main.py
@@ -179,10 +179,12 @@ def run_with(
 
 
 def verify_connection(connection, display):
+    # fmt: off
     if connection.test_connection():
         display.show_message(f"SSH connection to {connection.host} established", __name__)
     else:
         raise Exception(f"Could not establish SSH connection to {connection.host}")
+    # fmt: on
 
 
 def get_ssh_config_dict(file_manager, json_ssh_config, ssh_dict: dict):

diff --git a/antareslauncher/main_option_parser.py b/antareslauncher/main_option_parser.py
@@ -160,7 +160,7 @@ def add_basic_arguments(self) -> MainOptionParser:
         self.parser.add_argument(
             "--other-options",
             dest="other_options",
-            help='Other options to pass to the antares launcher script',
+            help="Other options to pass to the antares launcher script",
         )
 
         self.parser.add_argument(

diff --git a/antareslauncher/parameters_reader.py b/antareslauncher/parameters_reader.py
@@ -26,15 +26,15 @@ def __init__(self, json_ssh_conf: Path, yaml_filepath: Path):
         with open(Path(yaml_filepath)) as yaml_file:
             self.yaml_content = yaml.load(yaml_file, Loader=yaml.FullLoader) or {}
 
+        # fmt: off
         self._wait_time = self._get_compulsory_value("DEFAULT_WAIT_TIME")
         self.time_limit = self._get_compulsory_value("DEFAULT_TIME_LIMIT")
         self.n_cpu = self._get_compulsory_value("DEFAULT_N_CPU")
         self.studies_in_dir = os.path.expanduser(self._get_compulsory_value("STUDIES_IN_DIR"))
         self.log_dir = os.path.expanduser(self._get_compulsory_value("LOG_DIR"))
         self.finished_dir = os.path.expanduser(self._get_compulsory_value("FINISHED_DIR"))
-        self.ssh_conf_file_is_required = self._get_compulsory_value(
-            "SSH_CONFIG_FILE_IS_REQUIRED"
-        )
+        self.ssh_conf_file_is_required = self._get_compulsory_value("SSH_CONFIG_FILE_IS_REQUIRED")
+        # fmt: on
 
         alt1, alt2 = self._get_ssh_conf_file_alts()
         self.ssh_conf_alt1, self.ssh_conf_alt2 = alt1, alt2
@@ -50,7 +50,6 @@ def __init__(self, json_ssh_conf: Path, yaml_filepath: Path):
         )
 
     def get_parser_parameters(self):
-
         options = ParserParameters(
             default_wait_time=self._wait_time,
             default_time_limit=self.time_limit,
@@ -65,7 +64,6 @@ def get_parser_parameters(self):
         return options
 
     def get_main_parameters(self) -> MainParameters:
-
         main_parameters = MainParameters(
             json_dir=self.json_dir,
             default_json_db_name=self.json_db_name,
@@ -108,5 +106,7 @@ def _get_ssh_dict_from_json(self) -> Dict[str, Any]:
         with open(self.json_ssh_conf) as ssh_connection_json:
             ssh_dict = json.load(ssh_connection_json)
         if "private_key_file" in ssh_dict:
-            ssh_dict["private_key_file"] = os.path.expanduser(ssh_dict["private_key_file"])
+            ssh_dict["private_key_file"] = os.path.expanduser(
+                ssh_dict["private_key_file"]
+            )
         return ssh_dict
diff --git a/antareslauncher/remote_environnement/iremote_environment.py b/antareslauncher/remote_environnement/iremote_environment.py