diff --git a/koswat/calculations/outside_slope_reinforcement/cofferdam/cofferdam_input_profile.py b/koswat/calculations/outside_slope_reinforcement/cofferdam/cofferdam_input_profile.py index cba564fe..d7214aa1 100644 --- a/koswat/calculations/outside_slope_reinforcement/cofferdam/cofferdam_input_profile.py +++ b/koswat/calculations/outside_slope_reinforcement/cofferdam/cofferdam_input_profile.py @@ -1,6 +1,7 @@ from __future__ import annotations -from dataclasses import dataclass + import math +from dataclasses import dataclass from koswat.calculations.protocols import ReinforcementProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase diff --git a/koswat/calculations/standard_reinforcement/piping_wall/piping_wall_input_profile.py b/koswat/calculations/standard_reinforcement/piping_wall/piping_wall_input_profile.py index 68b1cbd3..41fbb2e6 100644 --- a/koswat/calculations/standard_reinforcement/piping_wall/piping_wall_input_profile.py +++ b/koswat/calculations/standard_reinforcement/piping_wall/piping_wall_input_profile.py @@ -1,6 +1,7 @@ from __future__ import annotations -from dataclasses import dataclass + import math +from dataclasses import dataclass from koswat.calculations.protocols import ReinforcementInputProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase diff --git a/koswat/calculations/standard_reinforcement/soil/soil_input_profile.py b/koswat/calculations/standard_reinforcement/soil/soil_input_profile.py index 89bd973c..b7e15c87 100644 --- a/koswat/calculations/standard_reinforcement/soil/soil_input_profile.py +++ b/koswat/calculations/standard_reinforcement/soil/soil_input_profile.py @@ -1,7 +1,9 @@ from dataclasses import dataclass + from koswat.calculations.protocols import ReinforcementInputProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase + @dataclass class SoilInputProfile(KoswatInputProfileBase, ReinforcementInputProfileProtocol): pass diff --git a/koswat/calculations/standard_reinforcement/stability_wall/stability_wall_input_profile.py b/koswat/calculations/standard_reinforcement/stability_wall/stability_wall_input_profile.py index c7a82c92..2e08d840 100644 --- a/koswat/calculations/standard_reinforcement/stability_wall/stability_wall_input_profile.py +++ b/koswat/calculations/standard_reinforcement/stability_wall/stability_wall_input_profile.py @@ -1,6 +1,7 @@ from __future__ import annotations -from dataclasses import dataclass + import math +from dataclasses import dataclass from koswat.calculations.protocols import ReinforcementProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase diff --git a/koswat/configuration/settings/koswat_scenario.py b/koswat/configuration/settings/koswat_scenario.py index 3b7174e9..2903c3fc 100644 --- a/koswat/configuration/settings/koswat_scenario.py +++ b/koswat/configuration/settings/koswat_scenario.py @@ -1,7 +1,7 @@ from __future__ import annotations -from dataclasses import dataclass import math +from dataclasses import dataclass from koswat.configuration.koswat_config_protocol import KoswatConfigProtocol diff --git a/koswat/dike/profile/koswat_input_profile_base.py b/koswat/dike/profile/koswat_input_profile_base.py index de10c41f..24387129 100644 --- a/koswat/dike/profile/koswat_input_profile_base.py +++ b/koswat/dike/profile/koswat_input_profile_base.py @@ -1,6 +1,7 @@ from __future__ import annotations -from dataclasses import dataclass + import math +from dataclasses import dataclass from koswat.dike.koswat_input_profile_protocol import KoswatInputProfileProtocol diff --git a/tests/acceptance_scenarios/acceptance_test_scenario_dataclasses.py b/tests/acceptance_scenarios/acceptance_test_scenario_dataclasses.py index 641604b3..84672d1a 100644 --- a/tests/acceptance_scenarios/acceptance_test_scenario_dataclasses.py +++ b/tests/acceptance_scenarios/acceptance_test_scenario_dataclasses.py @@ -1,5 +1,7 @@ from __future__ import annotations + from dataclasses import dataclass +from itertools import product from pathlib import Path import pytest @@ -7,9 +9,7 @@ from koswat.configuration.settings.koswat_scenario import KoswatScenario from koswat.dike.koswat_profile_protocol import KoswatProfileProtocol from koswat.dike.profile.koswat_input_profile_base import KoswatInputProfileBase -from itertools import product from koswat.dike.profile.koswat_profile import KoswatProfileBase - from koswat.dike.profile.koswat_profile_builder import KoswatProfileBuilder from tests import test_data diff --git a/tests/acceptance_scenarios/cases_protocol.py b/tests/acceptance_scenarios/cases_protocol.py index 9e66e0a5..0f95dc23 100644 --- a/tests/acceptance_scenarios/cases_protocol.py +++ b/tests/acceptance_scenarios/cases_protocol.py @@ -1,4 +1,5 @@ from typing import Protocol + import pytest diff --git a/tests/acceptance_scenarios/initial_characteristic_points_cases.py b/tests/acceptance_scenarios/initial_characteristic_points_cases.py index f4b6650b..fb7723d6 100644 --- a/tests/acceptance_scenarios/initial_characteristic_points_cases.py +++ b/tests/acceptance_scenarios/initial_characteristic_points_cases.py @@ -1,7 +1,8 @@ import pytest -from tests.acceptance_scenarios.cases_protocol import CasesProtocol from shapely.geometry.point import Point +from tests.acceptance_scenarios.cases_protocol import CasesProtocol + class InitialPointsLookup(CasesProtocol): default = [ diff --git a/tests/acceptance_scenarios/layers_cases.py b/tests/acceptance_scenarios/layers_cases.py index 126d6981..f1a285df 100644 --- a/tests/acceptance_scenarios/layers_cases.py +++ b/tests/acceptance_scenarios/layers_cases.py @@ -1,4 +1,5 @@ import pytest + from koswat.dike.material.koswat_material_type import KoswatMaterialType from tests.acceptance_scenarios.acceptance_test_scenario_dataclasses import ( LayersTestCase, diff --git a/tests/calculations/reinforcement_profile_cases.py b/tests/calculations/reinforcement_profile_cases.py index aa579d4a..52cb4c55 100644 --- a/tests/calculations/reinforcement_profile_cases.py +++ b/tests/calculations/reinforcement_profile_cases.py @@ -1,11 +1,11 @@ from dataclasses import dataclass + from koswat.calculations.outside_slope_reinforcement.cofferdam.cofferdam_input_profile import ( CofferDamInputProfile, ) from koswat.calculations.outside_slope_reinforcement.cofferdam.cofferdam_reinforcement_profile import ( CofferdamReinforcementProfile, ) - from koswat.calculations.protocols.reinforcement_profile_protocol import ( ReinforcementProfileProtocol, ) diff --git a/tests/calculations/test_reinforcement_profile_builder_factory.py b/tests/calculations/test_reinforcement_profile_builder_factory.py index 57645c2f..3b440086 100644 --- a/tests/calculations/test_reinforcement_profile_builder_factory.py +++ b/tests/calculations/test_reinforcement_profile_builder_factory.py @@ -83,10 +83,10 @@ from tests.acceptance_scenarios.layers_cases import LayersCases from tests.calculations import validated_reinforced_profile from tests.calculations.reinforcement_profile_cases import ( + ReinforcementProfileCase, ReinforcementProfileCaseCombination, reinforcement_profile_cases, ) -from tests.calculations.reinforcement_profile_cases import ReinforcementProfileCase def scenario_ini_file() -> List[pytest.param]: