Skip to content

Commit

Permalink
Make ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhuppmann committed Dec 19, 2024
1 parent aa83924 commit 829f07a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 6 additions & 2 deletions nomenclature/codelist.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand All @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions tests/test_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
)
)


Expand Down

0 comments on commit 829f07a

Please sign in to comment.