Merge pull request #207 from bsipocz/update_template_1.1.1

Updating to package template 1.1.2

.gitignore

@@ -1,15 +1,53 @@
-build
-docs/_build
+# Compiled files
+*.py[cod]
+*.a
+*.o
+*.so
 __pycache__
-dist
-docs/api
-wcsaxes.egg-info
+
+# 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`.
+*.c
+
+# Other generated files
+*/version.py
+*/cython_version.py
 htmlcov
-*.pyc
-wcsaxes/version.py
+.coverage
+MANIFEST
+.ipynb_checkpoints
+
+# Sphinx
+docs/api
+docs/_build
+
+# Eclipse editor project files
 .project
 .pydevproject
 .settings
+
+# Pycharm editor project files
 .idea
-.coverage
-*/cython_version.py
+
+# Packages/installer info
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+distribute-*.tar.gz
+
+# Other
+.cache
+.tox
+.*.sw[op]
+*~
+
+# Mac OSX
+.DS_Store

.travis.yml

@@ -19,13 +19,14 @@ python:
 env:
     global:
         # The following versions are the 'default' for tests, unless
-        # overidden underneath. They are defined here in order to save having
+        # overridden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
         - NUMPY_VERSION=stable
         - ASTROPY_VERSION=stable
         - CONDA_DEPENDENCIES='pyqt nose matplotlib pillow'
         - PIP_DEPENDENCIES='pytest-mpl'
         - SETUP_XVFB=True
+        - SETUP_CMD='test --remote-data'
     matrix:
         - SETUP_CMD='egg_info'
         - SETUP_CMD='test --remote-data'
@@ -44,27 +45,27 @@ matrix:
 
         # Try Astropy development and LTS versions
         - python: 2.7
-          env: ASTROPY_VERSION=development SETUP_CMD='test --remote-data'
+          env: ASTROPY_VERSION=development
         - python: 3.5
-          env: ASTROPY_VERSION=development SETUP_CMD='test --remote-data'
+          env: ASTROPY_VERSION=development
         - python: 2.7
-          env: ASTROPY_VERSION=lts SETUP_CMD='test --remote-data'
+          env: ASTROPY_VERSION=lts
         - python: 3.5
-          env: ASTROPY_VERSION=lts SETUP_CMD='test --remote-data'
+          env: ASTROPY_VERSION=lts
 
         # Try all python versions with the latest numpy
         - python: 3.3
-          env: SETUP_CMD='test --remote-data' NUMPY_VERSION=1.9
+          env: NUMPY_VERSION=1.9
 
         # Try older numpy versions
         - python: 2.7
-          env: NUMPY_VERSION=1.9 SETUP_CMD='test --remote-data'
+          env: NUMPY_VERSION=1.10
         - python: 2.7
-          env: NUMPY_VERSION=1.8 SETUP_CMD='test --remote-data'
+          env: NUMPY_VERSION=1.9
         - python: 2.7
-          env: NUMPY_VERSION=1.7 SETUP_CMD='test --remote-data'
+          env: NUMPY_VERSION=1.8
         - python: 2.7
-          env: NUMPY_VERSION=1.6 SETUP_CMD='test --remote-data'
+          env: NUMPY_VERSION=1.7
 
 before_install:
 

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

docs/conf.py

@@ -42,8 +42,12 @@
 from astropy_helpers.sphinx.conf import *
 
 # Get configuration information from setup.cfg
-from distutils import config
-conf = config.ConfigParser()
+try:
+    from ConfigParser import ConfigParser
+except ImportError:
+    from configparser import ConfigParser
+conf = ConfigParser()
+
 conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')])
 setup_cfg = dict(conf.items('metadata'))
 
@@ -91,22 +95,28 @@
 # variables set in the global configuration. The variables set in the
 # global configuration are listed below, commented out.
 
+html_theme_options = {
+    'logotext1': 'wcs',  # white,  semi-bold
+    'logotext2': 'axes',  # orange, light
+    'logotext3': ':docs'   # white,  light
+    }
+
 # Add any paths that contain custom themes here, relative to this directory.
 # To use a different custom theme, add the directory containing the theme.
-html_theme_path = []
+#html_theme_path = []
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes. To override the custom theme, set this to the
 # name of a builtin theme or the name of a custom theme in html_theme_path.
-html_theme = 'default'
+#html_theme = None
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {}
+#html_sidebars = {}
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = ''
+#html_favicon = ''
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -182,16 +192,6 @@
 
 """
 
-# on_rtd is whether we are on readthedocs.org
-import os
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-
-if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-# otherwise, readthedocs.org uses their theme by default, so no need to specify it
 
 # Enable nitpicky mode - which ensures that all references in the docs
 # resolve.