Merge pull request #164 from astrofrog/update-from-template-1.0

Update to package-template 1.0

.travis.yml

@@ -11,7 +11,7 @@ env:
         # The following versions are the 'default' for tests, unless
         # overidden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
-        - NUMPY_VERSION=1.8
+        - NUMPY_VERSION=1.9
         - ASTROPY_VERSION=stable
         - CONDA_INSTALL='conda install -c astropy-ci-extras --yes'
         - PIP_INSTALL='pip install'
@@ -21,11 +21,9 @@ env:
 matrix:
     include:
 
-        # Do a coverage test in Python 2. This requires the latest
-        # development version of Astropy, which fixes some issues with
-        # coverage testing in affiliated packages.
+        # Do a coverage test in Python 2.
         - python: 2.7
-          env: ASTROPY_VERSION=development SETUP_CMD='test --coverage --remote-data'
+          env: SETUP_CMD='test --coverage --remote-data'
 
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time
@@ -49,6 +47,8 @@ matrix:
           env: SETUP_CMD='test --remote-data'
 
         # Try older numpy versions
+        - python: 2.7
+          env: NUMPY_VERSION=1.8 SETUP_CMD='test --remote-data'
         - python: 2.7
           env: NUMPY_VERSION=1.7 SETUP_CMD='test --remote-data'
         - python: 2.7
@@ -104,8 +104,7 @@ install:
     # build_sphinx needs sphinx and matplotlib (for plot_directive). Note that
     # this matplotlib will *not* work with py 3.x, but our sphinx build is
     # currently 2.7, so that's fine
-    - if [[ $SETUP_CMD == build_sphinx* ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION Sphinx=1.2 matplotlib; fi
-    - if [[ $SETUP_CMD == build_sphinx* ]]; then $PIP_INSTALL sphinx_rtd_theme; fi
+    - if [[ $SETUP_CMD == build_sphinx* ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION Sphinx sphinx_rtd_theme matplotlib; fi
 
     # COVERAGE DEPENDENCIES
     - if [[ $SETUP_CMD == 'test --coverage --remote-data' ]]; then $PIP_INSTALL coverage coveralls; fi

CHANGES.md

@@ -1,7 +1,11 @@
 0.4 (unreleased)
 ----------------
 
-- No changes yet
+- Astropy frame instances to now be passed to ``get_transform`` and ``get_coords_overlay``. [#149]
+
+- Fixed bug that caused plotting to crash if there were no ticks on an axis.
+
+- Fix compatibility with different versions of Matplotlib. [#153]
 
 0.3 (2014-12-07)
 ----------------

MANIFEST.in

@@ -5,17 +5,18 @@ include ez_setup.py
 include ah_bootstrap.py
 include setup.cfg
 
+recursive-include *.pyx *.c *.pxd
 recursive-include docs *
 recursive-include licenses *
 recursive-include cextern *
 recursive-include scripts *
 
-prune docs/_build
 prune build
+prune docs/_build
+prune docs/api
 
 recursive-include astropy_helpers *
 exclude astropy_helpers/.git
 exclude astropy_helpers/.gitignore
 
-exclude *.pyc *.o
-prune docs/api
+global-exclude *.pyc *.o

README.md

@@ -14,6 +14,8 @@ At the moment the implementation has not be optimized for performance. Once all
 the functionality is in place, and a test suite has been created, the code will
 be refactored and optimized.
 
+![Powered by Astropy Badge](http://img.shields.io/badge/powered%20by-AstroPy-orange.svg?style=flat)
+
 Developers and Contributors
 ===========================
 
@@ -28,9 +30,6 @@ Build and coverage status
 =========================
 
 [![Build Status](https://travis-ci.org/astrofrog/wcsaxes.png?branch=master)](https://travis-ci.org/astrofrog/wcsaxes)
-
-[![Coverage Status](https://coveralls.io/repos/astrofrog/wcsaxes/badge.png?branch=master)](https://coveralls.io/r/astrofrog/wcsaxes?branch=master)
-
+[![Coverage Status](https://coveralls.io/repos/astrofrog/wcsaxes/badge.svg?branch=master)](https://coveralls.io/r/astrofrog/wcsaxes?branch=master)
 [![Documentation Status](https://readthedocs.org/projects/wcsaxes/badge/?version=latest)](https://readthedocs.org/projects/wcsaxes/?badge=latest)
-
 [![asv](http://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](http://astrofrog.github.io/wcsaxes-benchmarks/)

docs/conf.py

@@ -139,7 +139,7 @@
 ## -- Options for the edit_on_github extension ----------------------------------------
 
 if eval(setup_cfg.get('edit_on_github')):
-    extensions += ['astropy.sphinx.ext.edit_on_github']
+    extensions += ['astropy_helpers.sphinx.ext.edit_on_github']
 
     versionmod = __import__(setup_cfg['package_name'] + '.version')
     edit_on_github_project = setup_cfg['github_project']

docs/slicing_datacubes.rst

@@ -30,7 +30,7 @@ information. The original FITS file can be downloaded from `here
 This is a three-dimensional dataset which you can check by looking at the
 header information by::
 
-    >>> hdu.header
+    >>> hdu.header  # doctest: +SKIP
     ...
     NAXIS = 3 /number of axes
     CTYPE1  = 'RA---SFL'           /

setup.cfg

@@ -10,6 +10,7 @@ show-response = 1
 [pytest]
 minversion = 2.2
 norecursedirs = build docs/_build
+doctest_plus = enabled
 
 [ah_bootstrap]
 auto_use = True

setup.py

@@ -109,7 +109,6 @@ def set_args(self, args):
       description=DESCRIPTION,
       scripts=scripts,
       install_requires=['astropy', 'matplotlib'],
-      provides=[PACKAGENAME],
       author=AUTHOR,
       author_email=AUTHOR_EMAIL,
       license=LICENSE,

wcsaxes/_astropy_init.py

@@ -86,8 +86,8 @@ def test(package=None, test_path=None, args=None, plugins=None, verbose=False,
 
     open_files : bool, optional
         Fail when any tests leave files open.  Off by default, because
-        this adds extra run time to the test suite.  Works only on
-        platforms with a working ``lsof`` command.
+        this adds extra run time to the test suite.  Requires the
+        `psutil <https://pypi.python.org/pypi/psutil>`_ package.
 
     parallel : int, optional
         When provided, run the tests in parallel on the specified

wcsaxes/conftest.py

@@ -21,3 +21,27 @@ def pytest_addoption(parser):
 @pytest.fixture
 def generate(request):
     return request.config.getoption("--generate-images-path")
+
+
+# Uncomment and customize the following lines to add/remove entries
+# from the list of packages for which version numbers are displayed
+# when running the tests
+try:
+    PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
+except NameError:  # needed to support Astropy < 1.0
+    pass
+
+# Uncomment the following lines to display the version number of the
+# package rather than the version number of Astropy in the top line when
+# running the tests.
+import os
+
+# This is to figure out the affiliated package version, rather than
+# using Astropy's
+from . import version
+
+try:
+    packagename = os.path.basename(os.path.dirname(__file__))
+    TESTED_VERSIONS[packagename] = version.version
+except NameError:   # Needed to support Astropy <= 1.0.0
+    pass

wcsaxes/wcs_utils.py

@@ -30,6 +30,9 @@
 
 import numpy as np
 
+__doctest_skip__ = ['wcs_to_celestial_frame']
+
+
 def _wcs_to_celestial_frame_builtin(wcs):
 
     from astropy.coordinates import FK4, FK4NoETerms, FK5, ICRS, Galactic