Merge lp:~cjwatson/launchpad/docutils-0.14 into lp:launchpad

[Colin Watson]

Upgrade to docutils 0.14 and Sphinx 1.6.5.

I previously tried something in https://code.launchpad.net/~cjwatson/launchpad/docutils-0.13.1/+merge/324879, but there were mysterious failures on full test runs. That was on Ubuntu 12.04, so hopefully things will work better now.

The Sphinx upgrade is needed because of an API change in docutils that broke lp.scripts.tests.test_sphinxdocs.TestSphinxDocumentation.test_docs_build_without_error.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'constraints.txt'
--- constraints.txt	2018-02-14 01:27:28 +0000
+++ constraints.txt	2018-02-20 17:08:19 +0000
@@ -121,7 +121,8 @@
 # Dependencies
 #distribute==0.6.36
 distribute==0.7.3
-docutils==0.7
+#docutils==0.7
+docutils==0.14
 Jinja2==2.5.5
 mechanize==0.2.5
 Paste==1.7.5.1
@@ -129,7 +130,7 @@
 PasteScript==1.7.5
 py==1.4.8
 #Pygments==1.4
-Pygments==1.6
+Pygments==2.2.0
 python-gettext==1.0
 #python-subunit==0.0.7
 python-subunit==0.0.8beta
@@ -138,7 +139,8 @@
 RestrictedPython==3.6.0
 #setuptools==0.6c11
 setuptools==36.4.0
-Sphinx==1.0.8
+#Sphinx==1.0.8
+Sphinx==1.6.5
 #testtools==0.9.12
 testtools==2.3.0
 transaction==1.1.1
@@ -218,6 +220,7 @@
 
 # Alphabetical, case-insensitive, please! :-)
 
+alabaster==0.7.10
 # lp:~launchpad/ampoule/lp
 # post1 Don't add a process back to the ready set if it received an error
 # such as a timeout.
@@ -255,6 +258,7 @@
 html5browser==0.0.9
 httmock==1.2.3
 httplib2==0.8
+imagesize==0.7.1
 importlib==1.0.2
 ipython==0.13.2
 iso8601==0.1.12
@@ -325,7 +329,9 @@
 simplejson==3.8.2
 SimpleTAL==4.3
 six==1.9.0
+snowballstemmer==1.2.1
 soupmatchers==0.2
+sphinxcontrib-websupport==1.0.1
 # lp:~launchpad-committers/storm/with-without-datetime
 storm==0.19.0.99-lpwithnodatetime-r408
 subprocess32==3.2.6
@@ -344,6 +350,7 @@
 txlongpoll==0.2.12
 txlongpollfixture==0.1.3
 txpkgupload==0.2
+typing==3.6.2
 unittest2==1.1.0
 van.testing==3.0.0
 virtualenv-tools3==2.0.0