Merge branch 'release-0.4.8' into v0.4.x

Conflicts: ah_bootstrap.py astropy_helpers/__init__.py
astropy · Mar 5, 2015 · 8ed1011 · 8ed1011
2 parents e8b5164 + 9caadd5
commit 8ed1011
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 astropy-helpers Changelog
 =========================
 
-0.4.8 (unreleased)
+0.4.8 (2015-03-04)
 ------------------
 
 - Improved the ``ah_bootstrap`` script's ability to override existing

diff --git a/ah_bootstrap.py b/ah_bootstrap.py
@@ -111,7 +111,7 @@
 # issue)
 try:
     import matplotlib
-    matplotlib.rcParams['backend_fallback'] = False
+    matplotlib.use('Agg')
     import matplotlib.pyplot
 except:
     # Ignore if this fails for *any* reason*

diff --git a/astropy_helpers/__init__.py b/astropy_helpers/__init__.py
@@ -28,7 +28,7 @@
 # issue)
 try:
     import matplotlib
-    matplotlib.rcParams['backend_fallback'] = False
+    matplotlib.use('Agg')
     import matplotlib.pyplot
 except:
     # Ignore if this fails for *any* reason*

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 = '0.4.8.dev'
+VERSION = '0.4.8'
 RELEASE = 'dev' not in VERSION
 DOWNLOAD_BASE_URL = 'http://pypi.python.org/packages/source/a/astropy-helpers'