Merge lp:~blr/turnip/pip-constraints into lp:turnip

Proposed by Kit Randel
Status: Needs review
Proposed branch: lp:~blr/turnip/pip-constraints
Merge into: lp:turnip
Prerequisite: lp:~cjwatson/turnip/virtualenv
Diff against target: 24 lines (+5/-4)
2 files modified
constraints.txt (+4/-0)
requirements.txt (+1/-4)
To merge this branch: bzr merge lp:~blr/turnip/pip-constraints
Reviewer Review Type Date Requested Status
Launchpad code reviewers Pending
Review via email: mp+276069@code.launchpad.net

Commit message

Move patched python-openid to constraints.txt.

Description of the change

Move patched libs (python-openid) to constraints.txt. This requires cjwatson's branch lp:~cjwatson/turnip/virtualenv which bootstraps to pip 7.1.2 (constraints introduced in 7.1), and will require turnip charm support.

Generally speaking, I think we should try to use constraints as a point of best practice, however in this instance it is needed for lp:~blr/turnip/sphinx-docs, as ReadTheDocs build fails with python-openid==2.2.5-fix1034376.

To post a comment you must log in.

Unmerged revisions

184. By Kit Randel on 2015-10-28

Move patched python-openid to constraints.txt.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'constraints.txt'
2--- constraints.txt 1970-01-01 00:00:00 +0000
3+++ constraints.txt 2015-10-28 23:20:11 +0000
4@@ -0,0 +1,4 @@
5+# XXX: deryck 2012-08-10
6+# See lp:~deryck/python-openid/python-openid-fix1034376 which
7+# reapplied a patch from wgrant to get codehosting going again.
8+python-openid==2.2.5-fix1034376
9
10=== modified file 'requirements.txt'
11--- requirements.txt 2015-05-22 15:38:05 +0000
12+++ requirements.txt 2015-10-28 23:20:11 +0000
13@@ -6,10 +6,7 @@
14 pyasn1==0.1.7
15 pycrypto==2.6.1
16 pyramid==1.5.4
17-# XXX: deryck 2012-08-10
18-# See lp:~deryck/python-openid/python-openid-fix1034376 which
19-# reapplied a patch from wgrant to get codehosting going again.
20-python-openid==2.2.5-fix1034376
21+python-openid==2.2.5
22 PyYAML==3.11
23 repoze.lru==0.6
24 simplejson==3.6.5

Subscribers

People subscribed via source and target branches