diff options
| author | Sebastian Berg <sebastianb@nvidia.com> | 2022-10-12 16:40:45 +0200 |
|---|---|---|
| committer | Sebastian Berg <sebastianb@nvidia.com> | 2022-10-12 17:13:05 +0200 |
| commit | ee3c20b9eafa840232ae3e4bfa85ec262fcfa578 (patch) | |
| tree | 4edaa580a522e823087849e86b7ffdcf24c35c51 /numpy | |
| parent | d9da02df4389a250fa1b54192700b15c84052034 (diff) | |
| download | numpy-ee3c20b9eafa840232ae3e4bfa85ec262fcfa578.tar.gz | |
MAINT: Minor include fixup in scalarmath after rebase and comment fixup
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/umath/scalarmath.c.src | 1 | ||||
| -rw-r--r-- | numpy/core/tests/test_nep50_promotions.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/umath/scalarmath.c.src b/numpy/core/src/umath/scalarmath.c.src index e359605d6..3936efbdf 100644 --- a/numpy/core/src/umath/scalarmath.c.src +++ b/numpy/core/src/umath/scalarmath.c.src @@ -33,7 +33,6 @@ #include "umathmodule.h" #include "convert_datatype.h" -#include "dtypemeta.h" /* TODO: Used for some functions, should possibly move these to npy_math.h */ diff --git a/numpy/core/tests/test_nep50_promotions.py b/numpy/core/tests/test_nep50_promotions.py index be6cf92a5..5d4917c94 100644 --- a/numpy/core/tests/test_nep50_promotions.py +++ b/numpy/core/tests/test_nep50_promotions.py @@ -33,7 +33,8 @@ def test_nep50_examples(): assert res.dtype == np.int64 with pytest.warns(UserWarning, match="result dtype changed"): - # Note: Overflow would be nice, but does not warn with change warning + # Note: For "weak_and_warn" promotion state the overflow warning is + # unfortunately not given (because we use the full array path). with np.errstate(over="raise"): res = np.uint8(100) + 200 assert res.dtype == np.uint8 |