BLD: use latest conda version with latest miniconda installer on appv…

…eyor change 3.6 build to use numpy=1.12 & add back xlwt (was not on defaults for a while) Author: Jeff Reback <[email protected]> Closes #15415 from jreback/appveyor and squashes the following commits: 2019f37 [Jeff Reback] force numpy version f82877b [Jeff Reback] remove extra conda list 3ace9f2 [Jeff Reback] CI: use numpy=1.12 on appveyor 6855a7b [Jeff Reback] BLD: use latest conda version with latest miniconda installer on appveyor
pandas-dev · Feb 15, 2017 · d6f8b46 · d6f8b46
1 parent 86ef3ca
commit d6f8b46
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -18,19 +18,19 @@ environment:
 
   matrix:
 
-    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+    - CONDA_ROOT: "C:\\Miniconda3_64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       CONDA_PY: "36"
-      CONDA_NPY: "111"
+      CONDA_NPY: "112"
 
-    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+    - CONDA_ROOT: "C:\\Miniconda3_64"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
       CONDA_PY: "27"
       CONDA_NPY: "110"
 
-    - CONDA_ROOT: "C:\\Miniconda3.5_64"
+    - CONDA_ROOT: "C:\\Miniconda3_64"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
       CONDA_PY: "35"
@@ -66,8 +66,7 @@ install:
 
   # install our build environment
   - cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
-  #- cmd: conda update -q conda
-  - cmd: conda install conda=4.2.15
+  - cmd: conda update -q conda
   - cmd: conda config --set ssl_verify false
 
   # add the pandas channel *before* defaults to have defaults take priority
@@ -83,7 +82,7 @@ install:
   - cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q'
 
   # create our env
-  - cmd: conda create -q -n pandas python=%PYTHON_VERSION% nose pytest
+  - cmd: conda create -q -n pandas python=%PYTHON_VERSION% pytest
   - cmd: activate pandas
   - SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
   - cmd: echo "installing requirements from %REQ%"
@@ -95,7 +94,5 @@ install:
 test_script:
   # tests
   - cmd: activate pandas
-  - cmd: conda list
   - cmd: cd \
   - cmd: python -c "import pandas; pandas.test(['--skip-slow', '--skip-network'])"
-
diff --git a/ci/requirements-3.5-64.run b/ci/requirements-3.5-64.run
@@ -1,6 +1,6 @@
 python-dateutil
 pytz
-numpy
+numpy=1.11*
 openpyxl
 xlsxwriter
 xlrd

diff --git a/ci/requirements-3.6-64.run b/ci/requirements-3.6-64.run
@@ -1,10 +1,10 @@
 python-dateutil
 pytz
-numpy
+numpy=1.12*
 openpyxl
 xlsxwriter
 xlrd
-#xlwt
+xlwt
 scipy
 feather-format
 numexpr