From 92c28f97a1fc650414a02ee1b7430ad8df25ba3e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Sat, 4 Oct 2014 22:10:04 -0500
Subject: [PATCH] Update travis to better reflect requirements

---
 .travis.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 594145d2..a615a96c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,12 @@ before_install:
 install:
     - tools/header.py "Dependency versions"
     - tools/build_versions.py
+    # Matplotlib settings
+    - export MPL_DIR=$HOME/.config/matplotlib
+    - mkdir -p $MPL_DIR
+    - touch $MPL_DIR/matplotlibrc
+    - "echo 'backend : Agg' > $MPL_DIR/matplotlibrc"
+    - "echo 'backend.qt4 : PyQt4' >> $MPL_DIR/matplotlibrc"
     - export PYTHONWARNINGS=all
     - python setup.py build_ext --inplace
 
@@ -73,22 +79,19 @@ script:
 
     # Install optional dependencies to get full test coverage
     # Notes:
-    # - pyfits and imread do NOT support py3.2
+    # - imread does NOT support py3.2
     # - Use the png headers included in anaconda (from matplotlib install)
     # TODO: Remove the libm removal when anaconda fixes their libraries
     #   The solution was suggested here
     #   https://groups.google.com/a/continuum.io/forum/#!topic/anaconda/-DLG2ZdTkw0
     - if [[ $ENV == python=3.2 ]]; then
         travis_retry sudo apt-get install python3-pyqt4;
-        travis_retry pip install networkx;
       else
-        travis_retry conda install networkx;
         sudo cp ~/miniconda/envs/test/include/png* /usr/include;
         rm ~/miniconda/envs/test/lib/libm-2.5.so;
         rm ~/miniconda/envs/test/lib/libm.*;
         sudo apt-get install libtiff4-dev libwebp-dev xcftools;
         travis_retry pip install imread;
-        travis_retry pip install pyfits;
         travis_retry pip install pillow;
       fi
     - sudo apt-get install libfreeimage3
@@ -96,13 +99,8 @@ script:
     - if [[ $ENV != python=3.4* ]]; then
         travis_retry easy_install SimpleITK;
       fi
-
-    # Matplotlib settings
-    - export MPL_DIR=$HOME/.config/matplotlib
-    - mkdir -p $MPL_DIR
-    - touch $MPL_DIR/matplotlibrc
-    - "echo 'backend : Agg' > $MPL_DIR/matplotlibrc"
-    - "echo 'backend.qt4 : PyQt4' >> $MPL_DIR/matplotlibrc"
+    - travis_retry pip install pyamg
+    - travis_retry pip install  --no-deps astropy
 
     - echo -e $SPACER