From 142aee0e7f5df2daf3c689eccc6417fd6fa87cbb Mon Sep 17 00:00:00 2001
From: Johannes Blaschke <jpblaschke@lbl.gov>
Date: Tue, 20 Mar 2018 17:47:58 -0700
Subject: [PATCH] working on travis: remove unncessary install step/fix sphinx
 build check

---
 .travis.yml         |  2 +-
 build_and_deploy.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9cbe4d0..580c061 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
 
 install: 
   - pip install --user sphinx sphinx_rtd_theme
-  - sudo apt-get install mpich2 gfortran
+    #  - sudo apt-get install mpich2 gfortran
 
 script: bash ./build_and_deploy.sh
 
diff --git a/build_and_deploy.sh b/build_and_deploy.sh
index faba27e..1819bb9 100755
--- a/build_and_deploy.sh
+++ b/build_and_deploy.sh
@@ -7,14 +7,14 @@ set -e # Exit with nonzero exit code if anything fails
 #make -j4
 
 # Then we build and deploy the sphinx / doxygen documentation
-#SOURCE_BRANCH="master"
+SOURCE_BRANCH="master"
 #TARGET_BRANCH="gh-pages"
 
 # Pull requests and commits to other branches shouldn't try to deploy
-#if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
-#    echo "Skipping deploy."
-#    exit 0
-#fi
+if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then
+    echo "Skipping deploy."
+    exit 0
+fi
 
 # Save some useful information
 #REPO=`git config remote.origin.url`
-- 
GitLab