Skip to content

Commit 6600dd6

Browse files
committed
Fix Appveyor builds by using latest Miniconda (#170)
* update appveyor to latest conda versions * remove scipy version restriction * scipy back to 0.16, python back to 3.4 * remove unused cmdinenv * try using conda env * fix conda create syntax
1 parent 7e03bec commit 6600dd6

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

appveyor.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
# This file was based on Olivier Grisel's python-appveyor-demo
44

55
environment:
6-
global:
7-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
8-
# /E:ON and /V:ON options are not enabled in the batch script intepreter
9-
# See: http://stackoverflow.com/a/13751649/163740
10-
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
116

127
matrix:
138
- PYTHON: "C:\\Python27-conda32"
@@ -32,7 +27,9 @@ install:
3227
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
3328

3429
# install depenencies
35-
- "conda install --yes --quiet pip numpy scipy=0.16.0 pandas nose pytz ephem numba"
30+
- "conda create -n test_env --yes python=%PYTHON_VERSION% pip numpy scipy=0.16.0 pandas nose pytz ephem numba"
31+
- "activate test_env"
32+
- "conda list"
3633

3734
# install pvlib
3835
- "python setup.py install"

ci/install_python.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ $BASE_URL = "https://www.python.org/ftp/python/"
88

99
function DownloadMiniconda ($python_version, $platform_suffix) {
1010
$webclient = New-Object System.Net.WebClient
11-
if ($python_version -eq "3.4") {
12-
$filename = "Miniconda3-3.7.3-Windows-" + $platform_suffix + ".exe"
11+
if ($python_version -like "3.*") {
12+
$filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
1313
} else {
14-
$filename = "Miniconda-3.7.3-Windows-" + $platform_suffix + ".exe"
14+
$filename = "Miniconda2-latest-Windows-" + $platform_suffix + ".exe"
1515
}
1616
$url = $MINICONDA_URL + $filename
1717

@@ -90,4 +90,4 @@ function main () {
9090
InstallMinicondaPip $env:PYTHON
9191
}
9292

93-
main
93+
main

0 commit comments

Comments
 (0)