|
36 | 36 | assert_equal,
|
37 | 37 | assert_identical,
|
38 | 38 | assert_no_warnings,
|
| 39 | + has_pandas_3, |
39 | 40 | raise_if_dask_computes,
|
40 | 41 | requires_bottleneck,
|
41 | 42 | requires_cupy,
|
@@ -252,6 +253,7 @@ def test_0d_object_array_with_list(self):
|
252 | 253 | assert_array_equal(x[0].data, listarray.squeeze())
|
253 | 254 | assert_array_equal(x.squeeze().data, listarray.squeeze())
|
254 | 255 |
|
| 256 | + @pytest.mark.filterwarnings("ignore:Converting non-nanosecond") |
255 | 257 | def test_index_and_concat_datetime(self):
|
256 | 258 | # regression test for #125
|
257 | 259 | date_range = pd.date_range("2011-09-01", periods=10)
|
@@ -2942,8 +2944,8 @@ def test_from_pint_wrapping_dask(self, Var):
|
2942 | 2944 | (np.array([np.datetime64("2000-01-01", "ns")]), False),
|
2943 | 2945 | (np.array([np.datetime64("2000-01-01", "s")]), True),
|
2944 | 2946 | (pd.date_range("2000", periods=1), False),
|
2945 |
| - (datetime(2000, 1, 1), False), |
2946 |
| - (np.array([datetime(2000, 1, 1)]), False), |
| 2947 | + (datetime(2000, 1, 1), has_pandas_3), |
| 2948 | + (np.array([datetime(2000, 1, 1)]), has_pandas_3), |
2947 | 2949 | (pd.date_range("2000", periods=1, tz=pytz.timezone("America/New_York")), False),
|
2948 | 2950 | (
|
2949 | 2951 | pd.Series(
|
|
0 commit comments