8000 Test display test workaround · MacPython/matplotlib-wheels@3a1d376 · 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 3a1d376

Browse files
committed
Test display test workaround
1 parent 18225cc commit 3a1d376

File tree

3 files changed

+15
-84
lines changed

3 files changed

+15
-84
lines changed

.travis.yml

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -35,93 +35,9 @@ matrix:
3535
env:
3636
- MB_PYTHON_VERSION=2.7
3737
- os: linux
38-
env:
39-
- MB_PYTHON_VERSION=2.7
40-
- UNICODE_WIDTH=16
41-
- os: linux
42-
env:
43-
- MB_PYTHON_VERSION=2.7
44-
- PLAT=i686
45-
- os: linux
46-
env:
47-
- MB_PYTHON_VERSION=2.7
48-
- PLAT=i686
49-
- UNICODE_WIDTH=16
50-
- os: linux
51-
env:
52-
- MB_PYTHON_VERSION=3.4
53-
- NP_BUILD_DEP="1.7.1"
54-
- os: linux
55-
env:
56-
- MB_PYTHON_VERSION=3.4
57-
- PLAT=i686
58-
- NP_BUILD_DEP="1.7.1"
59-
- os: linux
60-
env:
61-
- MB_PYTHON_VERSION=3.5
62-
- NP_BUILD_DEP="1.9.3"
63-
- os: linux
64-
env:
65-
- MB_PYTHON_VERSION=3.5
66-
- PLAT=i686
67-
- NP_BUILD_DEP="1.9.3"
68-
- os: linux
69-
env:
70-
- MB_PYTHON_VERSION=3.6
71-
- NP_BUILD_DEP="1.11.3"
72-
- NP_TEST_DEP="1.11.3"
73-
- os: linux
74-
env:
75-
- MB_PYTHON_VERSION=3.6
76-
- PLAT=i686
77-
- NP_BUILD_DEP="1.11.3"
78-
- NP_TEST_DEP="1.11.3"
79-
- os: osx
80-
language: generic
81-
env:
82-
- MB_PYTHON_VERSION=2.7
83-
- os: osx
84-
language: generic
8538
env:
8639
- MB_PYTHON_VERSION=3.4
8740
- NP_BUILD_DEP="1.7.1"
88-
- os: osx
89-
language: generic
90-
env:
91-
- MB_PYTHON_VERSION=3.5
92-
- NP_BUILD_DEP="1.9.3"
93-
- os: osx
94-
language: generic
95-
env:
96-
- MB_PYTHON_VERSION=3.6
97-
- NP_BUILD_DEP="1.11.3"
98-
- 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"
12541

12642
before_install:
12743
- if [ -z "$DAILY_COMMIT" ]; then

config.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ function run_tests {
5858
MPL_INSTALL_DIR=$(dirname $(python -c 'import matplotlib; print(matplotlib.__file__)'))
5959
cp -r ${MPL_SRC_DIR}/lib/matplotlib/tests/baseline_images $MPL_INSTALL_DIR/tests
6060

61+
# Patch test_image file to test workaround for issue 8679
62+
local patch_file=$(abspath ../patches/test_backends.patch)
63+
(cd $MPL_INSTALL_DIR && patch -p0 < $patch_file)
64+
6165
if [ -z "$IS_OSX" ]; then
6266
# Need fc-list for tests
6367
sudo apt-get install fontconfig

patches/test_backends.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- tests/test_backends_interactive.py.old 2017-05-29 20:56:31.000000000 +0100
2+
+++ tests/test_backends_interactive.py 2017-05-29 20:57:15.000000000 +0100
3+
@@ -41,7 +41,7 @@
4+
"""
5+
6+
7+
-@pytest.mark.skipif("DISPLAY" not in os.environ,
8+
+@pytest.mark.skipif(not os.environ.get('DISPLAY'),
9+
reason="The DISPLAY environment variable is not set.")
10+
@pytest.mark.parametrize("backend", _get_available_backends())
11+
def test_backend(backend):

0 commit comments

Comments
 (0)
0