8000 Merge remote-tracking branch 'origin/daily' · MacPython/matplotlib-wheels@ca9869d · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Apr 16, 2021. It is now read-only.

Commit ca9869d

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'origin/daily'
2 parents 7c2b2a6 + 98c91af commit ca9869d

File tree

2 files changed

+39
-15
lines changed

2 files changed

+39
-15
lines changed

‎.travis.yml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,32 @@ matrix:
9696
- MB_PYTHON_VERSION=3.6
9797
- NP_BUILD_DEP="1.11.3"
9898
- NP_TEST_DEP="1.11.3"
99+
allow_failures:
100+
- os: linux
101+
env:
102+
- MB_PYTHON_VERSION=2.7
103+
- PLAT=i686
104+
- os: linux
105+
env:
106+
- MB_PYTHON_VERSION=2.7
107+
- PLAT=i686
108+
- UNICODE_WIDTH=16
109+
- os: linux
110+
env:
111+
- MB_PYTHON_VERSION=3.4
112+
- PLAT=i686
113+
- NP_BUILD_DEP="1.7.1"
114+
- os: linux
115+
env:
116+
- MB_PYTHON_VERSION=3.5
117+
- PLAT=i686
118+
- NP_BUILD_DEP="1.9.3"
119+
- os: linux
120+
env:
121+
- MB_PYTHON_VERSION=3.6
122+
- PLAT=i686
123+
- NP_BUILD_DEP="1.11.3"
124+
- NP_TEST_DEP="1.11.3"
99125

100126
before_install:
101127
- if [ -z "$DAILY_COMMIT" ]; then
@@ -119,7 +145,7 @@ install:
119145
- python rm_test_images.py wheelhouse/*.whl
120146

121147
script:
122-
- TEST_DEPENDS="numpy==$NP_TEST_DEP nose mock sphinx"
148+
- TEST_DEPENDS="numpy==$NP_TEST_DEP pytest mock sphinx pytest pytest-timeout pytest-xdist pytest-faulthandler pytest-rerunfailures"
123149
# increase number of open files allowed for tests, on OSX
124150
# https://github.com/matplotlib/matplotlib/issues/3315
125151
- ulimit -n 4096

‎config.sh

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
# Commit where MPLLOCALFREETYPE introduced
55
LOCAL_FT_COMMIT=5ad9b15
66

7+
# Test arguments
8+
NPROC=2
9+
PYTEST_ARGS="-ra --maxfail=1 --timeout=300 --durations=25 -n $NPROC"
10+
711

812
function pre_build {
913
# Any stuff that you need to do before you start building the wheels
@@ -54,10 +58,6 @@ function run_tests {
5458
MPL_INSTALL_DIR=$(dirname $(python -c 'import matplotlib; print(matplotlib.__file__)'))
5559
cp -r ${MPL_SRC_DIR}/lib/matplotlib/tests/baseline_images $MPL_INSTALL_DIR/tests
5660

57-
# Patch test_image file to fix test order bug
58-
local patch_file=$(abspath ../patches/test_image.patch)
59-
(cd $MPL_INSTALL_DIR && patch -p0 < $patch_file)
60-
6161
if [ -z "$IS_OSX" ]; then
6262
# Need fc-list for tests
6363
sudo apt-get install fontconfig
@@ -69,16 +69,14 @@ function run_tests {
6969
python -c "import matplotlib; print(matplotlib.__file__)"
7070
python -c "from matplotlib import font_manager"
7171

72-
echo "testing matplotlib using 1 process"
73-
# 1.5.x has pesky unicode error for sphinx extension test
74-
local mpl_version=$(python -c "import matplotlib; print(matplotlib.__version__)")
75-
if [[ "$mpl_version" =~ 1\. ]]; then
76-
local extra_test_args="-e TestTinyPages"
77-
else
78-
# See gh issue 7799
79-
local extra_test_args="--recursionlimit=1500"
80-
fi
81-
python $MPL_SRC_DIR/tests.py -sv $extra_test_args
72+
# Workaround for pytest-xdist flaky collection order
73+
# https://github.com/pytest-dev/pytest/issues/920
74+
# https://github.com/pytest-dev/pytest/issues/1075
75+
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')
76+
echo PYTHONHASHSEED=$PYTHONHASHSEED
77+
78+
echo "testing matplotlib using $NPROC process(es)"
79+
py.test $PYTEST_ARGS $MPL_INSTALL_DIR $(dirname ${MPL_INSTALL_DIR})/mpl_toolkits
8280

8381
echo "Check import of tcl / tk"
8482
MPLBACKEND="tkagg" python -c 'import matplotlib.pyplot as plt; print(plt.get_backend())'

0 commit comments

Comments
 (0)
0