From b477b159cc60df96c5ec230cd8d8db519f721f85 Mon Sep 17 00:00:00 2001 From: Jostein Solaas Date: Mon, 25 Sep 2023 13:46:22 +0200 Subject: [PATCH] refactor: move yaml system into package --- src/libecalc/input/mappers/component_mapper.py | 4 ++-- .../components/{ => system}/yaml_compressor_system.py | 0 .../yaml_types/components/{ => system}/yaml_pump_system.py | 0 .../input/yaml_types/components/yaml_generator_set.py | 6 +++--- .../input/yaml_types/components/yaml_installation.py | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/libecalc/input/yaml_types/components/{ => system}/yaml_compressor_system.py (100%) rename src/libecalc/input/yaml_types/components/{ => system}/yaml_pump_system.py (100%) diff --git a/src/libecalc/input/mappers/component_mapper.py b/src/libecalc/input/mappers/component_mapper.py index 732d2cd9b..4fd5e1f60 100644 --- a/src/libecalc/input/mappers/component_mapper.py +++ b/src/libecalc/input/mappers/component_mapper.py @@ -14,10 +14,10 @@ from libecalc.input.yaml.yaml_models.pyyaml_yaml_model import PyYamlYamlModel from libecalc.input.yaml_entities import References from libecalc.input.yaml_keywords import EcalcYamlKeywords -from libecalc.input.yaml_types.components.yaml_compressor_system import ( +from libecalc.input.yaml_types.components.system.yaml_compressor_system import ( YamlCompressorSystem as YamlCompressorSystem, ) -from libecalc.input.yaml_types.components.yaml_pump_system import ( +from libecalc.input.yaml_types.components.system.yaml_pump_system import ( YamlPumpSystem as YamlPumpSystem, ) from pydantic import ValidationError diff --git a/src/libecalc/input/yaml_types/components/yaml_compressor_system.py b/src/libecalc/input/yaml_types/components/system/yaml_compressor_system.py similarity index 100% rename from src/libecalc/input/yaml_types/components/yaml_compressor_system.py rename to src/libecalc/input/yaml_types/components/system/yaml_compressor_system.py diff --git a/src/libecalc/input/yaml_types/components/yaml_pump_system.py b/src/libecalc/input/yaml_types/components/system/yaml_pump_system.py similarity index 100% rename from src/libecalc/input/yaml_types/components/yaml_pump_system.py rename to src/libecalc/input/yaml_types/components/system/yaml_pump_system.py diff --git a/src/libecalc/input/yaml_types/components/yaml_generator_set.py b/src/libecalc/input/yaml_types/components/yaml_generator_set.py index 388a77f80..1112844e5 100644 --- a/src/libecalc/input/yaml_types/components/yaml_generator_set.py +++ b/src/libecalc/input/yaml_types/components/yaml_generator_set.py @@ -5,11 +5,11 @@ from libecalc.input.yaml_types.components.legacy.yaml_electricity_consumer import ( YamlElectricityConsumer, ) -from libecalc.input.yaml_types.components.yaml_category_field import CategoryField -from libecalc.input.yaml_types.components.yaml_compressor_system import ( +from libecalc.input.yaml_types.components.system.yaml_compressor_system import ( YamlCompressorSystem, ) -from libecalc.input.yaml_types.components.yaml_pump_system import YamlPumpSystem +from libecalc.input.yaml_types.components.system.yaml_pump_system import YamlPumpSystem +from libecalc.input.yaml_types.components.yaml_category_field import CategoryField from libecalc.input.yaml_types.yaml_placeholder_type import YamlPlaceholderType from libecalc.input.yaml_types.yaml_schema_helpers import ( replace_temporal_placeholder_property_with_legacy_ref, diff --git a/src/libecalc/input/yaml_types/components/yaml_installation.py b/src/libecalc/input/yaml_types/components/yaml_installation.py index 93291a993..4eb50b734 100644 --- a/src/libecalc/input/yaml_types/components/yaml_installation.py +++ b/src/libecalc/input/yaml_types/components/yaml_installation.py @@ -6,12 +6,12 @@ from libecalc.input.yaml_types.components.legacy.yaml_fuel_consumer import ( YamlFuelConsumer, ) -from libecalc.input.yaml_types.components.yaml_category_field import CategoryField -from libecalc.input.yaml_types.components.yaml_compressor_system import ( +from libecalc.input.yaml_types.components.system.yaml_compressor_system import ( YamlCompressorSystem, ) +from libecalc.input.yaml_types.components.system.yaml_pump_system import YamlPumpSystem +from libecalc.input.yaml_types.components.yaml_category_field import CategoryField from libecalc.input.yaml_types.components.yaml_generator_set import YamlGeneratorSet -from libecalc.input.yaml_types.components.yaml_pump_system import YamlPumpSystem from libecalc.input.yaml_types.emitters.yaml_direct_emitter import YamlDirectEmitter from libecalc.input.yaml_types.yaml_temporal_model import YamlTemporalModel from pydantic import Field