chore: enable ruff for tests folder

jsolaas · jsolaas · commit 293a3b4df63e · 2026-01-07T15:26:09.000+01:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
     rev: 'v0.6.4'
     hooks:
       - id: ruff
-        files: ^(src/.*\.py|examples/.*\.ipynb)$
+        files: ^(src/.*\.py|tests/.*\.py)$
         exclude: gen/|\.git|\.hg|\.mypy_cache|\.tox|\.venv|_build|buck-out|build|dist
         args:
           - --fix
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -60,8 +60,8 @@ def disable_fault_handler():
 
         faulthandler.enable()
         faulthandler.disable()
-    except:
-        pass
+    except:  # noqa: E722, S110
+        pass  # noqa: S110
 
 
 def _round_floats(obj):
diff --git a/tests/ecalc_cli/test_app.py b/tests/ecalc_cli/test_app.py
@@ -4,8 +4,6 @@
 from os.path import getsize
 from pathlib import Path
 from typing import Literal, NamedTuple
-from unittest.mock import patch
-from uuid import uuid5, UUID
 
 import pandas as pd
 import pytest
diff --git a/tests/ecalc_cli/test_emission_intensity.py b/tests/ecalc_cli/test_emission_intensity.py
@@ -11,7 +11,7 @@
 from ecalc_cli.io.output import emission_intensity_to_csv
 from ecalc_cli.types import DateFormat
 from libecalc.common.datetime.utils import DateTimeFormats
-from libecalc.common.time_utils import Frequency, Periods, Period
+from libecalc.common.time_utils import Frequency, Period, Periods
 from libecalc.common.units import Unit
 from libecalc.common.utils.rates import RateType, TimeSeriesRate
 from libecalc.domain.regularity import Regularity
diff --git a/tests/ecalc_neqsim_wrapper/unit_tests/test_java_service.py b/tests/ecalc_neqsim_wrapper/unit_tests/test_java_service.py
@@ -1,8 +1,9 @@
 import pytest
+
 from ecalc_neqsim_wrapper.java_service import (
-    NeqsimService,
     NeqsimJPypeService,
     NeqsimPy4JService,
+    NeqsimService,
     ProgrammingError,
 )
 
diff --git a/tests/libecalc/common/test_graph.py b/tests/libecalc/common/test_graph.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 import pytest
 
diff --git a/tests/libecalc/common/test_list_utils.py b/tests/libecalc/common/test_list_utils.py
@@ -2,10 +2,10 @@
 import pytest
 
 from libecalc.common.list.list_utils import (
+    array_to_list,
     elementwise_multiplication,
     elementwise_sum,
     group_data_by_value_at_index,
-    array_to_list,
 )
 
 
diff --git a/tests/libecalc/common/test_variable_speed_compressor_chart_dto.py b/tests/libecalc/common/test_variable_speed_compressor_chart_dto.py
@@ -1,5 +1,4 @@
 import pytest
-
 from pydantic import ValidationError
 
 from libecalc.common.serializable_chart import ChartCurveDTO, ChartDTO
diff --git a/tests/libecalc/common/utils/test_math_utils.py b/tests/libecalc/common/utils/test_math_utils.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Optional, TypeVar
+from typing import TypeVar
 
 import pytest
 
diff --git a/tests/libecalc/common/utils/test_rates.py b/tests/libecalc/common/utils/test_rates.py
@@ -4,7 +4,7 @@
 import pytest
 from pydantic import ValidationError
 
