Skip to content

Commit c50174d

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 5e73653 commit c50174d

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

linopy/common.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,7 @@ def align(
10001000
indexes: Any = None,
10011001
exclude: str | Iterable[Hashable] = frozenset(),
10021002
fill_value: Any = dtypes.NA,
1003-
) -> tuple[LinearExpression| QuadraticExpression | Variable | T_Alignable, ...]:
1003+
) -> tuple[LinearExpression | QuadraticExpression | Variable | T_Alignable, ...]:
10041004
"""
10051005
Given any number of Variables, Expressions, Dataset and/or DataArray objects,
10061006
returns new objects with aligned indexes and dimension sizes.
@@ -1090,7 +1090,14 @@ def align(
10901090
return tuple([f(da) for f, da in zip(finisher, aligned)])
10911091

10921092

1093-
LocT = TypeVar("LocT", "Dataset", "Variable", "LinearExpression", "QuadraticExpression", "Constraint")
1093+
LocT = TypeVar(
1094+
"LocT",
1095+
"Dataset",
1096+
"Variable",
1097+
"LinearExpression",
1098+
"QuadraticExpression",
1099+
"Constraint",
1100+
)
10941101

10951102

10961103
class LocIndexer(Generic[LocT]):

linopy/monkey_patch_xarray.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ def deco(func: Callable) -> Callable:
2626
def __mul__(
2727
da: DataArray, other: Any, unpatched_method: Callable
2828
) -> DataArray | NotImplementedType:
29-
if isinstance(other, (variables.Variable, expressions.LinearExpression, expressions.QuadraticExpression)):
29+
if isinstance(
30+
other,
31+
(
32+
variables.Variable,
33+
expressions.LinearExpression,
34+
expressions.QuadraticExpression,
35+
),
36+
):
3037
return NotImplemented
3138
return unpatched_method(da, other)

linopy/testing.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ def assert_linequal(
2222
return assert_equal(_expr_unwrap(a), _expr_unwrap(b))
2323

2424

25-
def assert_quadequal(a: LinearExpression | QuadraticExpression, b: LinearExpression | QuadraticExpression) -> None:
25+
def assert_quadequal(
26+
a: LinearExpression | QuadraticExpression, b: LinearExpression | QuadraticExpression
27+
) -> None:
2628
"""Assert that two quadratic or linear expressions are equal."""
2729
return assert_equal(_expr_unwrap(a), _expr_unwrap(b))
2830

test/test_compatible_arithmetrics.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import pandas as pd
55
import pytest
66
import xarray as xr
7+
from xarray.testing import assert_equal
78

89
from linopy import LESS_EQUAL, Model, Variable
910
from linopy.testing import assert_linequal, assert_quadequal
10-
from xarray.testing import assert_equal
11+
1112

1213
class SomeOtherDatatype:
1314
"""

0 commit comments

Comments
 (0)