diff --git a/appveyor.yml b/appveyor.yml index 1b2f3991..05ce7a6c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,7 @@ environment: CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci\\appveyor\\run_with_env.cmd" matrix: - - PYTHON: "C:\\Python27_64" - PYTHON_VERSION: "2.7" + - PYTHON_VERSION: "2.7" PYTHON_ARCH: "64" PANDAS_VERSION: "0.16.1" NUMPY_VERSION: "1.9.2" @@ -40,22 +39,19 @@ environment: NUMPY_VERSION: "1.10.4" SCIPY_VERSION: "0.16.1" - - PYTHON: "C:\\Python27_64" - PYTHON_VERSION: "2.7" + - PYTHON_VERSION: "2.7" PYTHON_ARCH: "32" PANDAS_VERSION: "0.17.1" NUMPY_VERSION: "1.10.4" SCIPY_VERSION: "0.16.1" - - PYTHON: "C:\\Python34_64" - PYTHON_VERSION: "3.4" + - PYTHON_VERSION: "3.4" PYTHON_ARCH: "64" PANDAS_VERSION: "0.17.1" NUMPY_VERSION: "1.10.4" SCIPY_VERSION: "0.16.1" - - PYTHON: "C:\\Python34_64" - PYTHON_VERSION: "3.4" + - PYTHON_VERSION: "3.4" PYTHON_ARCH: "32" PANDAS_VERSION: "0.17.1" NUMPY_VERSION: "1.10.4" @@ -87,6 +83,11 @@ install: Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` throw "There are newer queued builds for this pull request, failing early." } + - ps: $NPY_VERSION_ARR=$env:NUMPY_VERSION -split '.', 0, 'simplematch' + - ps: $env:CONDA_NPY=$NPY_VERSION_ARR[0..1] -join "" + - ps: $PY_VERSION_ARR=$env:PYTHON_VERSION -split '.', 0, 'simplematch' + - ps: $env:CONDA_PY=$PY_VERSION_ARR[0..1] -join "" + - SET PYTHON=C:\Python%CONDA_PY%_64 # Get cygwin's git out of our PATH. See https://github.com/omnia-md/conda-dev-recipes/pull/16/files#diff-180360612c6b8c4ed830919bbb4dd459 - "del C:\\cygwin\\bin\\git.exe" # this installs the appropriate Miniconda (Py2/Py3, 32/64 bit), @@ -101,10 +102,6 @@ install: # https://blog.ionelmc.ro/2014/12/21/compiling-python-extensions-on-windows/ for 64bit C compilation - ps: copy .\ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64" - - ps: $NPY_VERSION_ARR=$env:NUMPY_VERSION -split '.', 0, 'simplematch' - - ps: $env:CONDA_NPY=$NPY_VERSION_ARR[0..1] -join "" - - ps: $PY_VERSION_ARR=$env:PYTHON_VERSION -split '.', 0, 'simplematch' - - ps: $env:CONDA_PY=$PY_VERSION_ARR[0..1] -join "" - cmd: '%CMD_IN_ENV% conda build conda/bcolz --python=%CONDA_PY% --numpy=%CONDA_NPY%' - cmd: '%CMD_IN_ENV% conda build conda/cyordereddict --python=%CONDA_PY% --numpy=%CONDA_NPY%' - cmd: '%CMD_IN_ENV% conda build conda/logbook --python=%CONDA_PY% --numpy=%CONDA_NPY%'