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

[Kit Randel]

Move patched python-openid to constraints.txt.

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.

Unmerged revisions

184. By Kit Randel on 2015-10-28

Move patched python-openid to constraints.txt.

=== added file 'constraints.txt'
--- constraints.txt	1970-01-01 00:00:00 +0000
+++ constraints.txt	2015-10-28 23:20:11 +0000
@@ -0,0 +1,4 @@
+# XXX: deryck 2012-08-10
+# See lp:~deryck/python-openid/python-openid-fix1034376 which
+# reapplied a patch from wgrant to get codehosting going again.
+python-openid==2.2.5-fix1034376

=== modified file 'requirements.txt'
--- requirements.txt	2015-05-22 15:38:05 +0000
+++ requirements.txt	2015-10-28 23:20:11 +0000
@@ -6,10 +6,7 @@
 pyasn1==0.1.7
 pycrypto==2.6.1
 pyramid==1.5.4
-# XXX: deryck 2012-08-10
-# See lp:~deryck/python-openid/python-openid-fix1034376 which
-# reapplied a patch from wgrant to get codehosting going again.
-python-openid==2.2.5-fix1034376
+python-openid==2.2.5
 PyYAML==3.11
 repoze.lru==0.6
 simplejson==3.6.5