8000 TST: fix deprecation warnings from f2py test for ndim>0 · numpy/numpy@22e941d · GitHub
[go: up one dir, main page]
Skip to content

Commit 22e941d

Browse files
rgommersrgommers
committed
TST: fix deprecation warnings from f2py test for ndim>0
Representative subset of warnings observed in CI: ``` f2py/tests/test_return_integer.py: 20 warnings /tmp/tmp.roLIRtEhPN/venv/lib/python3.9/site-packages/numpy/f2py/tests/test_return_integer.py:24: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.) assert t(array([123], "d")) == 123 f2py/tests/test_return_real.py: 20 warnings /tmp/tmp.roLIRtEhPN/venv/lib/python3.9/site-packages/numpy/f2py/tests/test_return_real.py:23: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.) assert abs(t(array([234])) - 234.0) <= err f2py/tests/test_return_real.py: 20 warnings /tmp/tmp.roLIRtEhPN/venv/lib/python3.9/site-packages/numpy/f2py/tests/test_return_real.py:24: DeprecationWarning: Conversion of an array with ndim > 0 to a scalar is deprecated, and will error in future. Ensure you extract a single element from your array before performing this operation. (Deprecated NumPy 1.25.) assert abs(t(array([[234]])) - 234.0) <= err ```
1 parent c085251 commit 22e941d

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

‎numpy/f2py/tests/test_return_integer.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@ def check_function(self, t, tname):
1313
assert t([123]) == 123
1414
assert t((123, )) == 123
1515
assert t(array(123)) == 123
16-
assert t(array([123])) == 123
17-
assert t(array([[123]])) == 123
18-
assert t(array([123], "b")) == 123
19-
assert t(array([123], "h")) == 123
20-
assert t(array([123], "i")) == 123
21-
assert t(array([123], "l")) == 123
22-
assert t(array([123], "B")) == 123
23-
assert t(array([123], "f")) == 123
24-
assert t(array([123], "d")) == 123
16+
assert t(array(123, "b")) == 123
17+
assert t(array(123, "h")) == 123
18+
assert t(array(123, "i")) == 123
19+
assert t(array(123, "l")) == 123
20+
assert t(array(123, "B")) == 123
21+
assert t(array(123, "f")) == 123
22+
assert t(array(123, "d")) == 123
2523

2624
# pytest.raises(ValueError, t, array([123],'S3'))
2725
pytest.raises(ValueError, t, "abc")

‎numpy/f2py/tests/test_return_real.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ def check_function(self, t, tname):
2020
assert abs(t([234]) - 234) <= err
2121
assert abs(t((234, )) - 234.0) <= err
2222
assert abs(t(array(234)) - 234.0) <= err
23-
assert abs(t(array([234])) - 234.0) <= err
24-
assert abs(t(array([[234]])) - 234.0) <= err
25-
assert abs(t(array([234]).astype("b")) + 22) <= err
26-
assert abs(t(array([234], "h")) - 234.0) <= err
27-
assert abs(t(array([234], "i")) - 234.0) <= err
28-
assert abs(t(array([234], "l")) - 234.0) <= err
29-
assert abs(t(array([234], "B")) - 234.0) <= err
30-
assert abs(t(array([234], "f")) - 234.0) <= err
31-
assert abs(t(array([234], "d")) - 234.0) <= err
23+
assert abs(t(array(234).astype("b")) + 22) <= err
24+
assert abs(t(array(234, "h")) - 234.0) <= err
25+
assert abs(t(array(234, "i")) - 234.0) <= err
26+
assert abs(t(array(234, "l")) - 234.0) <= err
27+
assert abs(t(array(234, "B")) - 234.0) <= err
28+
assert abs(t(array(234, "f")) - 234.0) <= err
29+
assert abs(t(array(234, "d")) - 234.0) <= err
3230
if tname in ["t0", "t4", "s0", "s4"]:
3331
assert t(1e200) == t(1e300) # inf
3432

0 commit comments

Comments
 (0)
0