diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 4cf18d50b980..82d0f5cc4580 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1502,6 +1502,7 @@ def tk_window_focus(): 'matplotlib.tests.test_image', 'matplotlib.tests.test_legend', 'matplotlib.tests.test_lines', + 'matplotlib.tests.test_marker', 'matplotlib.tests.test_mathtext', 'matplotlib.tests.test_mlab', 'matplotlib.tests.test_offsetbox', diff --git a/lib/matplotlib/tests/test_marker.py b/lib/matplotlib/tests/test_marker.py index e2290f029dcc..42790f7b9d7c 100644 --- a/lib/matplotlib/tests/test_marker.py +++ b/lib/matplotlib/tests/test_marker.py @@ -1,7 +1,6 @@ import numpy as np from matplotlib import markers - -import pytest +from nose.tools import assert_raises def test_markers_valid(): @@ -14,7 +13,7 @@ def test_markers_valid(): def test_markers_invalid(): marker_style = markers.MarkerStyle() - mrk_array = np.array([[-0.5, 0, 1, 2, 3]]) + mrk_array = np.array([[-0.5, 0, 1, 2, 3]]) # Checking this does fail. - with pytest.raises(ValueError): + with assert_raises(ValueError): marker_style.set_marker(mrk_array)