Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-t…

…ravis
sunpy · Feb 13, 2014 · 48ec36a · 48ec36a
2 parents a994e04 + a2782b2
commit 48ec36a
Show file tree

Hide file tree

Showing 28 changed files with 112 additions and 924 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,13 +15,13 @@ env:
         - SUDS_PKG='suds-jurko==0.4.1.jurko.4'
         - TEST_MODE='tests'
     matrix:
+        - NUMPY_VERSION=1.8.0 PANDAS_VERSION=0.13.1
+        - NUMPY_VERSION=1.7.1 PANDAS_VERSION=0.13.1
         - NUMPY_VERSION=1.8.0 PANDAS_VERSION=0.12.0
-        - NUMPY_VERSION=1.7.1 PANDAS_VERSION=0.12.0
-        - NUMPY_VERSION=1.8.0 PANDAS_VERSION=0.11.0
 matrix:
      include:
         - python: 2.7
-          env: TEST_MODE='sphinx' NUMPY_VERSION=1.8.0 PANDAS_VERSION=0.12.0
+          env: TEST_MODE='sphinx' NUMPY_VERSION=1.8.0 PANDAS_VERSION=0.13.1
 
 before_install:
 # Pick the suds version based on the python version

diff --git a/doc/logo/sunpy_icon.svg b/doc/logo/sunpy_icon.svg
diff --git a/doc/logo/sunpy_icon_128x128.png b/doc/logo/sunpy_icon_128x128.png
diff --git a/doc/logo/sunpy_icon_500x500.png b/doc/logo/sunpy_icon_500x500.png
diff --git a/doc/logo/sunpy_icon_64x64.png b/doc/logo/sunpy_icon_64x64.png