Skip to content

Commit

Permalink
Merge pull request #53 from AntaresSimulatorTeam/release/1.3.0
Browse files Browse the repository at this point in the history
v1.3.0
  • Loading branch information
laurent-laporte-pro authored Jun 16, 2023
2 parents 622bc22 + e147a80 commit 329dbee
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
9 changes: 7 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion antareslauncher/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/test_integration_launch_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -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} && "
Expand Down
16 changes: 12 additions & 4 deletions tests/unit/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
):
Expand All @@ -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)
Expand Down

0 comments on commit 329dbee

Please sign in to comment.