From c65fd6da06a211d8ded801268e9e05ab9fc8b4c3 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 27 Oct 2015 04:53:56 -0700 Subject: [PATCH 1/2] CI: use latest for 3.5 build (e.g. numpy 1.10.1), #11187 --- ci/requirements-3.5.build | 2 +- ci/requirements-3.5.run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/requirements-3.5.build b/ci/requirements-3.5.build index de36b1afb9fa4..9558cf00ddf5c 100644 --- a/ci/requirements-3.5.build +++ b/ci/requirements-3.5.build @@ -1,4 +1,4 @@ python-dateutil pytz -numpy=1.9.3 +numpy cython diff --git a/ci/requirements-3.5.run b/ci/requirements-3.5.run index 91938675280d9..8de8f7d8f0630 100644 --- a/ci/requirements-3.5.run +++ b/ci/requirements-3.5.run @@ -1,6 +1,6 @@ python-dateutil pytz -numpy=1.9.3 +numpy openpyxl xlsxwriter xlrd From c37724bfc9345b0f8bdd616ca6918a928bae1a10 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 27 Oct 2015 05:35:37 -0700 Subject: [PATCH 2/2] TST: invalid test for unsortable for > numpy 1.10, #11138 --- pandas/tests/test_categorical.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pandas/tests/test_categorical.py b/pandas/tests/test_categorical.py index e97010e1cb552..7ae39571c6e8e 100755 --- a/pandas/tests/test_categorical.py +++ b/pandas/tests/test_categorical.py @@ -87,11 +87,7 @@ def test_constructor_unsortable(self): self.assertFalse(factor.ordered) # this however will raise as cannot be sorted - # but fixed in newer versions of numpy - if LooseVersion(np.__version__) < "1.10": - self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True)) - else: - Categorical.from_array(arr, ordered=True) + self.assertRaises(TypeError, lambda : Categorical.from_array(arr, ordered=True)) def test_is_equal_dtype(self):