Skip to content

Commit d6f8b46

Browse files
committed
BLD: use latest conda version with latest miniconda installer on appveyor
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
1 parent 86ef3ca commit d6f8b46

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

appveyor.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ environment:
1818

1919
matrix:
2020

21-
- CONDA_ROOT: "C:\\Miniconda3.5_64"
21+
- CONDA_ROOT: "C:\\Miniconda3_64"
2222
PYTHON_VERSION: "3.6"
2323
PYTHON_ARCH: "64"
2424
CONDA_PY: "36"
25-
CONDA_NPY: "111"
25+
CONDA_NPY: "112"
2626

27-
- CONDA_ROOT: "C:\\Miniconda3.5_64"
27+
- CONDA_ROOT: "C:\\Miniconda3_64"
2828
PYTHON_VERSION: "2.7"
2929
PYTHON_ARCH: "64"
3030
CONDA_PY: "27"
3131
CONDA_NPY: "110"
3232

33-
- CONDA_ROOT: "C:\\Miniconda3.5_64"
33+
- CONDA_ROOT: "C:\\Miniconda3_64"
3434
PYTHON_VERSION: "3.5"
3535
PYTHON_ARCH: "64"
3636
CONDA_PY: "35"
@@ -66,8 +66,7 @@ install:
6666

6767
# install our build environment
6868
- cmd: conda config --set show_channel_urls true --set always_yes true --set changeps1 false
69-
#- cmd: conda update -q conda
70-
- cmd: conda install conda=4.2.15
69+
- cmd: conda update -q conda
7170
- cmd: conda config --set ssl_verify false
7271

7372
# add the pandas channel *before* defaults to have defaults take priority
@@ -83,7 +82,7 @@ install:
8382
- cmd: '%CMD_IN_ENV% conda build ci\appveyor.recipe -q'
8483

8584
# create our env
86-
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% nose pytest
85+
- cmd: conda create -q -n pandas python=%PYTHON_VERSION% pytest
8786
- cmd: activate pandas
8887
- SET REQ=ci\requirements-%PYTHON_VERSION%-%PYTHON_ARCH%.run
8988
- cmd: echo "installing requirements from %REQ%"
@@ -95,7 +94,5 @@ install:
9594
test_script:
9695
# tests
9796
- cmd: activate pandas
98-
- cmd: conda list
9997
- cmd: cd \
10098
- cmd: python -c "import pandas; pandas.test(['--skip-slow', '--skip-network'])"
101-

ci/requirements-3.5-64.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
python-dateutil
22
pytz
3-
numpy
3+
numpy=1.11*
44
openpyxl
55
xlsxwriter
66
xlrd

ci/requirements-3.6-64.run

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
python-dateutil
22
pytz
3-
numpy
3+
numpy=1.12*
44
openpyxl
55
xlsxwriter
66
xlrd
7-
#xlwt
7+
xlwt
88
scipy
99
feather-format
1010
numexpr

0 commit comments

Comments
 (0)