From a34780f69b2c724bb8563e17e57a47e0fe0a2350 Mon Sep 17 00:00:00 2001 From: Juliette-Gerbaux Date: Mon, 26 Aug 2024 10:12:44 +0200 Subject: [PATCH] Fix ci --- tests/functional/conftest.py | 6 +++--- .../thermal_heuristic/test_thermal_heuristic_one_cluster.py | 4 +--- .../test_thermal_heuristic_one_cluster_with_ramp.py | 4 +--- .../test_thermal_heuristic_three_clusters.py | 4 +--- .../test_thermal_heuristic_two_clusters_low_load.py | 4 +--- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py index 60d42a6..8de98bd 100644 --- a/tests/functional/conftest.py +++ b/tests/functional/conftest.py @@ -13,8 +13,8 @@ from pathlib import Path from typing import List, Tuple -import pytest import ortools.linear_solver.pywraplp as pywraplp +import pytest from andromede.libs.standard import ( DEMAND_MODEL, @@ -23,17 +23,17 @@ UNSUPPLIED_ENERGY_MODEL, ) from andromede.model import Model -from andromede.study.parsing import InputComponents from andromede.model.parsing import parse_yaml_library from andromede.model.resolve_library import resolve_library from andromede.simulation import OutputValues -from andromede.thermal_heuristic.time_scenario_parameter import BlockScenarioIndex +from andromede.study.parsing import InputComponents from andromede.thermal_heuristic.problem import ( BlockScenarioIndex, TimeScenarioHourParameter, get_heuristic_components, get_input_components, ) +from andromede.thermal_heuristic.time_scenario_parameter import BlockScenarioIndex from tests.functional.libs.lib_thermal_heuristic import THERMAL_CLUSTER_MODEL_MILP diff --git a/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster.py b/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster.py index 4c0aa36..2d5ed86 100644 --- a/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster.py +++ b/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster.py @@ -17,9 +17,7 @@ import ortools.linear_solver.pywraplp as pywraplp import pytest -from andromede.libs.standard import ( - BALANCE_PORT_TYPE, -) +from andromede.libs.standard import BALANCE_PORT_TYPE from andromede.simulation import OutputValues from andromede.study.data import ComponentParameterIndex from andromede.study.parsing import InputComponents diff --git a/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster_with_ramp.py b/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster_with_ramp.py index 36995c7..853b8dc 100644 --- a/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster_with_ramp.py +++ b/tests/functional/thermal_heuristic/test_thermal_heuristic_one_cluster_with_ramp.py @@ -17,9 +17,7 @@ import ortools.linear_solver.pywraplp as pywraplp import pytest -from andromede.libs.standard import ( - BALANCE_PORT_TYPE, -) +from andromede.libs.standard import BALANCE_PORT_TYPE from andromede.simulation import OutputValues from andromede.study.data import ComponentParameterIndex from andromede.study.parsing import InputComponents diff --git a/tests/functional/thermal_heuristic/test_thermal_heuristic_three_clusters.py b/tests/functional/thermal_heuristic/test_thermal_heuristic_three_clusters.py index 581c9a3..0fa876c 100644 --- a/tests/functional/thermal_heuristic/test_thermal_heuristic_three_clusters.py +++ b/tests/functional/thermal_heuristic/test_thermal_heuristic_three_clusters.py @@ -17,9 +17,7 @@ import ortools.linear_solver.pywraplp as pywraplp import pytest -from andromede.libs.standard import ( - BALANCE_PORT_TYPE, -) +from andromede.libs.standard import BALANCE_PORT_TYPE from andromede.simulation import OutputValues from andromede.study.parsing import InputComponents from andromede.thermal_heuristic.cluster_parameter import compute_slot_length diff --git a/tests/functional/thermal_heuristic/test_thermal_heuristic_two_clusters_low_load.py b/tests/functional/thermal_heuristic/test_thermal_heuristic_two_clusters_low_load.py index c31bd41..878b0a1 100644 --- a/tests/functional/thermal_heuristic/test_thermal_heuristic_two_clusters_low_load.py +++ b/tests/functional/thermal_heuristic/test_thermal_heuristic_two_clusters_low_load.py @@ -17,9 +17,7 @@ import ortools.linear_solver.pywraplp as pywraplp import pytest -from andromede.libs.standard import ( - BALANCE_PORT_TYPE, -) +from andromede.libs.standard import BALANCE_PORT_TYPE from andromede.simulation import OutputValues from andromede.study.parsing import InputComponents from andromede.thermal_heuristic.cluster_parameter import compute_slot_length