Fixup

phofl · Jan 3, 2025 · 86eccaf · 86eccaf
1 parent 7ba45e8
commit 86eccaf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/dask/array/tests/test_array_function.py b/dask/array/tests/test_array_function.py
@@ -9,7 +9,6 @@
 from dask.array.utils import assert_eq
 
 
-@pytest.mark.filterwarnings("ignore:The truth value of an empty array")
 @pytest.mark.parametrize(
     "func",
     [
@@ -29,7 +28,7 @@
         lambda x: np.vstack((x, x)),
         lambda x: np.linalg.norm(x),
         lambda x: np.min(x),
-        # lambda x: np.amin(x),
+        lambda x: np.amin(x),
         lambda x: np.round(x),
         lambda x: np.insert(x, 0, 3, axis=0),
         lambda x: np.delete(x, 0, axis=0),

diff --git a/dask/dataframe/dask_expr/tests/test_collection.py b/dask/dataframe/dask_expr/tests/test_collection.py
@@ -13,6 +13,8 @@
 
 import dask
 import dask.array as da
+from dask._compatibility import WINDOWS
+from dask.array.numpy_compat import NUMPY_GE_200
 from dask.dataframe._compat import PANDAS_GE_210, PANDAS_GE_220
 from dask.dataframe.dask_expr import (
     DataFrame,
@@ -2540,6 +2542,7 @@ def test_filter_optimize_condition():
     assert_eq(result, expected)
 
 
+@pytest.mark.skipif(WINDOWS and not NUMPY_GE_200, reason="uses int32")
 def test_scalar_repr(df):
     result = repr(df.size)
     assert result == "<dask_expr.expr.Scalar: expr=df.size(), dtype=int64>"

diff --git a/dask/tests/test_base.py b/dask/tests/test_base.py
@@ -78,7 +78,7 @@ def test_is_dask_collection_dask_expr():
 
 def test_is_dask_collection_dask_expr_does_not_materialize():
     pytest.importorskip("pandas")
-    dx = pytest.importorskip("dask_expr")
+    dx = pytest.importorskip("dask.dataframe.dask_expr")
 
     class DoNotMaterialize(dx._core.Expr):
         @property