From a93f30278a908ba0cf825ef4213c4250c7a37b00 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 23 Oct 2015 22:49:22 -0700 Subject: [PATCH] Ensure gallery pages are always generated --- RELEASE.txt | 3 --- doc/Makefile | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 915134ad..b5b34cb9 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -22,9 +22,6 @@ How to make a new release of ``skimage`` - Edit ``doc/source/_static/docversions.js`` and commit - Build a clean version of the docs. Run ``python setup.py install`` in the root dir, then ``rm -rf build; make html`` in the docs. - - Run ``make html`` again to copy the newly generated ``random.js`` into - place. Double check ``random.js``, otherwise the skimage.org front - page gets broken! - Build using ``make gh-pages``. - Update the symlink to ``stable``. - Push upstream: ``git push origin gh-pages`` in ``doc/gh-pages``. diff --git a/doc/Makefile b/doc/Makefile index 589e2937..63523365 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -13,7 +13,7 @@ PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d $(SPHINXCACHE) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source DEST = build -.PHONY: all help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest gitwash gh-pages release_notes random_gallery +.PHONY: all help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest gitwash gh-pages release_notes all: html @@ -41,18 +41,16 @@ api: $(PYTHON) tools/build_modref_templates.py @echo "Build API docs...done." -random_gallery: - @cd source && $(PYTHON) random_gallery.py - release_notes: @echo "Copying release notes" @tail -n +4 `ls release/*.txt | sort -k 2 -t . -n | tail -n 1` > release/_release_notes_for_docs.txt -html: api release_notes random_gallery +html: api release_notes $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(DEST)/html cp -r source/plots $(DEST)/html @echo @echo "Build finished. The HTML pages are in build/html." + $(PYTHON) source/random_gallery.py dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(DEST)/dirhtml