Updating to package template 1.1.1

Author: bsipocz

.gitignore

@@ -1,10 +1,9 @@
 # Compiled files
-*.py[co]
+*.py[cod]
 *.a
 *.o
 *.so
 __pycache__
-.cache
 
 # Ignore .c files by default to avoid including generated code. If you want to
 # add a non-generated .c extension, use `git add -f filename.c`.
@@ -16,6 +15,7 @@ __pycache__
 htmlcov
 .coverage
 MANIFEST
+.ipynb_checkpoints
 
 # Sphinx
 docs/api
@@ -44,11 +44,10 @@ develop-eggs
 distribute-*.tar.gz
 
 # Other
-.*.swp
+.cache
+.tox
+.*.sw[op]
 *~
 
 # Mac OSX
 .DS_Store
-
-# Ignore IPython notebook (Jupyter) checkpoints.
-.ipynb_checkpoints

MANIFEST.in

@@ -15,8 +15,26 @@ prune build
 prune docs/_build
 prune docs/api
 
-recursive-include astropy_helpers *
-exclude astropy_helpers/.git
-exclude astropy_helpers/.gitignore
+
+# the next few stanzas are for astropy_helpers.  It's derived from the
+# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
+# package directory and egg-info.
+
+include astropy_helpers/README.rst
+include astropy_helpers/CHANGES.rst
+include astropy_helpers/LICENSE.rst
+recursive-include astropy_helpers/licenses *
+
+include astropy_helpers/ez_setup.py
+include astropy_helpers/ah_bootstrap.py
+
+recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h
+recursive-include astropy_helpers/astropy_helpers.egg-info *
+# include the sphinx stuff with "*" because there are css/html/rst/etc.
+recursive-include astropy_helpers/astropy_helpers/sphinx *
+
+prune astropy_helpers/build
+prune astropy_helpers/astropy_helpers/tests
+
 
 global-exclude *.pyc *.o

astroplan/conftest.py

@@ -18,17 +18,33 @@
 from .utils import _mock_remote_data, _unmock_remote_data
 from .exceptions import AstroplanWarning
 
+import os
+
+# This is to figure out the affiliated package version, rather than
+# using Astropy's
+try:
+    from .version import version
+except ImportError:
+    version = 'dev'
+
+packagename = os.path.basename(os.path.dirname(__file__))
+TESTED_VERSIONS[packagename] = version
+
+
 # Comment out this line to avoid deprecation warnings being raised as exceptions
 enable_deprecations_as_exceptions()
 
 # Define list of packages for which to display version numbers in the test log
-PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
-PYTEST_HEADER_MODULES['pytz'] = 'pytz'
-PYTEST_HEADER_MODULES['pyephem'] = 'pyephem'
-PYTEST_HEADER_MODULES['matplotlib'] = 'matplotlib'
-PYTEST_HEADER_MODULES['nose'] = 'nose'
-PYTEST_HEADER_MODULES['pytest-mpl'] = 'pytest_mpl'
-del PYTEST_HEADER_MODULES['h5py']
+try:
+    PYTEST_HEADER_MODULES['Astropy'] = 'astropy'
+    PYTEST_HEADER_MODULES['pytz'] = 'pytz'
+    PYTEST_HEADER_MODULES['pyephem'] = 'pyephem'
+    PYTEST_HEADER_MODULES['matplotlib'] = 'matplotlib'
+    PYTEST_HEADER_MODULES['nose'] = 'nose'
+    PYTEST_HEADER_MODULES['pytest-mpl'] = 'pytest_mpl'
+    del PYTEST_HEADER_MODULES['h5py']
+except KeyError:
+    pass
 
 
 def pytest_configure(config):

docs/Makefile

@@ -34,11 +34,11 @@ help:
 	@echo "  man        to make manual pages"
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 clean:
 	-rm -rf $(BUILDDIR)
 	-rm -rf api
+	-rm -rf generated
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@@ -129,6 +129,5 @@ linkcheck:
 	      "or in $(BUILDDIR)/linkcheck/output.txt."
 
 doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
+	@echo "Run 'python setup.py test' in the root directory to run doctests " \
+	@echo "in the documentation."