From f7c5780f62effddaa96b98a6e41b4259dee2066a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Fri, 13 Mar 2015 15:50:07 -0500 Subject: [PATCH] Better handling of doc building --- .travis.yml | 4 +--- Makefile | 10 +++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79e7bd0b..6673055f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,9 +37,7 @@ script: else nosetests --exe -v oct2py; fi - - pip install sphinx - - export SPHINXOPTS=-W - - cd docs; make html + - make docs after_success: - coveralls diff --git a/Makefile b/Makefile index efa55654..e2578532 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Note: This is meant for Oct2Py developer use only -.PHONY: all clean test cover release gh-pages +.PHONY: all clean test cover release gh-pages docs export TEST_ARGS=--exe -v --with-doctest export NAME=oct2py @@ -36,12 +36,16 @@ release: test gh-pages git push origin --all git push origin --tags -gh-pages: clean +docs: clean + export SPHINXOPTS=-W pip install sphinx-bootstrap-theme numpydoc sphinx ghp-import + make -C docs html + +gh-pages: git checkout master git pull origin master cp oct2py/tests/*.m example git commit -a -m "Keep examples in sync"; true git push origin; true - make -C docs html + make docs ghp-import -n -p -m $(GHP_MSG) docs/_build/html