From e1c57be1c409486f4c6c62e43afef9e1f08c389a Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 18 Sep 2015 21:28:49 -0500
Subject: [PATCH 1/4] Encrypt token for target repo

---
 .travis.yml          | 2 +-
 tools/deploy_docs.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 61063b6f..a7d35a93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ addons:
 env:
   global:
     - GH_REF: github.com/scikit-image/docs.git
-    - secure: "k646ELF4CfE/S5F1dVeAn8XXdqqWdrHNgTOlZhW9BiC+nLiHU8ADlh+hKlibUWXuT0e1mv9utEkRNwj+MLZ3nSnqXoyLzQaRR2Nd8ldaclhQOIi0QOcsae9oFtCfsFosF40tjEXEmXsh2W81g557y81yEzk7RjE4PpWNnPJe8qM="
+    - secure: "ba3xugaHqtd76pnq5kmjtlqGXpzqcE0JvDrBg0mkIuDWvaLBlaTpOud89KK0FNf1ZbMuwkIEyERdrzp24xj03Fyw+FlL4Th/LjlcoxUuMjatuxNq2sBOpUBYYJLef4Trfis+pTcyf8BjMBWdK0rouxBKwZl1QGn9ToDJ9Iu0FCY="
 
 notifications:
   webhooks:
diff --git a/tools/deploy_docs.sh b/tools/deploy_docs.sh
index c25c0c1e..127a3831 100644
--- a/tools/deploy_docs.sh
+++ b/tools/deploy_docs.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-if [[ $TRAVIS_BRANCH == "master" && $TRAVIS_PYTHON_VERSION == 3.4 ]]
+if [[ $TRAVIS_PULL_REQUEST == false && $TRAVIS_BRANCH == "master" && 
+      $TRAVIS_PYTHON_VERSION == 3.4 ]]
 then
     # See https://help.github.com/articles/creating-an-access-token-for-command-line-use/ for how to generate a token
     # See http://docs.travis-ci.com/user/encryption-keys/ for how to generate 
@@ -17,7 +18,7 @@ then
 
     git add dev
     git commit -m "Deployed to GitHub Pages"
-    git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages
+    git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1
     )
 else
     echo "-- will only push docs from master --"

From 87dfaf307422fc75e5f797e7901177801f6396d9 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 18 Sep 2015 21:31:00 -0500
Subject: [PATCH 2/4] Fix variable name

---
 tools/deploy_docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deploy_docs.sh b/tools/deploy_docs.sh
index 127a3831..f39cc023 100644
--- a/tools/deploy_docs.sh
+++ b/tools/deploy_docs.sh
@@ -18,7 +18,7 @@ then
 
     git add dev
     git commit -m "Deployed to GitHub Pages"
-    git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1
+    git push --force --quiet "https://${GHTOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1
     )
 else
     echo "-- will only push docs from master --"

From e3167112a9768bae5206edb49e0515311a6c54dc Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 18 Sep 2015 21:33:03 -0500
Subject: [PATCH 3/4] Another fix

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a7d35a93..f91f5f2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ addons:
 env:
   global:
     - GH_REF: github.com/scikit-image/docs.git
-    - secure: "ba3xugaHqtd76pnq5kmjtlqGXpzqcE0JvDrBg0mkIuDWvaLBlaTpOud89KK0FNf1ZbMuwkIEyERdrzp24xj03Fyw+FlL4Th/LjlcoxUuMjatuxNq2sBOpUBYYJLef4Trfis+pTcyf8BjMBWdK0rouxBKwZl1QGn9ToDJ9Iu0FCY="
+    - secure: "K6GorAy3f0SFJ/x3rP0umbbxsM280W0jNwxYN2NrSWtvhiqXK4t4WrGH3n0ztC95rbqtskgr4y/f9aAi+3F9MScjZj4qViMrcFFuUgHxR5R+i4wKfwmvZd/vTBwYNawOK/dPxkCN9tRCE/R2tgBWDTJk1kMeOYvVAzye6TYcmq4="
 
 notifications:
   webhooks:

From b2727854098934c35a536559e4e2af5ae2d94056 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 18 Sep 2015 21:33:35 -0500
Subject: [PATCH 4/4] Fix variable name

---
 tools/deploy_docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/deploy_docs.sh b/tools/deploy_docs.sh
index f39cc023..127a3831 100644
--- a/tools/deploy_docs.sh
+++ b/tools/deploy_docs.sh
@@ -18,7 +18,7 @@ then
 
     git add dev
     git commit -m "Deployed to GitHub Pages"
-    git push --force --quiet "https://${GHTOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1
+    git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1
     )
 else
     echo "-- will only push docs from master --"