Skip to content

Commit 22ca6d9

Browse files
author
Robbie Muir
committed
fix 3.10 issue maybe
1 parent eba373f commit 22ca6d9

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

test/test_common.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
from linopy import LinearExpression, Variable
1818
from linopy.common import (
19+
CoordAlignWarning,
1920
align,
2021
as_dataarray,
2122
assign_multiindex_safe,
@@ -98,7 +99,7 @@ def test_as_dataarray_with_series_override_coords() -> None:
9899
target_dim = "dim_0"
99100
target_index = ["a", "b", "c"]
100101
s = pd.Series([1, 2, 3], index=target_index)
101-
with pytest.warns(UserWarning):
102+
with pytest.warns(CoordAlignWarning):
102103
da = as_dataarray(s, coords=[[1, 2, 3]])
103104
assert isinstance(da, DataArray)
104105
assert da.dims == (target_dim,)
@@ -217,7 +218,7 @@ def test_as_dataarray_dataframe_override_coords() -> None:
217218
target_index = ["a", "b"]
218219
target_columns = ["A", "B"]
219220
df = pd.DataFrame([[1, 2], [3, 4]], index=target_index, columns=target_columns)
220-
with pytest.warns(UserWarning):
221+
with pytest.warns(CoordAlignWarning):
221222
da = as_dataarray(df, coords=[[1, 2], [2, 3]])
222223
assert isinstance(da, DataArray)
223224
assert da.dims == target_dims

test/test_variables.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
This module aims at testing the correct behavior of the Variables class.
44
"""
55

6-
import sys
76
import warnings
87
from datetime import datetime
98

@@ -142,14 +141,10 @@ def test_timezone_alignment_with_multiplication() -> None:
142141
series1 = pd.Series(index=utc_index, data=1.0)
143142
var1 = model.add_variables(coords=[utc_index], name="var1")
144143

145-
if sys.version_info >= (3, 11):
146-
with warnings.catch_warnings(category=CoordAlignWarning):
147-
warnings.simplefilter("error")
148-
expr = var1 * series1
149-
else:
150-
with warnings.catch_warnings():
151-
warnings.simplefilter("error")
152-
expr = var1 * series1
144+
# TODO increase coverage for datarray when coords are not dataarray
145+
with warnings.catch_warnings():
146+
warnings.simplefilter("error", CoordAlignWarning)
147+
expr = var1 * series1
153148

154149
index: pd.DatetimeIndex = expr.coords["time"].to_index()
155150
assert index.equals(utc_index)

0 commit comments

Comments
 (0)