Merge branch 'tmp-release-v1.3' into v1.3.x

.travis.yml

@@ -25,7 +25,7 @@ env:
     - PYTHON_VERSION=3.5
   global:
     - CONDA_DEPENDENCIES="setuptools pytest sphinx cython numpy"
-    - PIP_DEPENDENCIES="coveralls pytest-cov==2.2"
+    - PIP_DEPENDENCIES="coveralls pytest-cov"
 
 matrix:
     include:
@@ -54,7 +54,7 @@ install:
     # pip tries to remove the previous version of setuptools before the
     # installation is complete, which causes issues. Instead, we just install
     # setuptools manually.
-    - if [[ $SETUPTOOLS_VERSION == dev ]]; then git clone http://github.com/pypa/setuptools.git; cd setuptools; python setup.py install; cd ..; fi
+    - if [[ $SETUPTOOLS_VERSION == dev ]]; then git clone http://github.com/pypa/setuptools.git; cd setuptools; python bootstrap.py; python setup.py install; cd ..; fi
 
 before_script:
     # Some of the tests use git commands that require a user to be configured

CHANGES.rst

@@ -1,7 +1,7 @@
 astropy-helpers Changelog
 =========================
 
-1.3 (2016-12-11)
+1.3 (2016-12-16)
 ----------------
 
 - ``build_sphinx`` has been deprecated in favor of the ``build_docs`` command.

astropy_helpers/tests/coveragerc

@@ -4,6 +4,7 @@ omit =
    astropy_helpers/commands/_test_compat.py
    astropy_helpers/compat/*
    astropy_helpers/*/setup_package.py
+   */test_pkg/*
 
 [report]
 exclude_lines =

setup.cfg

@@ -1,4 +1,4 @@
-[pytest]
+[tool:pytest]
 norecursedirs =
     .tox
     astropy_helpers/tests/package_template

setup.py

@@ -8,7 +8,7 @@
 from astropy_helpers.version_helpers import generate_version_py
 
 NAME = 'astropy_helpers'
-VERSION = '1.3rc1'
+VERSION = '1.3'
 RELEASE = 'dev' not in VERSION
 DOWNLOAD_BASE_URL = 'http://pypi.io/packages/source/a/astropy-helpers'