Merge pull request #213 from astrofrog/fix-deprecation

Fix deprecation warning

.travis.yml

@@ -23,7 +23,7 @@ env:
         # to repeat them for all configurations.
         - NUMPY_VERSION=stable
         - ASTROPY_VERSION=stable
-        - CONDA_DEPENDENCIES='pyqt nose matplotlib pillow'
+        - CONDA_DEPENDENCIES='pyqt nose matplotlib pillow pyqt=4'
         - PIP_DEPENDENCIES='pytest-mpl'
         - SETUP_XVFB=True
         - SETUP_CMD='test --remote-data'

wcsaxes/patches.py

@@ -7,7 +7,13 @@
 
 from astropy import units as u
 from astropy.coordinates.representation import UnitSphericalRepresentation, CartesianRepresentation
-from astropy.coordinates.angles import rotation_matrix
+
+try:
+    from astropy.coordinates.matrix_utilities import rotation_matrix as rotation_array
+    def rotation_matrix(*args, **kwargs):
+        return np.matrix(rotation_array(*args, **kwargs))
+except ImportError:
+    from astropy.coordinates.angles import rotation_matrix
 
 __all__ = ['SphericalCircle']