Skip to content

Commit 75babe6

Browse files
dstansbydstansby
authored
Merge pull request #8368 from anntzer/cleanup-appveyor-yml
Cleanup appveyor.yml.
2 parents f836bc3 + 76aca8e commit 75babe6

File tree

1 file changed

+36
-39
lines changed

1 file changed

+36
-39
lines changed

‎appveyor.yml renamed to ‎.appveyor.yml

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ environment:
1111
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
1212
# /E:ON and /V:ON options are not enabled in the batch script intepreter
1313
# See: http://stackoverflow.com/a/13751649/163740
14-
CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
14+
CMD_IN_ENV: cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd
1515
# Workaround for https://github.com/conda/conda-build/issues/636
16-
PYTHONIOENCODING: "UTF-8"
16+
PYTHONIOENCODING: UTF-8
1717
PYTEST_ARGS: -ra --timeout=300 --durations=25 -n %NUMBER_OF_PROCESSORS% --cov-report= --cov=lib -m "not network"
1818
PYTHONHASHSEED: 0 # Workaround for pytest-xdist flaky collection order
1919
# https://github.com/pytest-dev/pytest/issues/920
@@ -60,27 +60,27 @@ cache:
6060
- '%USERPROFILE%\.cache\matplotlib'
6161

6262
init:
63-
- cmd: "ECHO %PYTHON_VERSION% %CONDA_INSTALL_LOCN%"
63+
- echo %PYTHON_VERSION% %CONDA_INSTALL_LOCN%
6464

6565
install:
66-
- cmd: set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
67-
- cmd: set PYTHONUNBUFFERED=1
66+
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
67+
- set PYTHONUNBUFFERED=1
6868
# for obvci_appveyor_python_build_env.cmd
69-
- cmd: conda install -c pelson/channel/development --yes --quiet obvious-ci
69+
- conda install -c pelson/channel/development --yes --quiet obvious-ci
7070
# for msinttypes and newer stuff
7171
# conda-forge may serve outdated versions of certain packages (e.g. conda
7272
# itself), so append it to the end of the list.
73-
- cmd: conda config --append channels conda-forge
74-
- cmd: conda config --set show_channel_urls yes
75-
- cmd: conda config --set always_yes true
73+
- conda config --append channels conda-forge
74+
- conda config --set show_channel_urls yes
75+
- conda config --set always_yes true
7676
# For building conda packages
77-
- cmd: conda install --yes conda-build jinja2 anaconda-client
77+
- conda install --yes conda-build jinja2 anaconda-client
7878
# this is now the downloaded conda...
7979
- conda info -a
8080

8181
# Fix the appveyor build environment to work with conda build
8282
# workaround for missing vcvars64.bat in py34 64bit
83-
- cmd: copy ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64"
83+
- copy ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64"
8484

8585
# For building, use a new environment which only includes the requirements for mpl
8686
# same things as the requirements in ci/conda_recipe/meta.yaml
@@ -91,16 +91,16 @@ install:
9191
pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10"
9292
mock sphinx
9393
- activate test-environment
94-
- cmd: echo %PYTHON_VERSION% %TARGET_ARCH%
95-
- cmd: IF %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
94+
- echo %PYTHON_VERSION% %TARGET_ARCH%
95+
- if %PYTHON_VERSION% == 2.7 conda install -q backports.functools_lru_cache
9696
# pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
9797
- conda install -q pytest "pytest-cov>=2.3.1" pytest-timeout pytest-xdist
9898

