Merge branch 'master' into website

.gitignore

@@ -17,6 +17,8 @@ docs/*.html
 *.rst
 docs/*.png
 docs/sphinx/_build
+pages/docs/
+pages/reqs/
 
 # Google Drive
 *.gdoc

.travis.yml

@@ -8,26 +8,28 @@ script: make ci
 after_success:
 - coveralls
 - ocular
-after_script:
-# Generate Doorstop HTML pages
-- make reqs-html
-- cp -r docs/gen/ pages/reqs/
-# Generate Sphinx HTML pages
-- make sphinx
-- cp -r docs/sphinx/_build pages/docs/
-# Configure Git with Travis CI information
-- git config --global user.email "travis@travis-ci.org"
-- git config --global user.name "travis-ci"
-# Delete the current repository
-- rm -rf .git
-# Rebuild the repository from the generated files and push to GitHub pages
-- >
-  cd pages;
-  echo "[${TRAVIS_REPO_SLUG}](~${TRAVIS_REPO_SLUG})" | sed -e 's/\//.github.io\//g' | sed -e 's/~/http:\/\//g' > README.md ;
-  git init ;
-  git add . ;
-  git commit -m "Deployed Travis CI build $TRAVIS_BUILD_NUMBER to GitHub pages." ;
-  git push -f https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} master:gh-pages ;
+after_script: >
+  echo $TRAVIS_BRANCH; echo $TRAVIS_PULL_REQUEST; echo $TRAVIS_PYTHON_VERSION;
+  if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' && $TRAVIS_PYTHON_VERSION == '3.3' ]]; then
+
+    # Generate Doorstop and Sphinx HTML pages
+    make pages ;
+
+    # Configure Git with Travis CI information
+    git config --global user.email "travis@travis-ci.org" ;
+    git config --global user.name "travis-ci" ;
+
+    # Delete the current repository
+    rm -rf .git ;
+
+    # Rebuild the repository from the generated files and push to GitHub pages
+    cd pages ;
+    echo "[${TRAVIS_REPO_SLUG}](~${TRAVIS_REPO_SLUG})" | sed -e 's/\//.github.io\//g' | sed -e 's/~/http:\/\//g' > README.md ;
+    git init ;
+    git add . ;
+    git commit -m "Deployed Travis CI build $TRAVIS_BUILD_NUMBER to GitHub pages." ;
+    git push -f https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} master:gh-pages ;
+  fi
 notifications:
   email:
     on_success: never

Makefile

@@ -98,6 +98,11 @@ gui: env
 .PHONY: doc
 doc: readme reqs uml apidocs sphinx
 
+.PHONY: pages 
+pages: reqs-html sphinx
+	cp -r docs/gen/ pages/reqs/
+	cp -r docs/sphinx/_build pages/docs/
+
 .PHONY: readme
 readme: .depends-dev docs/README-github.html docs/README-pypi.html
 docs/README-github.html: README.md
@@ -206,6 +211,7 @@ clean-all: clean .clean-env
 .clean-doc:
 	rm -rf apidocs docs/README*.html README.rst docs/*.png docs/gen
 	rm -rf docs/sphinx/doorstop*.rst docs/sphinx/_build
+	rm -rf pages/docs/ pages/reqs/
 
 .PHONY: .clean-test
 .clean-test:

pages/index.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
 
     <title>Doorstop</title>
-    
+
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),