Merge pull request #195 from astrofrog/update-baseline-images-remote

Switch to using remote baseline images and support Matplotlib 1.5.x

.travis.yml

@@ -23,8 +23,9 @@ env:
         # to repeat them for all configurations.
         - NUMPY_VERSION=stable
         - ASTROPY_VERSION=stable
-        - CONDA_DEPENDENCIES='pyqt nose matplotlib=1.4.3 pillow'
+        - CONDA_DEPENDENCIES='pyqt nose matplotlib pillow'
         - PIP_DEPENDENCIES='pytest-mpl'
+        - SETUP_XVFB=True
     matrix:
         - SETUP_CMD='egg_info'
         - SETUP_CMD='test --remote-data'
@@ -67,10 +68,6 @@ matrix:
 
 before_install:
 
-    # Make sure that interactive matplotlib backends work
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-
     # Make sure matplotlib uses PyQT not PySide
     - export QT_API=pyqt
 

CHANGES.md

@@ -16,6 +16,9 @@
 
 - Fix image test that was sensitive to fonts on Debian. [#197]
 
+- Fix testing for Matplotlib 1.5.x and switch to using remote baseline
+  images. [#195]
+
 0.6 (2015-07-20)
 ----------------
 

docs/slicing_datacubes.rst

@@ -88,6 +88,17 @@ If we don't want to reverse the dimensions plotted, we can simply do:
 
 .. plot::
    :context: reset
+   :align: center
+   :nofigs:
+
+    from astropy.wcs import WCS
+    from wcsaxes import datasets
+    hdu = datasets.fetch_l1448_co_hdu()
+    wcs = WCS(hdu.header)
+    image_data = hdu.data
+
+.. plot::
+   :context:
    :include-source:
    :align: center
 

setup.cfg

@@ -11,7 +11,7 @@ show-response = 1
 minversion = 2.2
 norecursedirs = build docs/_build
 doctest_plus = enabled
-addopts = --mpl --mpl-baseline-path=wcsaxes/tests/baseline_images
+addopts = --mpl
 
 [ah_bootstrap]
 auto_use = True

wcsaxes/coordinate_helpers.py

@@ -738,6 +738,6 @@ def _update_grid_contour(self):
             field[1:, 1:][reset] = np.nan
 
         if len(tick_world_coordinates_values) > 0:
-            self._grid = self.parent_axes.contour(X, Y, field.transpose(), levels=tick_world_coordinates_values)
+            self._grid = self.parent_axes.contour(X, Y, field.transpose(), levels=np.sort(tick_world_coordinates_values))
         else:
             self._grid = None

wcsaxes/tests/__init__.py

@@ -0,0 +1,13 @@
+import os
+from distutils.version import LooseVersion
+
+import matplotlib
+
+MPL_VERSION = LooseVersion(matplotlib.__version__)
+
+ROOT = "https://astropy.stsci.edu/data/wcsaxes/2016-05-04T10:26:13.545916"
+
+if MPL_VERSION >= LooseVersion('1.5.0'):
+    baseline_dir = ROOT + '/1.5.x/'
+else:
+    baseline_dir = ROOT + '/1.4.x/'

wcsaxes/tests/setup_package.py

@@ -1,2 +1,2 @@
 def get_package_data():
-    return {'wcsaxes.tests': ['coveragerc', 'baseline_images/*.png', 'data/*']}
+    return {'wcsaxes.tests': ['coveragerc', 'baseline_images/*/*.png', 'data/*']}

wcsaxes/tests/test_frame.py

@@ -9,9 +9,9 @@
 from .. import datasets
 from ..frame import BaseFrame
 
+from . import baseline_dir
 from .test_images import BaseImageTests
 
-
 class HexagonalFrame(BaseFrame):
 
     spine_names = 'abcdef'
@@ -35,7 +35,7 @@ def update_spines(self):
 
 class TestFrame(BaseImageTests):
 
-    @pytest.mark.mpl_image_compare(filename='custom_frame.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='custom_frame.png', tolerance=1.5)
     def test_custom_frame(self):
 
         wcs = WCS(self.msx_header)
@@ -74,7 +74,7 @@ def test_custom_frame(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='update_clip_path_rectangular.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='update_clip_path_rectangular.png', tolerance=1.5)
     def test_update_clip_path_rectangular(self, tmpdir):
 
         fig = plt.figure()
@@ -95,7 +95,7 @@ def test_update_clip_path_rectangular(self, tmpdir):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='update_clip_path_nonrectangular.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='update_clip_path_nonrectangular.png', tolerance=1.5)
     def test_update_clip_path_nonrectangular(self, tmpdir):
 
         fig = plt.figure()
@@ -117,7 +117,7 @@ def test_update_clip_path_nonrectangular(self, tmpdir):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='update_clip_path_change_wcs.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='update_clip_path_change_wcs.png', tolerance=1.5)
     def test_update_clip_path_change_wcs(self, tmpdir):
 
         # When WCS is changed, a new frame is created, so we need to make sure

wcsaxes/tests/test_images.py

@@ -18,6 +18,8 @@
 
 from .. import datasets, WCSAxes
 
+from . import baseline_dir
+
 
 class BaseImageTests(object):
 
@@ -44,7 +46,7 @@ def setup_class(cls):
 
 class TestBasic(BaseImageTests):
 
-    @pytest.mark.mpl_image_compare(filename='image_plot.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='image_plot.png', tolerance=1.5)
     def test_image_plot(self):
         # Test for plotting image and also setting values of ticks
         fig = plt.figure(figsize=(6, 6))
@@ -55,7 +57,7 @@ def test_image_plot(self):
         return fig
 
     @remote_data
-    @pytest.mark.mpl_image_compare(filename='contour_overlay.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='contour_overlay.png', tolerance=1.5)
     def test_contour_overlay(self):
         # Test for overlaying contours on images
         hdu_msx = datasets.fetch_msx_hdu()
@@ -78,7 +80,7 @@ def test_contour_overlay(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='overlay_features_image.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='overlay_features_image.png', tolerance=1.5)
     def test_overlay_features_image(self):
 
         # Test for overlaying grid, changing format of ticks, setting spacing
@@ -111,7 +113,7 @@ def test_overlay_features_image(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='curvlinear_grid_patches_image.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='curvlinear_grid_patches_image.png', tolerance=1.5)
     def test_curvilinear_grid_patches_image(self):
 
         # Overlay curvilinear grid and patches on image
@@ -142,7 +144,7 @@ def test_curvilinear_grid_patches_image(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='cube_slice_image.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='cube_slice_image.png', tolerance=1.5)
     def test_cube_slice_image(self):
 
         # Test for cube slicing
@@ -167,7 +169,7 @@ def test_cube_slice_image(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='cube_slice_image_lonlat.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='cube_slice_image_lonlat.png', tolerance=1.5)
     def test_cube_slice_image_lonlat(self):
 
         # Test for cube slicing. Here we test with longitude and latitude since
@@ -186,7 +188,7 @@ def test_cube_slice_image_lonlat(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='changed_axis_units.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='changed_axis_units.png', tolerance=1.5)
     def test_changed_axis_units(self):
         # Test to see if changing the units of axis works
         fig = plt.figure()
@@ -203,7 +205,7 @@ def test_changed_axis_units(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='minor_ticks_image.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='minor_ticks_image.png', tolerance=1.5)
     def test_minor_ticks(self):
         # Test for drawing minor ticks
         fig = plt.figure()
@@ -221,7 +223,7 @@ def test_minor_ticks(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='ticks_labels.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='ticks_labels.png', tolerance=1.5)
     def test_ticks_labels(self):
         fig = plt.figure(figsize=(6, 6))
         ax = WCSAxes(fig, [0.1, 0.1, 0.7, 0.7], wcs=None)
@@ -248,7 +250,7 @@ def test_ticks_labels(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='rcparams.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='rcparams.png', tolerance=1.5)
     def test_rcparams(self):
         # Test default style (matplotlib.rcParams) for ticks and gridlines
         with rc_context({
@@ -269,7 +271,7 @@ def test_rcparams(self):
             ax.coords[1].set_ticks(exclude_overlapping=True)
             return fig
 
-    @pytest.mark.mpl_image_compare(filename='tick_angles.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='tick_angles.png', tolerance=1.5)
     def test_tick_angles(self):
         # Test that tick marks point in the correct direction, even when the
         # axes limits extend only over a few FITS pixels. Addresses #45, #46.
@@ -289,7 +291,7 @@ def test_tick_angles(self):
         ax.coords['dec'].set_ticks(color='red', size=20)
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='tick_angles_non_square_axes.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='tick_angles_non_square_axes.png', tolerance=1.5)
     def test_tick_angles_non_square_axes(self):
         # Test that tick marks point in the correct direction, even when the
         # axes limits extend only over a few FITS pixels, and the axes are
@@ -310,7 +312,7 @@ def test_tick_angles_non_square_axes(self):
         ax.coords['dec'].set_ticks(color='red', size=20)
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='set_coord_type.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='set_coord_type.png', tolerance=1.5)
     def test_set_coord_type(self):
         # Test for setting coord_type
         fig = plt.figure(figsize=(3, 3))
@@ -327,7 +329,7 @@ def test_set_coord_type(self):
         ax.coords[1].set_ticks(exclude_overlapping=True)
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='test_ticks_regression_1.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='test_ticks_regression_1.png', tolerance=1.5)
     def test_ticks_regression(self):
         # Regression test for a bug that caused ticks aligned exactly with a
         # sampled frame point to not appear. This also checks that tick labels
@@ -349,7 +351,7 @@ def test_ticks_regression(self):
         ax.coords[1].set_ticklabel_position('all')
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='test_axislabels_regression.png', savefig_kwargs={'bbox_inches': 'tight'}, tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='test_axislabels_regression.png', savefig_kwargs={'bbox_inches': 'tight'}, tolerance=1.5)
     def test_axislabels_regression(self):
         # Regression test for a bug that meant that if tick labels were made
         # invisible with ``set_visible(False)``, they were still added to the
@@ -363,7 +365,7 @@ def test_axislabels_regression(self):
         ax.coords[1].ticklabels.set_visible(False)
         return fig
 
-    @pytest.mark.mpl_image_compare(savefig_kwargs={'bbox_inches': 'tight'},
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, savefig_kwargs={'bbox_inches': 'tight'},
                                    tolerance=1.5)
     def test_noncelestial_angular(self, tmpdir):
         # Regression test for a bug that meant that when passing a WCS that had

wcsaxes/tests/test_transform_coord_meta.py

@@ -14,6 +14,8 @@
 from .test_images import BaseImageTests
 from ..transforms import CurvedTransform
 
+from . import baseline_dir
+
 requires_astropy_10 = pytest.mark.skipif(str(LooseVersion(astropy.__version__) < LooseVersion("1.0")))
 
 # Create fake transforms that roughly mimic a polar projection
@@ -58,7 +60,7 @@ def inverted(self):
 
 class TestTransformCoordMeta(BaseImageTests):
 
-    @pytest.mark.mpl_image_compare(filename='coords_overlay.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='coords_overlay.png', tolerance=1.5)
     def test_coords_overlay(self):
 
         # Set up a simple WCS that maps pixels to non-projected distances
@@ -106,7 +108,7 @@ def test_coords_overlay(self):
         return fig
 
     @requires_astropy_10
-    @pytest.mark.mpl_image_compare(filename='coords_overlay_auto_coord_meta.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='coords_overlay_auto_coord_meta.png', tolerance=1.5)
     def test_coords_overlay_auto_coord_meta(self):
 
         fig = plt.figure(figsize=(4, 4))
@@ -128,7 +130,7 @@ def test_coords_overlay_auto_coord_meta(self):
 
         return fig
 
-    @pytest.mark.mpl_image_compare(filename='direct_init.png', tolerance=1.5)
+    @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir, filename='direct_init.png', tolerance=1.5)
     def test_direct_init(self):
 
         s = DistanceToLonLat(R=6378.273)