Merge pull request #7681 from jreback/numpy_issue

TST/COMPAT: numpy master compat with timedelta type coercion

Author: jreback

pandas/tseries/tests/test_tslib.py

@@ -98,7 +98,7 @@ def test_tz(self):
         self.assertEqual(conv.hour, 19)
 
     def test_barely_oob_dts(self):
-        one_us = np.timedelta64(1)
+        one_us = np.timedelta64(1).astype('timedelta64[us]')
 
         # By definition we can't go out of bounds in [ns], so we
         # convert the datetime64s to [us] so we can go out of bounds