-from libecalc.common.time_utils import Frequency, Period, Periods
+from libecalc.common.time_utils import Frequency, Periods
 from libecalc.common.units import Unit
 from libecalc.common.utils.rates import (
     Rates,
diff --git a/tests/libecalc/conftest.py b/tests/libecalc/conftest.py
@@ -8,9 +8,9 @@
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.consumer_function.direct_consumer_function import (
     DirectConsumerFunction,
 )
-from libecalc.domain.process.compressor.core.train.types import FluidStreamObjectForMultipleStreams
 from libecalc.domain.process.compressor.core.train.compressor_train_common_shaft import CompressorTrainCommonShaft
 from libecalc.domain.process.compressor.core.train.stage import CompressorTrainStage
+from libecalc.domain.process.compressor.core.train.types import FluidStreamObjectForMultipleStreams
 from libecalc.domain.process.entities.process_units.compressor.compressor import Compressor
 from libecalc.domain.process.entities.process_units.liquid_remover.liquid_remover import LiquidRemover
 from libecalc.domain.process.entities.process_units.mixer.mixer import Mixer
diff --git a/tests/libecalc/core/conftest.py b/tests/libecalc/core/conftest.py
@@ -14,17 +14,12 @@
 from libecalc.domain.process.compressor.core.sampled import CompressorModelSampled
 from libecalc.domain.process.pump.pump import PumpModel
 from libecalc.domain.process.value_objects.chart import Chart, ChartCurve
-from libecalc.domain.process.entities.shaft import VariableSpeedShaft
-from libecalc.domain.process.value_objects.chart.chart import ChartData
-from libecalc.domain.process.value_objects.fluid_stream.fluid_model import EoSModel, FluidComposition, FluidModel
 from libecalc.domain.regularity import Regularity
 from libecalc.dto.emission import Emission
 from libecalc.expression import Expression
-from libecalc.infrastructure.neqsim_fluid_provider.neqsim_fluid_factory import NeqSimFluidFactory
 from libecalc.presentation.yaml.domain.expression_time_series_variable import ExpressionTimeSeriesVariable
 from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
 from libecalc.presentation.yaml.mappers.charts.user_defined_chart_data import UserDefinedChartData
-from libecalc.presentation.yaml.mappers.fluid_mapper import DRY_MW_18P3, MEDIUM_MW_19P4, RICH_MW_21P4
 from libecalc.presentation.yaml.yaml_types.models import YamlTurbine
 from libecalc.testing.yaml_builder import YamlTurbineBuilder
 
diff --git a/tests/libecalc/core/models/compressor_modelling/conftest.py b/tests/libecalc/core/models/compressor_modelling/conftest.py
@@ -22,7 +22,6 @@
 from libecalc.domain.process.value_objects.chart import ChartCurve
 from libecalc.domain.process.value_objects.chart.chart import ChartData
 from libecalc.domain.process.value_objects.chart.compressor import CompressorChart
-from libecalc.infrastructure.neqsim_fluid_provider.neqsim_fluid_factory import NeqSimFluidFactory
 from libecalc.presentation.yaml.mappers.charts.user_defined_chart_data import UserDefinedChartData
 
 
@@ -295,7 +294,6 @@ def variable_speed_compressor_train_two_compressors_one_stream(
             connected_to_stage_no=0,
         ),
     ]
-    fluid_factory = NeqSimFluidFactory(fluid_model_medium)
     stage1 = compressor_stage_factory(
         compressor_chart_data=variable_speed_compressor_chart_data,
         inlet_temperature_kelvin=303.15,
diff --git a/tests/libecalc/core/models/compressor_modelling/test_compressor_model_vs_unisim.py b/tests/libecalc/core/models/compressor_modelling/test_compressor_model_vs_unisim.py
@@ -4,7 +4,6 @@
 
 from ecalc_neqsim_wrapper.thermo import STANDARD_PRESSURE_BARA, STANDARD_TEMPERATURE_KELVIN
 from libecalc.common.units import Unit
-from libecalc.domain.process.compressor.core.train.simplified_train.simplified_train import CompressorTrainSimplified
 from libecalc.domain.process.compressor.core.train.utils.enthalpy_calculations import (
     calculate_enthalpy_change_head_iteration,
 )
diff --git a/tests/libecalc/core/models/compressor_modelling/test_compressor_train_base.py b/tests/libecalc/core/models/compressor_modelling/test_compressor_train_base.py
@@ -1,4 +1,4 @@
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 import numpy as np
 import pytest
@@ -19,7 +19,6 @@ def compressor_train_two_stages(
         )
     )
 
