From 6d9064add6e9dbb890384c5f0bf61e8b2eb02b8e Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Sat, 4 Nov 2017 17:14:10 -0400 Subject: [PATCH] Revert "CI: temp disable scipy on windows 3.6 build (#18078)" (#18105) * Revert "CI: temp disable scipy on windows 3.6 build (#18078)" This reverts commit cd6dc87466e119aabb76d8439df8289d082ea948. * use numpy=1.13 --- appveyor.yml | 2 +- ci/requirements-3.6_WIN.run | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1f8886f6d068f..44af73b498aa88 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 5d6c074ec1f856..db2d429a2a4ffd 100644 --- a/ci/requirements-3.6_WIN.run +++ b/ci/requirements-3.6_WIN.run @@ -1,12 +1,12 @@ python-dateutil pytz -numpy=1.12* +numpy=1.13* bottleneck openpyxl xlsxwriter xlrd xlwt -# scipy +scipy feather-format numexpr pytables