From 4ac41f3692b977f5d357c5f11a162f97369aeab3 Mon Sep 17 00:00:00 2001 From: Laurent LAPORTE Date: Fri, 16 Jun 2023 19:07:40 +0200 Subject: [PATCH 1/2] style: reindent source code using Black --- .../test_integration_launch_controller.py | 10 +++++----- tests/unit/test_config.py | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tests/integration/test_integration_launch_controller.py b/tests/integration/test_integration_launch_controller.py index 378e5eb..412e5fa 100644 --- a/tests/integration/test_integration_launch_controller.py +++ b/tests/integration/test_integration_launch_controller.py @@ -92,11 +92,11 @@ def test_execute_command__called_with_the_correct_parameters( post_processing = False other_options = "" bash_options = ( - f'"{zipfile_name}"' - f" {study1.antares_version}" - f" {job_type}" - f" {post_processing}" - f" '{other_options}'" + f'"{zipfile_name}"' + f" {study1.antares_version}" + f" {job_type}" + f" {post_processing}" + f" '{other_options}'" ) command = ( f"cd {remote_base_path} && " diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py index c9045cf..5850686 100644 --- a/tests/unit/test_config.py +++ b/tests/unit/test_config.py @@ -363,7 +363,9 @@ def test_get_config_path__from_env__not_found(self, monkeypatch, tmp_path): with pytest.raises(ConfigFileNotFoundError): get_config_path() - @pytest.mark.parametrize("config_name", [None, CONFIGURATION_YAML, "my_config.yaml"]) + @pytest.mark.parametrize( + "config_name", [None, CONFIGURATION_YAML, "my_config.yaml"] + ) def test_get_config_path__from_user_config_dir( self, monkeypatch, tmp_path, config_name ): @@ -377,11 +379,17 @@ def test_get_config_path__from_user_config_dir( assert actual == config_path @pytest.mark.parametrize("relpath", ["", "data"]) - @pytest.mark.parametrize("config_name", [None, CONFIGURATION_YAML, "my_config.yaml"]) - def test_get_config_path__from_curr_dir(self, monkeypatch, tmp_path, relpath, config_name): + @pytest.mark.parametrize( + "config_name", [None, CONFIGURATION_YAML, "my_config.yaml"] + ) + def test_get_config_path__from_curr_dir( + self, monkeypatch, tmp_path, relpath, config_name + ): data_dir = tmp_path.joinpath(relpath) data_dir.mkdir(exist_ok=True) - config_path: pathlib.Path = tmp_path.joinpath(data_dir, config_name or CONFIGURATION_YAML) + config_path: pathlib.Path = tmp_path.joinpath( + data_dir, config_name or CONFIGURATION_YAML + ) config_path.touch() monkeypatch.delenv("ANTARES_LAUNCHER_CONFIG_PATH", raising=False) monkeypatch.chdir(tmp_path) From e147a80a8cd836e999811fbf65904488f63756e9 Mon Sep 17 00:00:00 2001 From: Laurent LAPORTE Date: Fri, 16 Jun 2023 19:08:08 +0200 Subject: [PATCH 2/2] build: prepare next minor release v1.3.0 (2023-06-16) --- CHANGES.md | 9 +++++++-- antareslauncher/__init__.py | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b959c87..5c74c68 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,11 @@ # Changelog -## [1.3.0] - (unreleased) +## [1.3.0] - 2023-06-16 + +### Changed + +- Remove "output" exclusion to allow Xpansion sensitivity (now driven by AntaREST) [#46](https://github.com/AntaresSimulatorTeam/antares-launcher/pull/46) + and [#51](https://github.com/AntaresSimulatorTeam/antares-launcher/pull/5111) ## [1.2.4] - 2023-03-21 @@ -90,7 +95,7 @@ - Remove unnecessary Optional - Enable ssh_config_file to be `None` -[1.3.0]: https://github.com/AntaresSimulatorTeam/antares-launcher/compare/v1.2.4...HEAD +[1.3.0]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.3.0 [1.2.4]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.2.4 diff --git a/antareslauncher/__init__.py b/antareslauncher/__init__.py index 389c164..9ce0ab1 100644 --- a/antareslauncher/__init__.py +++ b/antareslauncher/__init__.py @@ -11,7 +11,7 @@ __version__ = "1.3.0" __author__ = "RTE, Antares Web Team" -__date__ = "(unreleased)" +__date__ = "2023-06-16" # noinspection SpellCheckingInspection __credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"