Skip to content

Commit 1eaacbf

Browse files
committed
fix type annotations
1 parent 3d72857 commit 1eaacbf

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

linopy/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,8 +1054,8 @@ def align(
10541054
from linopy.expressions import LinearExpression
10551055
from linopy.variables import Variable
10561056

1057-
finisher = []
1058-
das = []
1057+
finisher: list[partial[Any] | Callable[[Any], Any]] = []
1058+
das: list[Any] = []
10591059
for obj in objects:
10601060
if isinstance(obj, LinearExpression):
10611061
finisher.append(partial(obj.__class__, model=obj.model))

test/test_common.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from xarray import DataArray
1414
from xarray.testing.assertions import assert_equal
1515

16-
from linopy import Variable
16+
from linopy import LinearExpression, Variable
1717
from linopy.common import (
1818
align,
1919
as_dataarray,
@@ -667,18 +667,21 @@ def test_align(x: Variable, u: Variable) -> None: # noqa: F811
667667

668668
# inner join
669669
x_obs, alpha_obs = align(x, alpha)
670+
assert isinstance(x_obs, Variable)
670671
assert x_obs.shape == alpha_obs.shape == (1,)
671672
assert_varequal(x_obs, x.loc[[1]])
672673

673674
# left-join
674675
x_obs, alpha_obs = align(x, alpha, join="left")
675676
assert x_obs.shape == alpha_obs.shape == (2,)
677+
assert isinstance(x_obs, Variable)
676678
assert_varequal(x_obs, x)
677679
assert_equal(alpha_obs, DataArray([np.nan, 1], [[0, 1]]))
678680

679681
# multiindex
680682
beta_obs, u_obs = align(beta, u)
681683
assert u_obs.shape == beta_obs.shape == (2,)
684+
assert isinstance(u_obs, Variable)
682685
assert_varequal(u_obs, u.loc[[(1, "b"), (2, "b")]])
683686
assert_equal(beta_obs, beta.loc[[(1, "b"), (2, "b")]])
684687

@@ -687,4 +690,5 @@ def test_align(x: Variable, u: Variable) -> None: # noqa: F811
687690
x_obs, expr_obs, alpha_obs = align(x, expr, alpha)
688691
assert x_obs.shape == alpha_obs.shape == (1,)
689692
assert expr_obs.shape == (1, 1) # _term dim
693+
assert isinstance(expr_obs, LinearExpression)
690694
assert_linequal(expr_obs, expr.loc[[1]])

0 commit comments

Comments
 (0)