Merge branch '2015' into master in preparation for start of 2015 winter iteration

Author: cewing

.gitignore

@@ -38,3 +38,6 @@ development
 *.db
 *.sublime-project
 *.sublime-workspace
+.mr.developer.cfg
+outline_improvements.txt
+src

Makefile

@@ -3,10 +3,15 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   = ./bin/sphinx-build
 PAPER         =
 BUILDDIR      = build
 
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
@@ -29,17 +34,20 @@ help:
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
 	@echo "  text       to make text files"
 	@echo "  man        to make manual pages"
 	@echo "  texinfo    to make Texinfo files"
 	@echo "  info       to make Texinfo files and run them through makeinfo"
 	@echo "  gettext    to make PO message catalogs"
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 clean:
-	-rm -rf $(BUILDDIR)/*
+	rm -rf $(BUILDDIR)/*
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@@ -77,17 +85,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/InternetProgrammingwithPython.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PythonWebProgramming.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/InternetProgrammingwithPython.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PythonWebProgramming.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/InternetProgrammingwithPython"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/InternetProgrammingwithPython"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/PythonWebProgramming"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PythonWebProgramming"
 	@echo "# devhelp"
 
 epub:
@@ -108,6 +116,12 @@ latexpdf:
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
 text:
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
@@ -151,3 +165,19 @@ doctest:
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
 	@echo "Testing of doctests in the sources finished, look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+
+
+slides:
+	$(SPHINXBUILD) -b slides $(ALLSPHINXOPTS) $(BUILDDIR)/slides
+	@echo "Build finished. The HTML slides are in $(BUILDDIR)/slides."
+

README.rst

@@ -10,9 +10,9 @@ This package provides the source for all lecture materials used for the
 `Internet Programming in Python`_ section of the `Certificate in Python
 Programming`_ offered by the `University of Washington Professional &
 Continuing Education`_ program. This version of the documentation is used for
-the Winter 2014 instance of the course, Taught by `Cris Ewing`_
+the Winter 2015 instance of the course, Taught by `Cris Ewing`_
 
-.. _Internet Programming in Python: http://www.pce.uw.edu/courses/internet-programming-python/downtown-seattle-winter-2014/
+.. _Internet Programming in Python: http://www.pce.uw.edu/courses/internet-programming-python/downtown-seattle-winter-2015/
 .. _Certificate in Python Programming: http://www.pce.uw.edu/certificates/python-programming.html
 .. _University of Washington Professional & Continuing Education: http://www.pce.uw.edu/
 .. _Cris Ewing: http://www.linkedin.com/profile/view?id=19741495

buildout.cfg

@@ -2,13 +2,13 @@
 # Buildout to set-up Sphinx
 #
 [buildout]
-parts = 
-#    venv
-#    venv-pygments
-    build_s5
-    executable
+parts =
     sphinx
 
+extensions = mr.developer
+auto-checkout = *
+always-checkout = force
+
 allow-picked-versions = true
 show-picked-versions = true
 
@@ -18,55 +18,23 @@ script-in = ${buildout:directory}/commands/build.in
 
 [sphinx]
 recipe = collective.recipe.sphinxbuilder
-#doc-directory = .
-outputs = 
+outputs =
     html
 source = ${buildout:directory}/source/main
 build = ${buildout:directory}/build
 eggs =
     Sphinx
     docutils
-    roman
     Pygments
-
-[venv]
-recipe = rjm.recipe.venv
-venv_options = --no-site-packages
-distutils_urls =
-    http://pypi.python.org/packages/source/d/docutils/docutils-0.9.1.tar.gz
-
-[build_s5]
-recipe = collective.recipe.template[genshi]:genshi
-input = ${buildout:script-in}
-output = ${buildout:directory}/bin/build_s5
-build-suffix = html
-build-directory = ${buildout:directory}/build/html/presentations
-build-cmd = ${buildout:directory}/bin/rst2s5.py
-
-[executable]
-recipe = collective.recipe.cmd
-on_install = true
-on_update = true
-cmds = 
-    chmod 744 ${build_s5:output}
-
-# manually install Pygments into the docutils venv so it will be there for
-#  colorizing slide code examples.
-[venv-pygments]
-recipe = collective.recipe.cmd
-on_install = true
-on_update = false
-cmds =
-    ${buildout:directory}/bin/easy_install Pygments
-
+    hieroglyph
+    ipython
 
 [versions]
 # pin versions for continued sanity
-Jinja2 = 2.6
+Jinja2 = 2.7.2
 Pygments = 1.6
-Sphinx = 1.1.3
-collective.recipe.sphinxbuilder = 0.7.1
-roman = 1.4.0
+Sphinx = 1.2.2
+collective.recipe.sphinxbuilder = 0.8.2
 
 #Required by:
 #collective.recipe.sphinxbuilder 0.7.1
@@ -80,12 +48,10 @@ zc.buildout = 1.5.2
 #collective.recipe.sphinxbuilder 0.7.1
 zc.recipe.egg = 1.3.2
 
-Genshi = 0.6
-collective.recipe.cmd = 0.5
-collective.recipe.template = 1.9
-rjm.recipe.venv = 0.8
-
-
 #Required by:
 #rjm.recipe.venv 0.8
 virtualenv = 1.10
+
+
+[sources]
+hieroglyph = git https://github.com/nyergler/hieroglyph.git