From 829f07afc554f14219a9837010964b0475b59b0d Mon Sep 17 00:00:00 2001 From: Daniel Huppmann Date: Thu, 19 Dec 2024 22:28:41 +0100 Subject: [PATCH] Make ruff --- nomenclature/codelist.py | 8 ++++++-- tests/test_validation.py | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nomenclature/codelist.py b/nomenclature/codelist.py index 265296d9..329158e5 100644 --- a/nomenclature/codelist.py +++ b/nomenclature/codelist.py @@ -601,7 +601,9 @@ def vars_default_args(self, variables: list[str]) -> list[str]: return [ var for var in variables - if var in self.keys() and not self[var].agg_kwargs and not self[var].skip_region_aggregation + if var in self.keys() + and not self[var].agg_kwargs + and not self[var].skip_region_aggregation ] def vars_kwargs(self, variables: list[str]) -> list[VariableCode]: @@ -610,7 +612,9 @@ def vars_kwargs(self, variables: list[str]) -> list[VariableCode]: return [ self[var] for var in variables - if var in self.keys() and self[var].agg_kwargs and not self[var].skip_region_aggregation + if var in self.keys() + and self[var].agg_kwargs + and not self[var].skip_region_aggregation ] def validate_units( diff --git a/tests/test_validation.py b/tests/test_validation.py index 51b9acf3..e104db38 100644 --- a/tests/test_validation.py +++ b/tests/test_validation.py @@ -70,9 +70,9 @@ def test_validation_fails_region(simple_definition, simple_df, caplog): def test_validation_multiple_units(extras_definition, simple_df): """Validating against a VariableCode with multiple units works as expected""" extras_definition.validate( - simple_df - .filter(variable="Primary Energy|Coal") - .rename(unit={"EJ/yr": "GWh/yr"}) + simple_df.filter(variable="Primary Energy|Coal").rename( + unit={"EJ/yr": "GWh/yr"} + ) )