From 344ccdcafc699614b063e9e9ecd73855de2ce094 Mon Sep 17 00:00:00 2001
From: Steve Mattis <steve.a.mattis@gmail.com>
Date: Sat, 4 Jul 2020 15:31:32 -0400
Subject: [PATCH 1/2] update way docs are automatically deployed to avoid
 failing builds from multiple deployments happening at once

---
 .travis.yml | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c75b622b..7c4811cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,6 @@ script:
   - mpirun -n 2 nosetests
   - pip uninstall -y mpi4py
   - nosetests
-  - sphinx-apidoc -f -o doc bet
-  - cd doc/
-  - make html
-  - make html
-  - cd ..
 
 # notification settings
 notifications:
@@ -48,11 +43,30 @@ after_success:
   - codecov
 
 # Deploy docs
-deploy:
-  provider: pages
-  skip_cleanup: true
-  github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
-  keep_history: false
-  local_dir: gh-pages/html
-  on:
-    branch: master
+jobs:
+  include:
+    - stage: deploy
+        python: 3.6
+	services: xvfb
+	before_install:
+	  - "export DISPLAY=:99.0"
+  	  - sudo apt-get install gfortran libblas-dev liblapack-dev mpich libmpich-dev
+        install: 
+	  - pip install matplotlib mpi4py nose codecov Sphinx sphinx_rtd_theme
+	  - python setup.py install
+        script:
+          - sphinx-apidoc -f -o doc bet
+ 	  - cd doc/
+  	  - make html
+  	  - make html
+  	  - cd ..
+        deploy:
+          provider: pages
+          skip_cleanup: true
+          github_token: $GITHUB_TOKEN
+          keep-history: false
+          on:
+            branch: master
+          local_dir: gh-pages/html
+
+

From 84117b38930a1135f317f330eb1eb46a36c88b23 Mon Sep 17 00:00:00 2001
From: Steve Mattis <steve.a.mattis@gmail.com>
Date: Sat, 4 Jul 2020 15:57:36 -0400
Subject: [PATCH 2/2] simpler approach

---
 .travis.yml | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c4811cd..098e0f2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,11 @@ script:
   - mpirun -n 2 nosetests
   - pip uninstall -y mpi4py
   - nosetests
+  - sphinx-apidoc -f -o doc bet
+  - cd doc/
+  - make html
+  - make html
+  - cd ..
 
 # notification settings
 notifications:
@@ -43,30 +48,15 @@ after_success:
   - codecov
 
 # Deploy docs
-jobs:
-  include:
-    - stage: deploy
-        python: 3.6
-	services: xvfb
-	before_install:
-	  - "export DISPLAY=:99.0"
-  	  - sudo apt-get install gfortran libblas-dev liblapack-dev mpich libmpich-dev
-        install: 
-	  - pip install matplotlib mpi4py nose codecov Sphinx sphinx_rtd_theme
-	  - python setup.py install
-        script:
-          - sphinx-apidoc -f -o doc bet
- 	  - cd doc/
-  	  - make html
-  	  - make html
-  	  - cd ..
-        deploy:
-          provider: pages
-          skip_cleanup: true
-          github_token: $GITHUB_TOKEN
-          keep-history: false
-          on:
-            branch: master
-          local_dir: gh-pages/html
+deploy:
+  provider: pages
+  skip_cleanup: true
+  skip_existing: true
+  github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
+  keep_history: false
+  local_dir: gh-pages/html
+  on:
+    branch: master
+