Skip to content

Commit

Permalink
there is change in antarescraft
Browse files Browse the repository at this point in the history
  • Loading branch information
killian-scalian committed Jan 23, 2025
1 parent f9b6ea5 commit d37b139
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
15 changes: 8 additions & 7 deletions tests/antares_historic/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
ThermalClusterProperties,
ThermalCostGeneration,
)
from antares.craft.tools.ini_tool import IniFile, IniFileTypes
from antares.craft.tools.ini_tool import IniFile
from antares.craft.tools.ini_tool import InitializationFilesTypes


@pytest.fixture
Expand Down Expand Up @@ -117,23 +118,23 @@ def default_thermal_cluster_properties() -> ThermalClusterProperties:
def actual_thermal_list_ini(local_study_w_thermal) -> IniFile:
return IniFile(
local_study_w_thermal.service.config.study_path,
IniFileTypes.THERMAL_LIST_INI,
InitializationFilesTypes.THERMAL_LIST_INI,
area_id="fr",
)


@pytest.fixture
def actual_thermal_areas_ini(local_study_w_thermal) -> IniFile:
return IniFile(
local_study_w_thermal.service.config.study_path, IniFileTypes.THERMAL_AREAS_INI
local_study_w_thermal.service.config.study_path, InitializationFilesTypes.THERMAL_AREAS_INI
)


@pytest.fixture
def actual_adequacy_patch_ini(local_study_w_areas) -> IniFile:
return IniFile(
local_study_w_areas.service.config.study_path,
IniFileTypes.AREA_ADEQUACY_PATCH_INI,
InitializationFilesTypes.AREA_ADEQUACY_PATCH_INI,
area_id="fr",
)

Expand Down Expand Up @@ -169,7 +170,7 @@ def default_renewable_cluster_properties() -> RenewableClusterProperties:
def actual_renewable_list_ini(local_study_with_renewable) -> IniFile:
return IniFile(
local_study_with_renewable.service.config.study_path,
IniFileTypes.RENEWABLES_LIST_INI,
InitializationFilesTypes.RENEWABLES_LIST_INI,
area_id="fr",
)

Expand Down Expand Up @@ -199,7 +200,7 @@ def default_st_storage_properties() -> STStorageProperties:
def actual_st_storage_list_ini(local_study_with_st_storage) -> IniFile:
return IniFile(
local_study_with_st_storage.service.config.study_path,
IniFileTypes.ST_STORAGE_LIST_INI,
InitializationFilesTypes.ST_STORAGE_LIST_INI,
area_id="fr",
)

Expand Down Expand Up @@ -234,7 +235,7 @@ def default_hydro_properties() -> HydroProperties:
@pytest.fixture
def actual_hydro_ini(local_study_with_hydro) -> IniFile:
return IniFile(
local_study_with_hydro.service.config.study_path, IniFileTypes.HYDRO_INI
local_study_with_hydro.service.config.study_path, InitializationFilesTypes.HYDRO_INI
)


Expand Down
15 changes: 8 additions & 7 deletions tests/input_converter/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
ThermalClusterProperties,
ThermalCostGeneration,
)
from antares.craft.tools.ini_tool import IniFile, IniFileTypes
from antares.craft.tools.ini_tool import IniFile
from antares.craft.tools.ini_tool import InitializationFilesTypes


@pytest.fixture
Expand Down Expand Up @@ -117,23 +118,23 @@ def default_thermal_cluster_properties() -> ThermalClusterProperties:
def actual_thermal_list_ini(local_study_w_thermal) -> IniFile:
return IniFile(
local_study_w_thermal.service.config.study_path,
IniFileTypes.THERMAL_LIST_INI,
InitializationFilesTypes.THERMAL_LIST_INI,
area_id="fr",
)


@pytest.fixture
def actual_thermal_areas_ini(local_study_w_thermal) -> IniFile:
return IniFile(
local_study_w_thermal.service.config.study_path, IniFileTypes.THERMAL_AREAS_INI
local_study_w_thermal.service.config.study_path, InitializationFilesTypes.THERMAL_AREAS_INI
)


@pytest.fixture
def actual_adequacy_patch_ini(local_study_w_areas) -> IniFile:
return IniFile(
local_study_w_areas.service.config.study_path,
IniFileTypes.AREA_ADEQUACY_PATCH_INI,
InitializationFilesTypes.AREA_ADEQUACY_PATCH_INI,
area_id="fr",
)

Expand Down Expand Up @@ -169,7 +170,7 @@ def default_renewable_cluster_properties() -> RenewableClusterProperties:
def actual_renewable_list_ini(local_study_with_renewable) -> IniFile:
return IniFile(
local_study_with_renewable.service.config.study_path,
IniFileTypes.RENEWABLES_LIST_INI,
InitializationFilesTypes.RENEWABLES_LIST_INI,
area_id="fr",
)

Expand Down Expand Up @@ -199,7 +200,7 @@ def default_st_storage_properties() -> STStorageProperties:
def actual_st_storage_list_ini(local_study_with_st_storage) -> IniFile:
return IniFile(
local_study_with_st_storage.service.config.study_path,
IniFileTypes.ST_STORAGE_LIST_INI,
InitializationFilesTypes.ST_STORAGE_LIST_INI,
area_id="fr",
)

Expand Down Expand Up @@ -234,7 +235,7 @@ def default_hydro_properties() -> HydroProperties:
@pytest.fixture
def actual_hydro_ini(local_study_with_hydro) -> IniFile:
return IniFile(
local_study_with_hydro.service.config.study_path, IniFileTypes.HYDRO_INI
local_study_with_hydro.service.config.study_path, InitializationFilesTypes.HYDRO_INI
)


Expand Down

0 comments on commit d37b139

Please sign in to comment.