From 84937c381c3d933a97c870e067f7b0421227937b Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 4 Nov 2017 14:19:03 -0400 Subject: [PATCH 1/2] Revert "CI: temp disable scipy on windows 3.6 build (#18078)" This reverts commit cd6dc87466e119aabb76d8439df8289d082ea948. --- ci/requirements-3.6_WIN.run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/requirements-3.6_WIN.run b/ci/requirements-3.6_WIN.run index 5d6c074ec1f85..af7a90b126f22 100644 --- a/ci/requirements-3.6_WIN.run +++ b/ci/requirements-3.6_WIN.run @@ -6,7 +6,7 @@ openpyxl xlsxwriter xlrd xlwt -# scipy +scipy feather-format numexpr pytables From 1b61ea42091acdf0c8dad6f8bc6daca3ed61b9d0 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 4 Nov 2017 14:51:50 -0400 Subject: [PATCH 2/2] use numpy=1.13 --- appveyor.yml | 2 +- ci/requirements-3.6_WIN.run | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1f8886f6d068..44af73b498aa8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ environment: PYTHON_VERSION: "3.6" PYTHON_ARCH: "64" CONDA_PY: "36" - CONDA_NPY: "112" + CONDA_NPY: "113" - CONDA_ROOT: "C:\\Miniconda3_64" PYTHON_VERSION: "2.7" diff --git a/ci/requirements-3.6_WIN.run b/ci/requirements-3.6_WIN.run index af7a90b126f22..db2d429a2a4ff 100644 --- a/ci/requirements-3.6_WIN.run +++ b/ci/requirements-3.6_WIN.run @@ -1,6 +1,6 @@ python-dateutil pytz -numpy=1.12* +numpy=1.13* bottleneck openpyxl xlsxwriter