Skip to content

Commit

Permalink
BLD: use latest conda version with latest miniconda installer on appv…
Browse files Browse the repository at this point in the history
…eyor

change 3.6 build to use numpy=1.12 & add back xlwt (was not on
defaults for a while)

Author: Jeff Reback <jeff@reback.net>

Closes pandas-dev#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
  • Loading branch information
jreback committed Feb 15, 2017
1 parent 86ef3ca commit d6f8b46
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
15 changes: 6 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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%"
Expand All @@ -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'])"

2 changes: 1 addition & 1 deletion ci/requirements-3.5-64.run
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
python-dateutil
pytz
numpy
numpy=1.11*
openpyxl
xlsxwriter
xlrd
Expand Down
4 changes: 2 additions & 2 deletions ci/requirements-3.6-64.run
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
python-dateutil
pytz
numpy
numpy=1.12*
openpyxl
xlsxwriter
xlrd
#xlwt
xlwt
scipy
feather-format
numexpr
Expand Down

0 comments on commit d6f8b46

Please sign in to comment.