Breezy

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

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

Commit message

Pin sphinx 1.8.5 on python 2; newer versions of sphinx no longer support python 2.

Description of the change

Pin sphinx 1.8.5 on python 2; newer versions of sphinx no longer support python 2.

To post a comment you must log in.
Revision history for this message
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-16 21:41:25 +0000
3+++ byov.conf 2019-06-21 15:34:57 +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