Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc91c8ad

Browse files
authored
Merge pull request#9773 from dopplershift/fix-appveyor
CI: Make sure AppVeyor fails if tests fail
2 parents813d842 +16512ee commitc91c8ad

File tree

12 files changed

+19
-327
lines changed

12 files changed

+19
-327
lines changed

‎.appveyor.yml

Lines changed: 15 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,26 @@ 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 --numprocesses=auto --timeout=300 --durations=25
2116
--cov-report= --cov=lib -m "not network"
2217

2318
matrix:
24-
# for testing purpose: numpy 1.8 on py2.7, for the rest use 1.10/latest
2519
# theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,
2620
# one for 64bit because we construct envs anyway. But using one for the
2721
# right python version is hopefully making it fast due to package caching.
28-
-TARGET_ARCH:"x64"
29-
CONDA_PY:"27"
30-
CONDA_NPY:"18"
31-
PYTHON_VERSION:"2.7"
32-
TEST_ALL:"no"
22+
-PYTHON_VERSION:"2.7"
3323
CONDA_INSTALL_LOCN:"C:\\Miniconda-x64"
34-
-TARGET_ARCH:"x64"
35-
CONDA_PY:"35"
36-
CONDA_NPY:"110"
37-
PYTHON_VERSION:"3.5"
24+
TEST_ALL:"no"
25+
-PYTHON_VERSION:"3.5"
3826
CONDA_INSTALL_LOCN:"C:\\Miniconda35-x64"
3927
TEST_ALL:"no"
40-
-TARGET_ARCH:"x64"
41-
CONDA_PY:"36"
42-
PYTHON_VERSION:"3.6"
43-
CONDA_NPY:"111"
28+
-PYTHON_VERSION:"3.6"
4429
CONDA_INSTALL_LOCN:"C:\\Miniconda36-x64"
4530
TEST_ALL:"no"
4631

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

@@ -62,23 +47,14 @@ init:
6247
install:
6348
-set PATH=%CONDA_INSTALL_LOCN%;%CONDA_INSTALL_LOCN%\scripts;%PATH%;
6449
-set PYTHONUNBUFFERED=1
65-
# for obvci_appveyor_python_build_env.cmd
66-
-conda update --all --yes
67-
-conda install anaconda-client=1.6.3 --yes
68-
-conda install -c conda-forge --yes obvious-ci
6950
# for msinttypes and newer stuff
70-
-conda config --prepend channels conda-forge
71-
-conda config --set show_channel_urls yes
7251
-conda config --set always_yes true
73-
# For building conda packages
74-
-conda install --yes conda-build jinja2 anaconda-client
52+
-conda update --all
53+
-conda config --set show_channel_urls yes
54+
-conda config --prepend channels conda-forge
7555
# this is now the downloaded conda...
7656
-conda info -a
7757

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

10177
# Let the install prefer the static builds of the libs
10278
-set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
@@ -116,7 +92,7 @@ install:
11692

11793
test_script:
11894
# Now build the thing..
119-
-'%CMD_IN_ENV%pip install -ve .'
95+
-pip install -ve .
12096
# these should show no z, png, or freetype dll...
12197
-set "DUMPBIN=%VS140COMNTOOLS%\..\..\VC\bin\dumpbin.exe"
12298
-'"%DUMPBIN%" /DEPENDENTS lib\matplotlib\ft2font*.pyd | findstr freetype.*.dll && exit /b 1 || exit /b 0'
@@ -134,34 +110,11 @@ test_script:
134110
# tests
135111
-echo The following args are passed to pytest %PYTEST_ARGS%
136112
-python tests.py %PYTEST_ARGS%
137-
# Generate a html for visual tests
138-
-python tools/visualize_tests.py --no-browser
139-
-pip install codecov
140-
-codecov -e PYTHON_VERSION PLATFORM
141113

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

@@ -174,8 +127,11 @@ artifacts:
174127
type:zip
175128

176129
on_finish:
130+
-pip install codecov
131+
-codecov -e PYTHON_VERSION PLATFORM
177132

178133
on_failure:
134+
# Generate a html for visual tests
179135
-python tools/visualize_tests.py --no-browser
180136
-echo zipping images after a failure...
181137
-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)

[8]ページ先頭

©2009-2025 Movatter.jp