Skip to content

Commit

Permalink
Better handling of doc building
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Mar 13, 2015
1 parent 417eef0 commit f7c5780
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Expand Up @@ -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
10 changes: 7 additions & 3 deletions 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
Expand Down Expand Up @@ -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

0 comments on commit f7c5780

Please sign in to comment.