Whatsnew and tests fixups

Author: mroeschke

doc/source/whatsnew/v0.21.0.txt

@@ -311,7 +311,7 @@ Previously, :func:`to_datetime` did not localize datetime ``Series`` data when `
 
      s = Series(['20130101 00:00:00'] * 3)
 
-  .. code-block:: python
+  .. code-block:: ipython
 
      In [12]: pd.to_datetime(s, utc=True)
      Out[12]:
@@ -326,7 +326,7 @@ Previously, :func:`to_datetime` did not localize datetime ``Series`` data when `
 
      pd.to_datetime(s, utc=True)
 
-Additionally, DataFrames with datetime columns returned by :func:`read_sql` will also be localized to UTC only if the original SQL columns were timezone aware datetime columns.
+Additionally, DataFrames with datetime columns returned by :func:`read_sql_table` and :func:`read_sql_query` with the `parse_dates` argument specified will also be localized to UTC only if the original SQL columns were timezone aware datetime columns.
 
 .. _whatsnew_0210.api:
 

pandas/tests/indexes/datetimes/test_tools.py

@@ -260,16 +260,6 @@ def test_to_datetime_tz_pytz(self):
                                  dtype='datetime64[ns, UTC]', freq=None)
         tm.assert_index_equal(result, expected)
 
-    def test_to_datetime_utc_is_true(self):
-        # See gh-11934
-        start = pd.Timestamp('2014-01-01', tz='utc')
-        end = pd.Timestamp('2014-01-03', tz='utc')
-        date_range = pd.bdate_range(start, end)
-
-        result = pd.to_datetime(date_range, utc=True)
-        expected = pd.DatetimeIndex(data=date_range)
-        tm.assert_index_equal(result, expected)
-
     @pytest.mark.parametrize("init_constructor, end_constructor, test_method",
                              [(Index, DatetimeIndex, tm.assert_index_equal),
                               (list, DatetimeIndex, tm.assert_index_equal),
@@ -279,7 +269,7 @@ def test_to_datetime_utc_true_with_constructors(self,
                                                     init_constructor,
                                                     end_constructor,
                                                     test_method):
-        # GH 6415: UTC=True with Series
+        # See gh-11934 & gh-6415
         data = ['20100102 121314', '20100102 121315']
         expected_data = [pd.Timestamp('2010-01-02 12:13:14', tz='utc'),
                          pd.Timestamp('2010-01-02 12:13:15', tz='utc')]
@@ -290,6 +280,11 @@ def test_to_datetime_utc_true_with_constructors(self,
         expected = end_constructor(expected_data)
         test_method(result, expected)
 
+        # Test scalar case as well
+        for scalar, expected in zip(data, expected_data):
+            result = pd.to_datetime(scalar, format='%Y%m%d %H%M%S', utc=True)
+            assert result == expected
+
     def test_to_datetime_utc_true_with_series_single_value(self):
         # GH 15760 UTC=True with Series
         ts = 1.5e18

pandas/tests/io/test_sql.py

@@ -1271,13 +1271,8 @@ def check(col):
 
                 # "2000-01-01 00:00:00-08:00" should convert to
                 # "2000-01-01 08:00:00"
-                assert col[0] == Timestamp('2000-01-01 08:00:00', tz='UTC')
-
                 # "2000-06-01 00:00:00-07:00" should convert to
                 # "2000-06-01 07:00:00"
-                assert col[1] == Timestamp('2000-06-01 07:00:00', tz='UTC')
-
-                # Double check that the Series has been localized correctly
                 # GH 6415
                 expected_data = [Timestamp('2000-01-01 08:00:00', tz='UTC'),
                                  Timestamp('2000-06-01 07:00:00', tz='UTC')]
@@ -1305,6 +1300,9 @@ def check(col):
                                self.conn, parse_dates=['DateColWithTz'])
         if not hasattr(df, 'DateColWithTz'):
             pytest.skip("no column with datetime with time zone")
+        col = df.DateColWithTz
+        assert is_datetime64tz_dtype(col.dtype)
+        assert str(col.dt.tz) == 'UTC'
         check(df.DateColWithTz)
 
         df = pd.concat(list(pd.read_sql_query("select * from types_test_data",
@@ -1314,9 +1312,8 @@ def check(col):
         assert is_datetime64tz_dtype(col.dtype)
         assert str(col.dt.tz) == 'UTC'
         expected = sql.read_sql_table("types_test_data", self.conn)
-        tm.assert_series_equal(df.DateColWithTz,
-                               expected.DateColWithTz
-                               .astype('datetime64[ns, UTC]'))
+        # Removed ".astype('datetime64[ns, UTC]')"after GH 6415 was fixed
+        tm.assert_series_equal(df.DateColWithTz, expected.DateColWithTz)
 
         # xref #7139
         # this might or might not be converted depending on the postgres driver