-    fluid_factory_mock = Mock()
     return CompressorTrainModel(
         energy_usage_adjustment_constant=train.energy_usage_adjustment_constant,
         energy_usage_adjustment_factor=train.energy_usage_adjustment_factor,
diff --git a/tests/libecalc/core/models/compressor_modelling/test_compressor_train_common_shaft.py b/tests/libecalc/core/models/compressor_modelling/test_compressor_train_common_shaft.py
@@ -9,7 +9,7 @@
 from libecalc.domain.process.core.results.compressor import CompressorTrainCommonShaftFailureStatus
 from libecalc.domain.process.value_objects.chart.chart_area_flag import ChartAreaFlag
 from libecalc.domain.process.value_objects.fluid_stream import FluidComposition
-from libecalc.domain.process.value_objects.fluid_stream.fluid_model import FluidModel, EoSModel
+from libecalc.domain.process.value_objects.fluid_stream.fluid_model import EoSModel, FluidModel
 from libecalc.infrastructure.neqsim_fluid_provider.neqsim_fluid_factory import NeqSimFluidFactory
 
 
diff --git a/tests/libecalc/core/models/compressor_modelling/test_compressor_with_turbine.py b/tests/libecalc/core/models/compressor_modelling/test_compressor_with_turbine.py
@@ -2,7 +2,7 @@
 import pytest
 
 from libecalc.domain.process.compressor.core.base import CompressorWithTurbineModel
-from libecalc.domain.process.value_objects.fluid_stream import FluidComposition, EoSModel
+from libecalc.domain.process.value_objects.fluid_stream import EoSModel, FluidComposition
 from libecalc.domain.process.value_objects.fluid_stream.fluid_model import FluidModel
 from libecalc.infrastructure.neqsim_fluid_provider.neqsim_fluid_factory import NeqSimFluidFactory
 
diff --git a/tests/libecalc/core/models/test_consumer_tabular_energy_function.py b/tests/libecalc/core/models/test_consumer_tabular_energy_function.py
@@ -157,8 +157,7 @@ def test_ConsumerTabularEnergyFunction(tabular_consumer_function_factory, expres
     }
     n = len(next(iter(variable_values.values())))
     time_vector = [datetime(2020, 1, 1) + timedelta(days=i) for i in range(n + 1)]
-    values_variables_map = {header: values for header, values in variable_values.items()}
-
+    values_variables_map = dict(variable_values.items())
     expression_evaluator = expression_evaluator_factory.from_time_vector(
         time_vector=time_vector, variables=values_variables_map
     )
diff --git a/tests/libecalc/core/models/test_generator_model.py b/tests/libecalc/core/models/test_generator_model.py
@@ -1,5 +1,4 @@
 import numpy as np
-import pandas as pd
 
 from libecalc.domain.infrastructure.energy_components.generator_set import GeneratorSetModel
 from libecalc.presentation.yaml.yaml_entities import MemoryResource
diff --git a/tests/libecalc/domain/emission/test_emission_intensity.py b/tests/libecalc/domain/emission/test_emission_intensity.py
@@ -1,11 +1,11 @@
+import math
 from datetime import datetime
 
 import numpy as np
 
-import math
-from libecalc.common.time_utils import Frequency, Periods, Period
+from libecalc.common.time_utils import Frequency, Period, Periods
 from libecalc.common.units import Unit
-from libecalc.common.utils.rates import TimeSeriesVolumesCumulative, TimeSeriesRate, RateType, TimeSeriesVolumes, Rates
+from libecalc.common.utils.rates import Rates, RateType, TimeSeriesRate, TimeSeriesVolumes, TimeSeriesVolumesCumulative
 from libecalc.domain.emission.emission_intensity import EmissionIntensity
 
 boe_factor = 6.29
diff --git a/tests/libecalc/domain/infrastructure/emitters/test_venting_emitter.py b/tests/libecalc/domain/infrastructure/emitters/test_venting_emitter.py
@@ -18,7 +18,6 @@
     VentingVolumeEmission,
 )
 from libecalc.domain.regularity import Regularity
