8000 Merge pull request #8004 from dstansby/backport-test-fix · matplotlib/matplotlib@6727dc6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6727dc6

Browse files
NelleVNelleV
authored
Merge pull request #8004 from dstansby/backport-test-fix
Fix broken backported test
2 parents 8481bc5 + 6b2e116 commit 6727dc6

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎lib/matplotlib/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,7 @@ def tk_window_focus():
15021502
'matplotlib.tests.test_image',
15031503
'matplotlib.tests.test_legend',
15041504
'matplotlib.tests.test_lines',
1505+
'matplotlib.tests.test_marker',
15051506
'matplotlib.tests.test_mathtext',
15061507
'matplotlib.tests.test_mlab',
15071508
'matplotlib.tests.test_offsetbox',

‎lib/matplotlib/tests/test_marker.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import numpy as np
22
from matplotlib import markers
3-
4-
import pytest
3+
from nose.tools import assert_raises
54

65

76
def test_markers_valid():
@@ -14,7 +13,7 @@ def test_markers_valid():
1413

1514
def test_markers_invalid():
1615
marker_style = markers.MarkerStyle()
17-
mrk_array = np.array([[-0.5, 0, 1, 2, 3]])
16+
mrk_array = np.array([[-0.5, 0, 1, 2, 3]])
1817
# Checking this does fail.
19-
with pytest.raises(ValueError):
18+
with assert_raises(ValueError):
2019
marker_style.set_marker(mrk_array)

0 commit comments

Comments
 (0)
0