9999
# Let the install prefer the static builds of the libs
100100
- set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
101-
- cmd: 'mkdir lib || cmd /c "exit /b 0"'
102-
- copy /Y %LIBRARY_LIB%\zlibstatic.lib lib\z.lib
103-
- copy /Y %LIBRARY_LIB%\libpng_static.lib lib\png.lib
101+
- mkdir lib || cmd /c "exit /b 0"
102+
- copy /y %LIBRARY_LIB%\zlibstatic.lib lib\z.lib
103+
- copy /y %LIBRARY_LIB%\libpng_static.lib lib\png.lib
104104
# These z.lib / png.lib are not static versions but files which end up as
105105
# dependencies to the dll file. This is fine for the conda build, but not here
106106
# and for the wheels
@@ -117,18 +117,15 @@ test_script:
117117
- '%CMD_IN_ENV% pip install --no-deps -ve .'
118118
# these should show no z, png, or freetype dll...
119119
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
120-
#- cmd: '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd'
121-
#- cmd: '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd'
122-
- cmd: '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
123-
- cmd: '"%DUMPBIN%" /DEPENDENTS lib\\matplotlib\\_png*.pyd | findstr z.*.dll && exit /b 1 || exit /b 0'
124-
- cmd: '"%DUMPBIN%" /DEPENDENTS lib\\matplotlib\\_png*.pyd | findstr png.*.dll && exit /b 1 || exit /b 0'
120+
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
121+
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd | findstr z.*.dll && exit /b 1 || exit /b 0'
122+
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\_png*.pyd | findstr png.*.dll && exit /b 1 || exit /b 0'
125123

126124
# this are optional dependencies so that we don't skip so many tests...
127-
- cmd: if x%TEST_ALL% == xyes; conda install -q pillow miktex inkscape
128-
# missing packages on conda-forge for ffmpeg avconv mencoder imagemagick
129-
- cmd: if x%TEST_ALL% == xyes; conda install -q -c menpo ffmpeg # a repackaged version
125+
- if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
126+
# missing packages on conda-forge for avconv mencoder imagemagick
130127
# This install sometimes failed randomly :-(
131-
#- cmd: choco install imagemagick
128+
#- choco install imagemagick
132129

133130
# Test import of tkagg backend
134131
- python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
@@ -145,26 +142,26 @@ after_test:
145142

146143
# Build the wheel with the static libs
147144
# Hide the output, the copied files really clutter the build log...
148-
- cmd: '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
145+
- '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
149146

150147
# And now the conda build after a cleanup...
151148
# cleanup build files so that they don't pollute the conda build but keep the wheel in dist...
152-
- cmd: git clean -d -x -f -e dist/
149+
- git clean -xdfq -e dist/
153150
# cleanup the environment so that the test-environment does not leak into the conda build...
154-
- cmd: set MPLBASEDIRLIST=
155-
- cmd: set LIBRARY_LIB=
156-
- cmd: deactivate
157-
- cmd: path
158-
- cmd: where python
159-
- cmd: '%CMD_IN_ENV% conda config --get channels'
160-
- cmd: '%CMD_IN_ENV% conda build -q .\ci\conda_recipe'
151+
- set MPLBASEDIRLIST=
152+
- set LIBRARY_LIB=
153+
- deactivate
154+
- path
155+
- where python
156+
- '%CMD_IN_ENV% conda config --get channels'
157+
- '%CMD_IN_ENV% conda build -q .\ci\conda_recipe'
161158

162159
# Move the conda package into the dist directory, to register it
163160
# as an "artifact" for Appveyor.
164-
- cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"'
165-
- cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"'
166-
- cmd: dir dist\
167-
- cmd: echo finished...
161+
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"
162+
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"
163+
- dir dist\
164+
- echo finished...
168165

169166
artifacts:
170167
- path: dist\*
@@ -179,7 +176,7 @@ on_finish:
179176
on_failure:
180177
- python tools/visualize_tests.py --no-browser
181178
- echo zipping images after a failure...
182-
- 7z a result_images.zip result_images\ |grep -v "Compressing"
179+
- 7z a result_images.zip result_images\ | grep -v "Compressing"
183180
- appveyor PushArtifact result_images.zip
184181

185182
matrix:

0 commit comments

Comments
 (0)