Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Apr 16, 2021. It is now read-only.

Commit ba88b08

Browse files
matthew-brettmatthew-brett
committed
Up recursionlimit for tests; add back Linux entries
1 parent 1c2c226 commit ba88b08

File tree

3 files changed

+63
-61
lines changed

3 files changed

+63
-61
lines changed

‎.travis.yml

Lines changed: 54 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -28,49 +28,60 @@ matrix:
2828
# Exclude the default Python 3.5 build
2929
- python: 3.5
3030
include:
31-
# - os: linux
32-
# env:
33-
# - MB_PYTHON_VERSION=2.7
34-
# - os: linux
35-
# env:
36-
# - MB_PYTHON_VERSION=2.7
37-
# - UNICODE_WIDTH=16
38-
# - os: linux
39-
# env:
40-
# - MB_PYTHON_VERSION=2.7
41-
# - PLAT=i686
42-
# - os: linux
43-
# env:
44-
# - MB_PYTHON_VERSION=2.7
45-
# - PLAT=i686
46-
# - UNICODE_WIDTH=16
47-
# - os: linux
48-
# env:
49-
# - MB_PYTHON_VERSION=3.4
50-
# - NP_BUILD_DEP="1.7.1"
51-
# - os: linux
52-
# env:
53-
# - MB_PYTHON_VERSION=3.4
54-
# - PLAT=i686
55-
# - NP_BUILD_DEP="1.7.1"
56-
# - os: linux
57-
# env:
58-
# - MB_PYTHON_VERSION=3.5
59-
# - NP_BUILD_DEP="1.9.3"
60-
# - os: linux
61-
# env:
62-
# - MB_PYTHON_VERSION=3.5
63-
# - PLAT=i686
64-
# - NP_BUILD_DEP="1.9.3"
65-
# - os: osx
66-
# language: generic
67-
# env:
68-
# - MB_PYTHON_VERSION=2.7
69-
# - os: osx
70-
# language: generic
71-
# env:
72-
# - MB_PYTHON_VERSION=3.4
73-
# - NP_BUILD_DEP="1.7.1"
31+
- os: linux
32+
env:
33+
- MB_PYTHON_VERSION=2.7
34+
- os: linux
35+
env:
36+
- MB_PYTHON_VERSION=2.7
37+
- UNICODE_WIDTH=16
38+
- os: linux
39+
env:
40+
- MB_PYTHON_VERSION=2.7
41+
- PLAT=i686
42+
- os: linux
43+
env:
44+
- MB_PYTHON_VERSION=2.7
45+
- PLAT=i686
46+
- UNICODE_WIDTH=16
47+
- os: linux
48+
env:
49+
- MB_PYTHON_VERSION=3.4
50+
- NP_BUILD_DEP="1.7.1"
51+
- os: linux
52+
env:
53+
- MB_PYTHON_VERSION=3.4
54+
- PLAT=i686
55+
- NP_BUILD_DEP="1.7.1"
56+
- os: linux
57+
env:
58+
- MB_PYTHON_VERSION=3.5
59+
- NP_BUILD_DEP="1.9.3"
60+
- os: linux
61+
env:
62+
- MB_PYTHON_VERSION=3.5
63+
- PLAT=i686
64+
- NP_BUILD_DEP="1.9.3"
65+
- os: linux
66+
env:
67+
- MB_PYTHON_VERSION=3.6
68+
- NP_BUILD_DEP="1.11.3"
69+
- NP_TEST_DEP="1.11.3"
70+
- os: linux
71+
env:
72+
- MB_PYTHON_VERSION=3.6
73+
- PLAT=i686
74+
- NP_BUILD_DEP="1.11.3"
75+
- NP_TEST_DEP="1.11.3"
76+
- os: osx
77+
language: generic
78+
env:
79+
- MB_PYTHON_VERSION=2.7
80+
- os: osx
81+
language: generic
82+
env:
83+
- MB_PYTHON_VERSION=3.4
84+
- NP_BUILD_DEP="1.7.1"
7485
- os: osx
7586
language: generic
7687
env:

‎config.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Define custom utilities
22
# Test for OSX with [ -n "$IS_OSX" ]
33

4+
# Commit where MPLLOCALFREETYPE introduced
5+
LOCAL_FT_COMMIT=5ad9b15
6+
7+
48
function pre_build {
59
# Any stuff that you need to do before you start building the wheels
610
# Runs in the root directory of this repository.
@@ -22,7 +26,7 @@ function pre_build {
2226
build_libpng
2327
build_bzip2
2428
# Use local freetype for versions which support it
25-
local has_local=$(cd matplotlib && set +e; git merge-base --is-ancestor 5ad9b15 HEAD && echo 1)
29+
local has_local=$(cd matplotlib && set +e; git merge-base --is-ancestor $LOCAL_FT_COMMIT HEAD && echo 1)
2630
if [ -n "$has_local" ]; then
2731
export MPLLOCALFREETYPE=1
2832
else
@@ -39,6 +43,7 @@ EOF
3943
function build_wheel {
4044
# Override common_utils build_wheel function to fix version error
4145
build_bdist_wheel $@
46+
# Test images then removed in .travis.yml
4247
}
4348

4449
function run_tests {
@@ -54,15 +59,14 @@ function run_tests {
5459
python -c "import matplotlib; print(matplotlib.__file__)"
5560
python -c "from matplotlib import font_manager"
5661

57-
# Patch testing function for recursion
58-
(cd $MPL_SRC_DIR && patch -p1 < ../recursion.patch)
59-
6062
echo "testing matplotlib using 1 process"
6163
# 1.5.x has pesky unicode error for sphinx extension test
6264
local mpl_version=$(python -c "import matplotlib; print(matplotlib.__version__)")
6365
if [[ "$mpl_version" =~ 1\. ]]; then
6466
local extra_test_args="-e TestTinyPages"
65-
fi
67+
else:
68+
# See gh issue 7799
69+
local extra_test_args="--recursionlimit==1500"
6670
python $MPL_SRC_DIR/tests.py -sv $extra_test_args
6771

6872
echo "Check import of tcl / tk"

‎recursion.patch

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

0 commit comments

Comments
 (0)