update indexes / indexing tests

Author: jorisvandenbossche

pandas/tests/indexes/datetimes/test_constructors.py

@@ -524,7 +524,7 @@ def test_construction_dti_with_mixed_timezones(self):
                 Timestamp("2011-01-01 10:00", tz="Asia/Tokyo"),
                 Timestamp("2011-01-02 10:00", tz="US/Eastern"),
             ],
-            dtype="M8[s, US/Eastern]",
+            dtype="M8[us, US/Eastern]",
             name="idx",
         )
         tm.assert_index_equal(dti, expected)
@@ -602,7 +602,7 @@ def test_constructor_coverage(self):
         expected = DatetimeIndex(strings.astype("O"))
         tm.assert_index_equal(result, expected)
 
-        from_ints = DatetimeIndex(expected.as_unit("ns").asi8).as_unit("s")
+        from_ints = DatetimeIndex(expected.as_unit("ns").asi8).as_unit("us")
         tm.assert_index_equal(from_ints, expected)
 
         # string with NaT
@@ -611,7 +611,7 @@ def test_constructor_coverage(self):
         expected = DatetimeIndex(strings.astype("O"))
         tm.assert_index_equal(result, expected)
 
-        from_ints = DatetimeIndex(expected.as_unit("ns").asi8).as_unit("s")
+        from_ints = DatetimeIndex(expected.as_unit("ns").asi8).as_unit("us")
         tm.assert_index_equal(from_ints, expected)
 
         # non-conforming
@@ -840,8 +840,8 @@ def test_construction_with_tz_and_tz_aware_dti(self):
 
     def test_construction_with_nat_and_tzlocal(self):
         tz = dateutil.tz.tzlocal()
-        result = DatetimeIndex(["2018", "NaT"], tz=tz).as_unit("ns")
-        expected = DatetimeIndex([Timestamp("2018", tz=tz), pd.NaT]).as_unit("ns")
+        result = DatetimeIndex(["2018", "NaT"], tz=tz)
+        expected = DatetimeIndex([Timestamp("2018", tz=tz), pd.NaT])
         tm.assert_index_equal(result, expected)
 
     def test_constructor_with_ambiguous_keyword_arg(self):
@@ -940,11 +940,11 @@ def test_dti_tz_constructors(self, tzstr):
 
         idx1 = to_datetime(arr).tz_localize(tzstr)
         idx2 = date_range(
-            start="2005-11-10 08:00:00", freq="h", periods=2, tz=tzstr, unit="s"
+            start="2005-11-10 08:00:00", freq="h", periods=2, tz=tzstr, unit="us"
         )
         idx2 = idx2._with_freq(None)  # the others all have freq=None
-        idx3 = DatetimeIndex(arr, tz=tzstr).as_unit("s")
-        idx4 = DatetimeIndex(np.array(arr), tz=tzstr).as_unit("s")
+        idx3 = DatetimeIndex(arr, tz=tzstr)
+        idx4 = DatetimeIndex(np.array(arr), tz=tzstr)
 
         tm.assert_index_equal(idx1, idx2)
         tm.assert_index_equal(idx1, idx3)
@@ -1211,9 +1211,9 @@ def test_dti_constructor_object_dtype_dayfirst_yearfirst_with_tz(self):
         yfirst = Timestamp(2005, 10, 16, tz="US/Pacific")
 
         result1 = DatetimeIndex([val], tz="US/Pacific", dayfirst=True)
-        expected1 = DatetimeIndex([dfirst]).as_unit("s")
+        expected1 = DatetimeIndex([dfirst])
         tm.assert_index_equal(result1, expected1)
 
         result2 = DatetimeIndex([val], tz="US/Pacific", yearfirst=True)
-        expected2 = DatetimeIndex([yfirst]).as_unit("s")
+        expected2 = DatetimeIndex([yfirst])
         tm.assert_index_equal(result2, expected2)

pandas/tests/indexing/test_coercion.py

@@ -596,7 +596,7 @@ def test_fillna_complex128(self, index_or_series, fill_val, fill_dtype):
     @pytest.mark.parametrize(
         "fill_val,fill_dtype",
         [
-            (pd.Timestamp("2012-01-01"), "datetime64[s]"),
+            (pd.Timestamp("2012-01-01"), "datetime64[us]"),
             (pd.Timestamp("2012-01-01", tz="US/Eastern"), object),
             (1, object),
             ("x", object),
@@ -613,7 +613,7 @@ def test_fillna_datetime(self, index_or_series, fill_val, fill_dtype):
                 pd.Timestamp("2011-01-04"),
             ]
         )
-        assert obj.dtype == "datetime64[s]"
+        assert obj.dtype == "datetime64[us]"
 
         exp = klass(
             [
@@ -628,10 +628,10 @@ def test_fillna_datetime(self, index_or_series, fill_val, fill_dtype):
     @pytest.mark.parametrize(
         "fill_val,fill_dtype",
         [
-            (pd.Timestamp("2012-01-01", tz="US/Eastern"), "datetime64[s, US/Eastern]"),
+            (pd.Timestamp("2012-01-01", tz="US/Eastern"), "datetime64[us, US/Eastern]"),
             (pd.Timestamp("2012-01-01"), object),
             # pre-2.0 with a mismatched tz we would get object result
-            (pd.Timestamp("2012-01-01", tz="Asia/Tokyo"), "datetime64[s, US/Eastern]"),
+            (pd.Timestamp("2012-01-01", tz="Asia/Tokyo"), "datetime64[us, US/Eastern]"),
             (1, object),
             ("x", object),
         ],
@@ -648,7 +648,7 @@ def test_fillna_datetime64tz(self, index_or_series, fill_val, fill_dtype):
                 pd.Timestamp("2011-01-04", tz=tz),
             ]
         )
-        assert obj.dtype == "datetime64[s, US/Eastern]"
+        assert obj.dtype == "datetime64[us, US/Eastern]"
 
         if getattr(fill_val, "tz", None) is None:
             fv = fill_val

pandas/tests/indexing/test_loc.py

@@ -701,7 +701,7 @@ def test_loc_modify_datetime(self):
             {"date": [1485264372711, 1485265925110, 1540215845888, 1540282121025]}
         )
 
-        df["date_dt"] = to_datetime(df["date"], unit="ms", cache=True).dt.as_unit("ms")
+        df["date_dt"] = to_datetime(df["date"], unit="ms", cache=True).dt.as_unit("us")
 
         df.loc[:, "date_dt_cp"] = df.loc[:, "date_dt"]
         df.loc[[2, 3], "date_dt_cp"] = df.loc[[2, 3], "date_dt"]

pandas/tests/indexing/test_partial.py

@@ -574,7 +574,7 @@ def test_partial_set_invalid(self):
                 ],
             ),
             (
-                date_range(start="2000", periods=20, freq="D", unit="s"),
+                date_range(start="2000", periods=20, freq="D", unit="us"),
                 ["2000-01-04", "2000-01-08", "2000-01-12"],
                 [
                     Timestamp("2000-01-04"),