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

Proposed by Colin Watson on 2017-12-22
Status: Merged
Merged at revision: 18557
Proposed branch: lp:~cjwatson/launchpad/docutils-0.14
Merge into: lp:launchpad
Diff against target: 66 lines (+10/-3)
1 file modified
constraints.txt (+10/-3)
To merge this branch: bzr merge lp:~cjwatson/launchpad/docutils-0.14
Reviewer Review Type Date Requested Status
William Grant code 2017-12-22 Approve on 2018-01-02
Review via email: mp+335551@code.launchpad.net

Commit message

Upgrade to docutils 0.14 and Sphinx 1.6.5.

Description of the change

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.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)
lp:~cjwatson/launchpad/docutils-0.14 updated on 2018-02-20
18520. By Colin Watson on 2018-02-14

Merge devel.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
121# Dependencies121# Dependencies
122#distribute==0.6.36122#distribute==0.6.36
123distribute==0.7.3123distribute==0.7.3
124docutils==0.7124#docutils==0.7
125docutils==0.14
125Jinja2==2.5.5126Jinja2==2.5.5
126mechanize==0.2.5127mechanize==0.2.5
127Paste==1.7.5.1128Paste==1.7.5.1
@@ -129,7 +130,7 @@
129PasteScript==1.7.5130PasteScript==1.7.5
130py==1.4.8131py==1.4.8
131#Pygments==1.4132#Pygments==1.4
132Pygments==1.6133Pygments==2.2.0
133python-gettext==1.0134python-gettext==1.0
134#python-subunit==0.0.7135#python-subunit==0.0.7
135python-subunit==0.0.8beta136python-subunit==0.0.8beta
@@ -138,7 +139,8 @@
138RestrictedPython==3.6.0139RestrictedPython==3.6.0
139#setuptools==0.6c11140#setuptools==0.6c11
140setuptools==36.4.0141setuptools==36.4.0
141Sphinx==1.0.8142#Sphinx==1.0.8
143Sphinx==1.6.5
142#testtools==0.9.12144#testtools==0.9.12
143testtools==2.3.0145testtools==2.3.0
144transaction==1.1.1146transaction==1.1.1
@@ -218,6 +220,7 @@
218220
219# Alphabetical, case-insensitive, please! :-)221# Alphabetical, case-insensitive, please! :-)
220222
223alabaster==0.7.10
221# lp:~launchpad/ampoule/lp224# lp:~launchpad/ampoule/lp
222# post1 Don't add a process back to the ready set if it received an error225# post1 Don't add a process back to the ready set if it received an error
223# such as a timeout.226# such as a timeout.
@@ -255,6 +258,7 @@
255html5browser==0.0.9258html5browser==0.0.9
256httmock==1.2.3259httmock==1.2.3
257httplib2==0.8260httplib2==0.8
261imagesize==0.7.1
258importlib==1.0.2262importlib==1.0.2
259ipython==0.13.2263ipython==0.13.2
260iso8601==0.1.12264iso8601==0.1.12
@@ -325,7 +329,9 @@
325simplejson==3.8.2329simplejson==3.8.2
326SimpleTAL==4.3330SimpleTAL==4.3
327six==1.9.0331six==1.9.0
332snowballstemmer==1.2.1
328soupmatchers==0.2333soupmatchers==0.2
334sphinxcontrib-websupport==1.0.1
329# lp:~launchpad-committers/storm/with-without-datetime335# lp:~launchpad-committers/storm/with-without-datetime
330storm==0.19.0.99-lpwithnodatetime-r408336storm==0.19.0.99-lpwithnodatetime-r408
331subprocess32==3.2.6337subprocess32==3.2.6
@@ -344,6 +350,7 @@
344txlongpoll==0.2.12350txlongpoll==0.2.12
345txlongpollfixture==0.1.3351txlongpollfixture==0.1.3
346txpkgupload==0.2352txpkgupload==0.2
353typing==3.6.2
347unittest2==1.1.0354unittest2==1.1.0
348van.testing==3.0.0355van.testing==3.0.0
349virtualenv-tools3==2.0.0356virtualenv-tools3==2.0.0