Skip to content

Commit 62cf0ae

Browse files
authored
Fix appveyor builds (#207)
* double quotes * different quotes * escape quotes * follow metpys example * add pytest. improve comments * remove install_python.ps1. add whatsnew note * wrong issue number
1 parent 707e04c commit 62cf0ae

File tree

3 files changed

+27
-117
lines changed

3 files changed

+27
-117
lines changed

appveyor.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,41 @@
11
# CI on Windows via appveyor
2-
# This file was based on pandas' and xarray's appveyor.yml
3-
# This file was based on Olivier Grisel's python-appveyor-demo
2+
# This file is based on MetPy's appveyor.yml
43

54
environment:
65

6+
CONDA_PATH: "C:\\Miniconda"
7+
78
matrix:
8-
- PYTHON: "C:\\Python27-conda32"
9-
PYTHON_VERSION: "2.7"
10-
PYTHON_ARCH: "32"
9+
- PYTHON_VERSION: "2.7"
10+
- PYTHON_VERSION: "3.4"
11+
#- PYTHON_VERSION: "3.5"
1112

12-
- PYTHON: "C:\\Python34-conda64"
13-
PYTHON_VERSION: "3.4"
14-
PYTHON_ARCH: "64"
13+
platform:
14+
- x86
15+
- x64
1516

1617
install:
17-
# Install miniconda Python
18-
- "powershell ./ci/install_python.ps1"
19-
20-
# Prepend newly installed Python to the PATH of this build (this cannot be
21-
# done from inside the powershell script as it would require to restart
22-
# the parent CMD process).
23-
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
24-
25-
# Check that we have the expected version and architecture for Python
26-
- "python --version"
27-
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
18+
# Use the pre-installed Miniconda for the desired arch
19+
- ps: if($env:PYTHON_VERSION -eq '3.5')
20+
{ $env:CONDA_PATH="$($env:CONDA_PATH)35" }
21+
- ps: if($env:TARGET_ARCH -eq 'x64')
22+
{ $env:CONDA_PATH="$($env:CONDA_PATH)-x64" }
23+
- ps: $env:path="$($env:CONDA_PATH);$($env:CONDA_PATH)\Scripts;$($env:CONDA_PATH)\Library\bin;C:\cygwin\bin;$($env:PATH)"
24+
- cmd: conda config --set always_yes yes --set changeps1 no
25+
- cmd: conda update -q conda
26+
# Useful for debugging any issues with conda
27+
- cmd: conda info -a
2828

2929
# install depenencies
30-
- "conda create -n test_env --yes --quiet python=%PYTHON_VERSION% pip numpy scipy=0.16.0 pandas nose pytz ephem numba"
31-
- "activate test_env"
32-
- "conda list"
30+
- cmd: conda create -n test_env --yes --quiet python=%PYTHON_VERSION% pip numpy scipy=0.16.0 pandas nose pytest pytz ephem numba
31+
- cmd: activate test_env
32+
- cmd: python --version
33+
- cmd: conda list
3334

3435
# install pvlib
35-
- "python setup.py install"
36+
- cmd: pip install -e .
3637

3738
build: false
3839

3940
test_script:
40-
- "py.test -v pvlib"
41+
- cmd: py.test -v pvlib

ci/install_python.ps1

Lines changed: 0 additions & 93 deletions
This file was deleted.

docs/sphinx/source/whatsnew/v0.4.0.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Other
3939
~~~~~
4040

4141
* Switch to the py.test testing framework. (:issue:`204`)
42+
* Reconfigure Appveyor CI builds and resolve an issue in which the command
43+
line length was too long. (:issue:`207`)
4244

4345

4446
Code Contributors

0 commit comments

Comments
 (0)