[attempt 2] Eager import pandas in ray data for python >= 3.7

python/ray/data/__init__.py

@@ -1,3 +1,11 @@
+import sys
+
+# Short term workaround for https://github.com/ray-project/ray/issues/32435
+# Datasets currently has a hard dependency on pandas, so it doesn't need to be delayed.
+# ray.data import is still eager for all ray imports for Python 3.6:
+if sys.version_info >= (3, 7):
+    import pandas  # noqa
+
 from ray.data._internal.compute import ActorPoolStrategy
 from ray.data._internal.progress_bar import set_progress_bars
 from ray.data.dataset import Dataset

python/ray/data/tests/test_dataset_image.py

@@ -1,5 +1,4 @@
 import os
-import time
 from typing import Dict
 
 import numpy as np
@@ -18,6 +17,7 @@
 from ray.data.tests.conftest import *  # noqa
 from ray.data.tests.mock_http_server import *  # noqa
 from ray.tests.conftest import *  # noqa
+from ray._private.test_utils import wait_for_condition
 
 
 class TestReadImages:
@@ -193,12 +193,7 @@ def test_dynamic_block_split(ray_start_regular_shared):
             ds.fully_executed()
             # Verify dynamic block splitting taking effect to generate more blocks.
             assert ds.num_blocks() == 3
-
-            # NOTE: Need to wait for 1 second before checking stats, because we report
-            # stats to stats actors asynchronously when returning the blocks metadata.
-            # TODO(chengsu): clean it up after refactoring lazy block list.
-            time.sleep(1)
-            assert "3 blocks executed" in ds.stats()
+            wait_for_condition(lambda: "3 blocks executed" in ds.stats(), timeout=20)
 
             # Test union of same datasets
             union_ds = ds.union(ds, ds, ds).fully_executed()