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

Proposed by Colin Watson on 2017-12-22
Status: Needs review
Proposed branch: lp:~cjwatson/launchpad/docutils-0.14
Merge into: lp:launchpad
Diff against target: 74 lines (+11/-3)
1 file modified
constraints.txt (+11/-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)

Unmerged revisions

18519. By Colin Watson on 2017-12-22

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'constraints.txt'
2--- constraints.txt 2017-12-19 09:46:14 +0000
3+++ constraints.txt 2017-12-22 13:05:46 +0000
4@@ -121,7 +121,8 @@
5 # Dependencies
6 #distribute==0.6.36
7 distribute==0.7.3
8-docutils==0.7
9+#docutils==0.7
10+docutils==0.14
11 Jinja2==2.5.5
12 mechanize==0.2.5
13 Paste==1.7.5.1
14@@ -129,7 +130,7 @@
15 PasteScript==1.7.5
16 py==1.4.8
17 #Pygments==1.4
18-Pygments==1.6
19+Pygments==2.2.0
20 python-gettext==1.0
21 #python-subunit==0.0.7
22 python-subunit==0.0.8beta
23@@ -138,7 +139,8 @@
24 RestrictedPython==3.6.0
25 #setuptools==0.6c11
26 setuptools==36.4.0
27-Sphinx==1.0.8
28+#Sphinx==1.0.8
29+Sphinx==1.6.5
30 #testtools==0.9.12
31 testtools==0.9.30
32 transaction==1.1.1
33@@ -218,6 +220,7 @@
34
35 # Alphabetical, case-insensitive, please! :-)
36
37+alabaster==0.7.10
38 # lp:~launchpad/ampoule/lp
39 # post1 Don't add a process back to the ready set if it received an error
40 # such as a timeout.
41@@ -228,6 +231,7 @@
42 auditor==0.0.3
43 auditorclient==0.0.4
44 auditorfixture==0.0.7
45+Babel==2.5.1
46 backports.lzma==0.0.3
47 BeautifulSoup==3.2.1
48 billiard==3.3.0.20
49@@ -253,6 +257,7 @@
50 html5browser==0.0.9
51 httmock==1.2.3
52 httplib2==0.8
53+imagesize==0.7.1
54 importlib==1.0.2
55 ipython==0.13.2
56 iso8601==0.1.4
57@@ -322,7 +327,9 @@
58 simplejson==3.8.2
59 SimpleTAL==4.3
60 six==1.9.0
61+snowballstemmer==1.2.1
62 soupmatchers==0.2
63+sphinxcontrib-websupport==1.0.1
64 # lp:~launchpad-committers/storm/with-without-datetime
65 storm==0.19.0.99-lpwithnodatetime-r408
66 subprocess32==3.2.6
67@@ -341,6 +348,7 @@
68 txlongpoll==0.2.12
69 txlongpollfixture==0.1.3
70 txpkgupload==0.2
71+typing==3.6.2
72 unittest2==0.5.1
73 van.testing==3.0.0
74 virtualenv-tools3==2.0.0