Fix check for PyGraphviz in .travis.yml (cont'd)

networkx · May 4, 2014 · 61f41d4 · 61f41d4
1 parent 65a15ca
commit 61f41d4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -51,9 +51,9 @@ install:
   # Skipping pydot (not 3.x compatible)
   # Skipping gdal (errors during pip installs)
   - sudo apt-get update -qq
-  - if [ "${OPTIONAL_DEPS}" == "true" ]; then sudo apt-get install graphviz; fi
+  - if [[ "${OPTIONAL_DEPS}" == "true" || "${FROM_SOURCE}" == "true" ]]; then sudo apt-get install graphviz; fi
+  - if [[ ( "${OPTIONAL_DEPS}" == "true" || "${FROM_SOURCE}" == "true" ) && "${TRAVIS_PYTHON_VERSION}" == 2* ]]; then pip install pygraphviz; fi
   - if [ "${OPTIONAL_DEPS}" == "true" ]; then pip install --use-wheel pyyaml pyparsing; fi
-  - if [[ "${OPTIONAL_DEPS}" == "true" && "${TRAVIS_PYTHON_VERSION}" == 2* ]]; then pip install pygraphviz; fi
   - if [ "${OPTIONAL_DEPS}" == "true" ]; then $PIPINSTALL numpy scipy matplotlib Cython; fi
 
   # Try to install latest and greatest from source.