Merge pull request #194 from mwcraig/post-1.0-cleanup

Back to usual configuration now that astropy 1.0 is out
astropy · Feb 20, 2015 · 1a38443 · 1a38443
2 parents c3f0a54 + eb3a075
commit 1a38443
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ env:
         # overidden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
         - NUMPY_VERSION=1.9
-        - ASTROPY_VERSION=development # CHANGE BACK TO STABLE post-astropy-1.0
+        - ASTROPY_VERSION=stable
         - CONDA_INSTALL='conda install -c astropy-ci-extras --yes'
         - PIP_INSTALL='pip install'
     matrix:

diff --git a/docs/rtd-pip-requirements b/docs/rtd-pip-requirements
@@ -1,4 +1,4 @@
 numpy>=1.9
 scipy
 numpydoc
-astropy>=1.0rc2
+astropy>=1.0