8000 Merge pull request #9773 from dopplershift/fix-appveyor · matplotlib/matplotlib@88a20b7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 88a20b7

Browse files
tacaswelltacaswell
committed
Merge pull request #9773 from dopplershift/fix-appveyor
CI: Make sure AppVeyor fails if tests fail
1 parent 6eda9ea commit 88a20b7

12 files changed

+19
-327
lines changed

‎.appveyor.yml

Lines changed: 15 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,28 @@ branches:
1111
environment:
1212

1313
global:
14-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
15-
# /E:ON and /V:ON options are not enabled in the batch script intepreter
16-
# See: http://stackoverflow.com/a/13751649/163740
17-
CMD_IN_ENV: cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd
18-
# Workaround for https://github.com/conda/conda-build/issues/636
1914
PYTHONIOENCODING: UTF-8
2015
PYTEST_ARGS: -rawR --timeout=300 --durations=25 --cov-report= --cov=lib -m "not network"
2116
PYTHONHASHSEED: 0 # Workaround for pytest-xdist flaky collection order
2217
# https://github.com/pytest-dev/pytest/issues/920
2318
# https://github.com/pytest-dev/pytest/issues/1075
2419

2520
matrix:
26-
# for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
2721
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2822
# one for 64bit because we construct envs anyway. But using one for the
2923
# right python version is hopefully making it fast due to package caching.
30-
- TARGET_ARCH: "x64"
31-
CONDA_PY: "27"
32-
CONDA_NPY: "18"
33-
PYTHON_VERSION: "2.7"
34-
TEST_ALL: "no"
24+
- PYTHON_VERSION: "2.7"
3525
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
36-
- TARGET_ARCH: "x64"
37-
CONDA_PY: "35"
38-
CONDA_NPY: "110"
39-
PYTHON_VERSION: "3.5"
26+
TEST_ALL: "no"
27+
- PYTHON_VERSION: "3.5"
4028
CONDA_INSTALL_LOCN: "C:\\Miniconda35-x64"
4129
TEST_ALL: "no"
42-
- TARGET_ARCH: "x64"
43-
CONDA_PY: "36"
44-
PYTHON_VERSION: "3.6"
45-
CONDA_NPY: "111"
30+
- PYTHON_VERSION: "3.6"
4631
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
4732
TEST_ALL: "no"
4833

4934
# We always use a 64-bit machine, but can build x86 distributions
50-
# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
35+
# with the PYTHON_ARCH variable
5136
platform:
5237
- x64
5338

@@ -64,23 +49,14 @@ init:
6449
install:
6550
- set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
6651
- set PYTHONUNBUFFERED=1
67-
# for obvci_appveyor_python_build_env.cmd
68-
- conda update --all --yes
69-
- conda install anaconda-client=1.6.3 --yes
70-
- conda install -c conda-forge --yes obvious-ci
7152
# for msinttypes and newer stuff
72-
- conda config --prepend channels conda-forge
73-
- conda config --set show_channel_urls yes
7453
- conda config --set always_yes true
75-
# For building conda packages
76-
- conda install --yes conda-build jinja2 anaconda-client
54+
- conda update --all
55+
- conda config --set show_channel_urls yes
56+
- conda config --prepend channels conda-forge
7757
# this is now the downloaded conda...
7858
- conda info -a
7959

80-
# Fix the appveyor build environment to work with conda build
81-
# workaround for missing vcvars64.bat in py34 64bit
82-
- copy ci\appveyor\vcvars64.bat "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64"
83-
8460
# For building, use a new environment which only includes the requirements for mpl
8561
# same things as the requirements in ci/conda_recipe/meta.yaml
8662
# if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
@@ -100,7 +76,7 @@ install:
10076
# https://github.com/matplotlib/matplotlib/issues/9176
10177
- python -c "import sys; sys.exit(not (3,) < sys.version_info < (3,6,3))" && (
10278
curl -sL https://github.com/python/cpython/pull/1224.patch |
103-
patch -fsup 1 -d %CONDA_PREFIX% ) || ( set errorlevel= )
79+
patch -fsup 1 -d %CONDA_PREFIX% ) || cmd /c "exit /b 0"
10480

10581
# Let the install prefer the static builds of the libs
10682
- set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
@@ -120,7 +96,7 @@ install:
12096

12197
test_script:
12298
# Now build the thing..
123-
- '%CMD_IN_ENV% pip install --no-deps -ve .'
99+
- pip install -ve .
124100
# these should show no z, png, or freetype dll...
125101
- set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
126102
- '"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -138,34 +114,11 @@ test_script:
138114
# tests
139115
- echo The following args are passed to pytest %PYTEST_ARGS%
140116
- python tests.py %PYTEST_ARGS%
141-
# Generate a html for visual tests
142-
- python tools/visualize_tests.py --no-browser
143-
- pip install codecov
144-
- codecov -e PYTHON_VERSION PLATFORM
145117

146118
after_test:
147-
# After the tests were a success, build packages (wheels and conda)
148-
149-
# Build the wheel with the static libs
119+
# After the tests were a success, build wheels with the static libs
150120
# Hide the output, the copied files really clutter the build log...
151-
- '%CMD_IN_ENV% python setup.py bdist_wheel > NUL:'
152-
153-
# And now the conda build after a cleanup...
154-
# cleanup build files so that they don't pollute the conda build but keep the wheel in dist...
155-
- git clean -xdfq -e dist/
156-
# cleanup the environment so that the test-environment does not leak into the conda build...
157-
- set MPLBASEDIRLIST=
158-
- set LIBRARY_LIB=
159-
- deactivate
160-
- path
161-
- where python
162-
- '%CMD_IN_ENV% conda config --get channels'
163-
- '%CMD_IN_ENV% conda build -q .\ci\conda_recipe'
164-
165-
# Move the conda package into the dist directory, to register it
166-
# as an "artifact" for Appveyor.
167-
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-32\*.bz2 dist || cmd /c "exit /b 0"
168-
- copy /y %CONDA_INSTALL_LOCN%\conda-bld\win-64\*.bz2 dist || cmd /c "exit /b 0"
121+
- 'python setup.py bdist_wheel > NUL:'
169122
- dir dist\
170123
- echo finished...
171124

@@ -178,8 +131,11 @@ artifacts:
178131
type: zip
179132

180133
on_finish:
134+
- pip install codecov
135+
- codecov -e PYTHON_VERSION PLATFORM
181136

182137
on_failure:
138+
# Generate a html for visual tests
183139
- python tools/visualize_tests.py --no-browser
184140
- echo zipping images after a failure...
185141
- 7z a result_images.zip result_images\ | grep -v "Compressing"

‎ci/appveyor/vcvars64.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎ci/conda_recipe/README.md

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

‎ci/conda_recipe/bld.bat

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

‎ci/conda_recipe/build.sh

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

‎ci/conda_recipe/cfg_qt4agg.patch

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

‎ci/conda_recipe/condaversion.patch

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

‎ci/conda_recipe/meta.yaml

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

‎ci/conda_recipe/osx-tk.patch

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

‎ci/conda_recipe/rctmp_pyside.patch

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

0 commit comments

Comments
 (0)
0