From 855b1b79821e88499b21f981f70cacc55fdbf4e0 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 20 Aug 2018 08:08:38 -0500 Subject: [PATCH 1/5] Revert "CI: add missing tzlocal dependency (rpy2, doc build) (#22424)" This reverts commit 52e186af3e0fed9415a2db9e0c8d7d75d1267a54. --- ci/travis-36-doc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/travis-36-doc.yaml b/ci/travis-36-doc.yaml index abb0426dbe08e..153a81197a6c7 100644 --- a/ci/travis-36-doc.yaml +++ b/ci/travis-36-doc.yaml @@ -36,7 +36,6 @@ dependencies: - sphinx - sqlalchemy - statsmodels - - tzlocal - xarray - xlrd - xlsxwriter From 71b4878a5ca0700c022f54a36fdf9be09a98c673 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 20 Aug 2018 09:06:22 -0500 Subject: [PATCH 2/5] Fix conflict with 83be235ab8470dc3a4e2fa55c79d54db3abc7e58 --- pandas/tests/extension/integer/test_integer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/integer/test_integer.py b/pandas/tests/extension/integer/test_integer.py index f1c833a68c66c..343fb63fe6f57 100644 --- a/pandas/tests/extension/integer/test_integer.py +++ b/pandas/tests/extension/integer/test_integer.py @@ -770,7 +770,7 @@ def test_groupby_mean_included(): df = pd.DataFrame({ "A": ['a', 'b', 'b'], "B": [1, None, 3], - "C": IntegerArray([1, None, 3], dtype='Int64'), + "C": integer_array([1, None, 3], dtype='Int64'), }) result = df.groupby("A").sum() From c33c1bc95064d14fe035596be240b2d309f436c0 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 20 Aug 2018 11:12:46 -0500 Subject: [PATCH 3/5] Revert "Revert "CI: add missing tzlocal dependency (rpy2, doc build) (#22424)"" This reverts commit 855b1b79821e88499b21f981f70cacc55fdbf4e0. --- ci/travis-36-doc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/travis-36-doc.yaml b/ci/travis-36-doc.yaml index 153a81197a6c7..abb0426dbe08e 100644 --- a/ci/travis-36-doc.yaml +++ b/ci/travis-36-doc.yaml @@ -36,6 +36,7 @@ dependencies: - sphinx - sqlalchemy - statsmodels + - tzlocal - xarray - xlrd - xlsxwriter From f83a8ae669a75cd35cedde9ef50a98203a64a545 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 20 Aug 2018 11:13:46 -0500 Subject: [PATCH 4/5] Pin blosc --- ci/travis-27.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/travis-27.yaml b/ci/travis-27.yaml index 3e94f334174e6..9c0347de9adfb 100644 --- a/ci/travis-27.yaml +++ b/ci/travis-27.yaml @@ -29,6 +29,7 @@ dependencies: - PyCrypto - pymysql=0.6.3 - pytables + - blosc=1.14.3 - python-blosc - python-dateutil=2.5.0 - python=2.7* From 099e1e8483aef155cc6a97caba8b71b414dd309b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 20 Aug 2018 11:33:44 -0500 Subject: [PATCH 5/5] use integer_array --- pandas/tests/extension/integer/test_integer.py | 2 +- pandas/tests/frame/test_block_internals.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandas/tests/extension/integer/test_integer.py b/pandas/tests/extension/integer/test_integer.py index 343fb63fe6f57..e2248285fd2a0 100644 --- a/pandas/tests/extension/integer/test_integer.py +++ b/pandas/tests/extension/integer/test_integer.py @@ -784,7 +784,7 @@ def test_groupby_mean_included(): def test_astype_nansafe(): # https://github.com/pandas-dev/pandas/pull/22343 - arr = IntegerArray([np.nan, 1, 2], dtype="Int8") + arr = integer_array([np.nan, 1, 2], dtype="Int8") with tm.assert_raises_regex( ValueError, 'cannot convert float NaN to integer'): diff --git a/pandas/tests/frame/test_block_internals.py b/pandas/tests/frame/test_block_internals.py index d096daaa0b664..3fe1c84174acb 100644 --- a/pandas/tests/frame/test_block_internals.py +++ b/pandas/tests/frame/test_block_internals.py @@ -12,7 +12,7 @@ from pandas import (DataFrame, Series, Timestamp, date_range, compat, option_context, Categorical) -from pandas.core.arrays import IntegerArray, IntervalArray +from pandas.core.arrays import IntervalArray, integer_array from pandas.compat import StringIO import pandas as pd @@ -440,9 +440,9 @@ def test_get_numeric_data(self): def test_get_numeric_data_extension_dtype(self): # GH 22290 df = DataFrame({ - 'A': IntegerArray([-10, np.nan, 0, 10, 20, 30], dtype='Int64'), + 'A': integer_array([-10, np.nan, 0, 10, 20, 30], dtype='Int64'), 'B': Categorical(list('abcabc')), - 'C': IntegerArray([0, 1, 2, 3, np.nan, 5], dtype='UInt8'), + 'C': integer_array([0, 1, 2, 3, np.nan, 5], dtype='UInt8'), 'D': IntervalArray.from_breaks(range(7))}) result = df._get_numeric_data() expected = df.loc[:, ['A', 'C']]