Merge pull request #28 from blink1073/dev

Release cleanup for 1.1.1

Makefile

@@ -27,8 +27,11 @@ release:
 	python setup.py bdist_wininst --target-version=2.7 upload
 	python setup.py bdist_wininst --target-version=3.2 upload
 	python setup.py bdist_wininst --target-version=3.3 upload
+	python setup.py bdist_wheel upload
 	python setup.py sdist --formats=gztar,zip upload
-	python setup.py build_sphinx
+	pushd docs
+	make html
+	popd
 	python setup.py upload_sphinx
 	echo "Make sure to tag the branch"
 	echo "Make sure to push to hg"

docs/Makefile

@@ -9,7 +9,7 @@ PAPER         =
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d _build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 .PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
 
@@ -30,9 +30,9 @@ clean:
 	-rm -rf _build/*
 
 html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
 	@echo
-	@echo "Build finished. The HTML pages are in _build/html."
+	@echo "Build finished. The HTML pages are in build/html."
 
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml

docs/conf.py

@@ -68,7 +68,7 @@
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = ['_build']
+exclude_trees = ['build']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None

release.txt

@@ -38,5 +38,6 @@ python setup.py bdist_wininst --target-version=2.7 upload  # on linux, use wine
 python setup.py bdist_wininst --target-version=3.2 upload
 python setup.py bdist_wininst --target-version=3.3 upload
 python setup.py sdist --formats=gztar,zip upload
+# note: this appears to have broken with the anaconda install
 python setup.py build_sphinx
 python setup.py upload_sphinx