From df714ae9636012f946901471675fa3c03f9db90e Mon Sep 17 00:00:00 2001 From: TD22057 Date: Fri, 6 Nov 2015 08:27:09 -0800 Subject: [PATCH 1/3] Added test for units with Rectangle --- .../test_units_patches/units_rectangle.png | Bin 0 -> 13462 bytes lib/matplotlib/tests/test_units_patches.py | 33 ++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 lib/matplotlib/tests/baseline_images/test_units_patches/units_rectangle.png create mode 100644 lib/matplotlib/tests/test_units_patches.py diff --git a/lib/matplotlib/tests/baseline_images/test_units_patches/units_rectangle.png b/lib/matplotlib/tests/baseline_images/test_units_patches/units_rectangle.png new file mode 100644 index 0000000000000000000000000000000000000000..61c7ee9ec35250d65361969e68991227478994ac GIT binary patch literal 13462 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 hssI1!pI=$T_Y5)(yboy@gXxPg&@ Date: Sun, 29 Jan 2017 16:11:54 -0800 Subject: [PATCH 2/3] Update test_units_patches.py --- lib/matplotlib/tests/test_units_patches.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_units_patches.py b/lib/matplotlib/tests/test_units_patches.py index 82149a264980..9c0737479cc7 100644 --- a/lib/matplotlib/tests/test_units_patches.py +++ b/lib/matplotlib/tests/test_units_patches.py @@ -20,7 +20,7 @@ def test_units_rectangle(): import matplotlib.testing.jpl_units as U U.register() - p = mpatches.Rectangle( ( 5*U.km, 6*U.km ), 1*U.km, 2*U.km ) + p = mpatches.Rectangle((5*U.km, 6*U.km), 1*U.km, 2*U.km) fig = plt.figure() ax = plt.subplot(111) From ab57debf599e095c98c3cc4913f4d3c0ff87ba36 Mon Sep 17 00:00:00 2001 From: Ted Drain Date: Thu, 2 Feb 2017 18:35:55 -0800 Subject: [PATCH 3/3] Update test_units_patches.py --- lib/matplotlib/tests/test_units_patches.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/matplotlib/tests/test_units_patches.py b/lib/matplotlib/tests/test_units_patches.py index 9c0737479cc7..c04dd19fa243 100644 --- a/lib/matplotlib/tests/test_units_patches.py +++ b/lib/matplotlib/tests/test_units_patches.py @@ -4,17 +4,11 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from matplotlib.externals import six - -import numpy as np -from numpy.testing import assert_array_equal -from numpy.testing import assert_equal -from numpy.testing import assert_almost_equal - -from matplotlib.testing.decorators import image_comparison, cleanup +from matplotlib.testing.decorators import image_comparison import matplotlib.pyplot as plt import matplotlib.patches as mpatches + @image_comparison(baseline_images=['units_rectangle'], extensions=['png']) def test_units_rectangle(): import matplotlib.testing.jpl_units as U @@ -27,7 +21,3 @@ def test_units_rectangle(): ax.add_patch(p) ax.set_xlim([4*U.km, 7*U.km]) ax.set_ylim([5*U.km, 9*U.km]) - -if __name__ == '__main__': - import nose - nose.runmodule(argv=['-s', '--with-doctest'], exit=False)