-from libecalc.expression import Expression
 from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
 from libecalc.presentation.yaml.mappers.consumer_function_mapper import _map_condition
 
diff --git a/tests/libecalc/domain/infrastructure/energy_components/turbine/test_turbine.py b/tests/libecalc/domain/infrastructure/energy_components/turbine/test_turbine.py
@@ -1,4 +1,5 @@
 import pytest
+
 from libecalc.domain.component_validation_error import (
     DomainValidationException,
     ProcessEqualLengthValidationException,
diff --git a/tests/libecalc/domain/process/compressor/test_compressor_train.py b/tests/libecalc/domain/process/compressor/test_compressor_train.py
@@ -4,7 +4,7 @@
 from libecalc.common.fixed_speed_pressure_control import FixedSpeedPressureControl
 from libecalc.domain.component_validation_error import ProcessChartTypeValidationException
 from libecalc.domain.process.compressor.core.train.compressor_train_common_shaft import CompressorTrainCommonShaft
-from libecalc.domain.process.entities.shaft import Shaft, SingleSpeedShaft
+from libecalc.domain.process.entities.shaft import SingleSpeedShaft
 
 
 class TestCompressorTrain:
diff --git a/tests/libecalc/domain/process/entities/process_units/test_liquid_remover.py b/tests/libecalc/domain/process/entities/process_units/test_liquid_remover.py
@@ -1,9 +1,7 @@
-import pytest
-
 from ecalc_neqsim_wrapper.thermo import STANDARD_PRESSURE_BARA, STANDARD_TEMPERATURE_KELVIN
 from libecalc.domain.process.entities.process_units.liquid_remover.liquid_remover import LiquidRemover
 from libecalc.domain.process.value_objects.fluid_stream import FluidComposition
-from libecalc.domain.process.value_objects.fluid_stream.fluid_model import FluidModel, EoSModel
+from libecalc.domain.process.value_objects.fluid_stream.fluid_model import EoSModel, FluidModel
 from libecalc.infrastructure.neqsim_fluid_provider.neqsim_fluid_factory import NeqSimFluidFactory
 
 
diff --git a/tests/libecalc/domain/process/entities/process_units/test_pressure_modifier.py b/tests/libecalc/domain/process/entities/process_units/test_pressure_modifier.py
@@ -1,4 +1,4 @@
-from ecalc_neqsim_wrapper.thermo import STANDARD_TEMPERATURE_KELVIN, STANDARD_PRESSURE_BARA
+from ecalc_neqsim_wrapper.thermo import STANDARD_TEMPERATURE_KELVIN
 from libecalc.domain.process.entities.process_units.pressure_modifier.pressure_modifier import (
     DifferentialPressureModifier,
 )
diff --git a/tests/libecalc/domain/process/entities/process_units/test_rate_modifier.py b/tests/libecalc/domain/process/entities/process_units/test_rate_modifier.py
@@ -1,4 +1,4 @@
-from ecalc_neqsim_wrapper.thermo import STANDARD_TEMPERATURE_KELVIN, STANDARD_PRESSURE_BARA
+from ecalc_neqsim_wrapper.thermo import STANDARD_PRESSURE_BARA, STANDARD_TEMPERATURE_KELVIN
 from libecalc.domain.process.entities.process_units.rate_modifier.rate_modifier import RateModifier
 
 
diff --git a/tests/libecalc/domain/process/entities/process_units/test_temperature_setter.py b/tests/libecalc/domain/process/entities/process_units/test_temperature_setter.py
@@ -1,4 +1,4 @@
-from ecalc_neqsim_wrapper.thermo import STANDARD_TEMPERATURE_KELVIN, STANDARD_PRESSURE_BARA
+from ecalc_neqsim_wrapper.thermo import STANDARD_PRESSURE_BARA, STANDARD_TEMPERATURE_KELVIN
 from libecalc.domain.process.entities.process_units.temperature_setter.temperature_setter import TemperatureSetter
 
 
diff --git a/tests/libecalc/input/mappers/variables_mapper/test_timeseries_utils.py b/tests/libecalc/input/mappers/variables_mapper/test_timeseries_utils.py
@@ -2,13 +2,10 @@
 
 import pytest
 
-import libecalc.common.time_utils
-from libecalc.common.time_utils import Frequency
 from libecalc.domain.component_validation_error import DomainValidationException
 from libecalc.dto.types import InterpolationType
 from libecalc.presentation.yaml.domain.time_series import TimeSeries
 from libecalc.presentation.yaml.mappers.variables_mapper.get_global_time_vector import get_global_time_vector
-from libecalc.presentation.yaml.validation_errors import ValidationError
 
 
 def create_single_date_time_series(interpolation_type: InterpolationType, extrapolate: bool) -> TimeSeries:
diff --git a/tests/libecalc/output/flow_diagram/conftest.py b/tests/libecalc/output/flow_diagram/conftest.py
@@ -1,5 +1,5 @@
 import datetime
-from uuid import uuid4, UUID
+from uuid import UUID, uuid4
 
 import pytest
 
@@ -9,6 +9,7 @@
 from libecalc.common.temporal_model import TemporalModel
 from libecalc.common.time_utils import Period
 from libecalc.domain.energy import EnergyComponent, EnergyModel
+from libecalc.domain.energy.energy_component import EnergyContainerID
 from libecalc.domain.infrastructure.energy_components.fuel_consumer.fuel_consumer import FuelConsumerComponent
 from libecalc.domain.infrastructure.energy_components.legacy_consumer.system.consumer_function import (
     ConsumerSystemConsumerFunction,
@@ -22,7 +23,6 @@
 from libecalc.dto.emission import Emission
 from libecalc.expression import Expression
 from libecalc.presentation.flow_diagram.flow_diagram_dtos import Flow, FlowType, Node, NodeType
-from libecalc.domain.energy.energy_component import EnergyContainerID
 
 FUEL_NODE = Node(id="fuel-input", title="Fuel", type=NodeType.INPUT_OUTPUT_NODE)
 INPUT_NODE = Node(id="input", title="Input", type=NodeType.INPUT_OUTPUT_NODE)
diff --git a/tests/libecalc/presentation/exporter/formatters/test_csv_formatter.py b/tests/libecalc/presentation/exporter/formatters/test_csv_formatter.py
@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Union
 
 from libecalc.common.units import Unit
 from libecalc.domain.tabular.tabular import ColumnIndex
diff --git a/tests/libecalc/presentation/yaml/domain/test_time_series_mask.py b/tests/libecalc/presentation/yaml/domain/test_time_series_mask.py
@@ -4,10 +4,9 @@
 
 from libecalc.common.time_utils import Period
 from libecalc.domain.regularity import Regularity
-from libecalc.presentation.yaml.domain.time_series_mask import TimeSeriesMask
-from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
 from libecalc.presentation.yaml.domain.expression_time_series_variable import ExpressionTimeSeriesVariable
-
+from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
+from libecalc.presentation.yaml.domain.time_series_mask import TimeSeriesMask
 
 periods = [
     Period(start=datetime(2020, 1, 1), end=datetime(2021, 1, 1)),
diff --git a/tests/libecalc/presentation/yaml/domain/test_time_series_pressure.py b/tests/libecalc/presentation/yaml/domain/test_time_series_pressure.py
@@ -4,11 +4,11 @@
 
 from libecalc.common.time_utils import Period
 from libecalc.domain.component_validation_error import ProcessPressureRatioValidationException
-from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
 from libecalc.presentation.yaml.domain.expression_time_series_pressure import (
     ExpressionTimeSeriesPressure,
     InvalidPressureException,
 )
+from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
 from libecalc.presentation.yaml.mappers.consumer_function_mapper import validate_increasing_pressure
 
 periods = [
diff --git a/tests/libecalc/presentation/yaml/test_venting_emitter.py b/tests/libecalc/presentation/yaml/test_venting_emitter.py
@@ -1,10 +1,9 @@
 from datetime import datetime
-from unittest.mock import Mock
 from uuid import uuid4
 
 import pytest
 
-from libecalc.common.time_utils import Period, Frequency
+from libecalc.common.time_utils import Frequency
 from libecalc.common.units import Unit
 from libecalc.common.utils.rates import RateType
 from libecalc.common.variables import ExpressionEvaluator
@@ -19,11 +18,8 @@
 )
 from libecalc.domain.regularity import Regularity
 from libecalc.dto.types import ConsumerUserDefinedCategoryType
-from libecalc.presentation.yaml.domain.reference_service import ReferenceService
 from libecalc.presentation.yaml.domain.time_series_expression import TimeSeriesExpression
-from libecalc.presentation.yaml.mappers.yaml_path import YamlPath
 from libecalc.presentation.yaml.model import YamlModel
-from libecalc.presentation.yaml.yaml_models.pyyaml_yaml_model import PyYamlYamlModel
 from libecalc.presentation.yaml.yaml_types.emitters.yaml_venting_emitter import (
     YamlDirectTypeEmitter,
     YamlOilTypeEmitter,
@@ -42,13 +38,12 @@
     YamlEmissionRateBuilder,
     YamlInstallationBuilder,
     YamlOilVolumeRateBuilder,
+    YamlTimeSeriesBuilder,
     YamlVentingEmissionBuilder,
     YamlVentingEmitterDirectTypeBuilder,
     YamlVentingEmitterOilTypeBuilder,
     YamlVentingVolumeBuilder,
-    YamlTimeSeriesBuilder,
 )
-from libecalc.presentation.yaml.mappers.component_mapper import EcalcModelMapper, Defaults
 from tests.libecalc.presentation.exporter.conftest import memory_resource_factory
 
 
diff --git a/tests/libecalc/presentation/yaml/yaml_types/models/test_yaml_variable_speed_compressor_train_multiple_streams_and_pressures.py b/tests/libecalc/presentation/yaml/yaml_types/models/test_yaml_variable_speed_compressor_train_multiple_streams_and_pressures.py
@@ -6,8 +6,8 @@
     YamlInterstageControlPressure,
 )
 from libecalc.presentation.yaml.yaml_types.models.yaml_compressor_trains import (
-    YamlVariableSpeedCompressorTrainMultipleStreamsAndPressures,
     YamlMultipleStreamsStreamIngoing,
+    YamlVariableSpeedCompressorTrainMultipleStreamsAndPressures,
 )
 from libecalc.presentation.yaml.yaml_types.models.yaml_enums import YamlModelType, YamlPressureControl
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`from dataclasses import dataclass`
`2`		`-from typing import Optional`
`3`	`2`
`4`	`3`	`import pytest`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`import pytest`
`3`	`3`
`4`	`4`	`from libecalc.common.list.list_utils import (`
	`5`	`+ array_to_list,`
`5`	`6`	`elementwise_multiplication,`
`6`	`7`	`elementwise_sum,`
`7`	`8`	`group_data_by_value_at_index,`
`8`		`- array_to_list,`
`9`	`9`	`)`
`10`	`10`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import pytest`
`2`		`-`
`3`	`2`	`from pydantic import ValidationError`
`4`	`3`
`5`	`4`	`from libecalc.common.serializable_chart import ChartCurveDTO, ChartDTO`