fixup

Author: TomAugspurger

pandas/core/reshape/tile.py

@@ -449,7 +449,10 @@ def _convert_bin_to_datelike_type(bins, dtype):
     bins : Array-like of bins, DatetimeIndex or TimedeltaIndex if dtype is
            datelike
     """
-    if is_datetime64tz_dtype(dtype) or is_datetime_or_timedelta_dtype(dtype):
+    if is_datetime64tz_dtype(dtype):
+        bins = to_datetime(bins.astype(np.int64),
+                           utc=True).tz_convert(dtype.tz)
+    elif is_datetime_or_timedelta_dtype(dtype):
         bins = Index(bins.astype(np.int64), dtype=dtype)
     return bins
 

pandas/tests/resample/test_period_index.py

@@ -517,8 +517,10 @@ def test_resample_weekly_bug_1726(self):
 
     def test_resample_with_dst_time_change(self):
         # GH 15549
-        index = pd.DatetimeIndex([1457537600000000000, 1458059600000000000],
-                                 tz='UTC').tz_convert('America/Chicago')
+        index = (
+            pd.DatetimeIndex([1457537600000000000, 1458059600000000000])
+            .tz_localize("UTC").tz_convert('America/Chicago')
+        )
         df = pd.DataFrame([1, 2], index=index)
         result = df.resample('12h', closed='right',
                              label='right').last().ffill()

pandas/tests/test_base.py

@@ -1037,6 +1037,7 @@ class TestToIterable(object):
             lambda x: list(x.__iter__()),
         ], ids=['tolist', 'to_list', 'list', 'iter'])
     @pytest.mark.parametrize('typ', [Series, Index])
+    @pytest.mark.filterwarnings("ignore::FutureWarning")
     def test_iterable(self, typ, method, dtype, rdtype):
         # gh-10904
         # gh-13258