From c07ca2b2b910add2f6500cdca2e1871aa105eb68 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Nov 2017 12:48:52 -0500 Subject: [PATCH 1/3] 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 dda1db152c36326b4eeb854e318b02055daca891 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Nov 2017 12:49:24 -0500 Subject: [PATCH 2/3] CI: Update Appveyor root miniconda xref https://github.com/conda/conda/issues/6251 Closes https://github.com/pandas-dev/pandas/issues/18073 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1f8886f6d068..453396eccd8cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,13 +18,13 @@ environment: matrix: - - CONDA_ROOT: "C:\\Miniconda3_64" + - CONDA_ROOT: "C:\\Miniconda36_64" PYTHON_VERSION: "3.6" PYTHON_ARCH: "64" CONDA_PY: "36" CONDA_NPY: "112" - - CONDA_ROOT: "C:\\Miniconda3_64" + - CONDA_ROOT: "C:\\Miniconda36_64" PYTHON_VERSION: "2.7" PYTHON_ARCH: "64" CONDA_PY: "27" From 0f7358117317621fdf21600d4bf6397c9ba60ecd Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Fri, 3 Nov 2017 13:34:13 -0500 Subject: [PATCH 3/3] Clean up appveyor --- appveyor.yml | 6 ------ ci/requirements-2.7_WIN.run | 1 + ci/requirements-3.6_WIN.run | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 453396eccd8cd..8e6a4f03750e0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -74,18 +74,12 @@ install: # create our env - cmd: conda create -n pandas python=%PYTHON_VERSION% cython pytest>=3.1.0 pytest-xdist - cmd: activate pandas - - cmd: pip install moto - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.run - cmd: echo "installing requirements from %REQ%" - cmd: conda install -n pandas --file=%REQ% - cmd: conda list -n pandas - cmd: echo "installing requirements from %REQ% - done" - # add some pip only reqs to the env - - SET REQ=ci\requirements-%PYTHON_VERSION%_WIN.pip - - cmd: echo "installing requirements from %REQ%" - - cmd: pip install -Ur %REQ% - # build em using the local source checkout in the correct windows env - cmd: '%CMD_IN_ENV% python setup.py build_ext --inplace' diff --git a/ci/requirements-2.7_WIN.run b/ci/requirements-2.7_WIN.run index c4ca7fc736bb1..4f638c03b8817 100644 --- a/ci/requirements-2.7_WIN.run +++ b/ci/requirements-2.7_WIN.run @@ -16,3 +16,4 @@ bottleneck html5lib beautifulsoup4 jinja2=2.8 +moto \ No newline at end of file diff --git a/ci/requirements-3.6_WIN.run b/ci/requirements-3.6_WIN.run index af7a90b126f22..263e20b85a1f6 100644 --- a/ci/requirements-3.6_WIN.run +++ b/ci/requirements-3.6_WIN.run @@ -14,3 +14,4 @@ matplotlib blosc fastparquet pyarrow +moto \ No newline at end of file