Merge lp:~jelmer/brz/sphinx-python2 into lp:brz

Proposed by Jelmer Vernooij on 2019-06-21
Status: Merged
Approved by: Jelmer Vernooij on 2019-06-21
Approved revision: 7352
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/sphinx-python2
Merge into: lp:brz
Diff against target: 12 lines (+1/-1)
1 file modified
byov.conf (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/sphinx-python2
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve on 2019-06-21
Review via email: mp+369175@code.launchpad.net

Commit message

Pin sphinx 1.8.5 for python 2, as newer versions have dropped python 2 support.

Description of the change

Pin sphinx 1.8.5 for python 2.

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'byov.conf'
2--- byov.conf 2019-06-18 11:21:15 +0000
3+++ byov.conf 2019-06-21 15:13:07 +0000
4@@ -9,7 +9,7 @@
5 fastimport.clone = (git clone git://jelmer.uk/python-fastimport.git ../fastimport.git)
6 fastimport.install = (cd ../fastimport.git && ./setup.py install --user)
7 fastimport.install3 = (cd ../fastimport.git && python3 ./setup.py install --user)
8-sphinx_epytext.install = (pip install sphinx_epytext)
9+sphinx_epytext.install = (pip install sphinx==1.8.5 sphinx_epytext)
10 sphinx_epytext.install3 = (pip3 install sphinx_epytext)
11 flake8.install = (pip install flake8)
12 flake8.install3 = (pip3 install flake8)

Subscribers

People subscribed via source and target branches