Merge branch 'release-1.0'

astropy · Feb 18, 2015 · 2f1a783 · 2f1a783
2 parents 60742f4 + cca08a1
commit 2f1a783
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,7 +2,7 @@ astropy-helpers Changelog
 =========================
 
 
-1.0 (unreleased)
+1.0 (2015-02-17)
 ----------------
 
 - Added new pre-/post-command hook points for ``setup.py`` commands.  Now any

diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from astropy_helpers.version_helpers import generate_version_py
 
 NAME = 'astropy_helpers'
-VERSION = '1.0.dev'
+VERSION = '1.0'
 RELEASE = 'dev' not in VERSION
 DOWNLOAD_BASE_URL = 'http://pypi.python.org/packages/source/a/astropy-helpers'