← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jameinel/launchpad/py27-introduction-1020667 into lp:launchpad

 

John A Meinel has proposed merging lp:~jameinel/launchpad/py27-introduction-1020667 into lp:launchpad.

Requested reviews:
  Martin Packman (gz)

For more details, see:
https://code.launchpad.net/~jameinel/launchpad/py27-introduction-1020667/+merge/113938

This just updates launchpad to use newer versions of launchpadlib 0.10.2.

We've been using 0.9.12, but it turns out that updating to 0.10.0+ requires a newer httplib2 as it started passing a flag there. That also requires a newer wsgi_intercept, because it is monkey-patching httplib2 and how it needs to be patched changed.

Also, httplib2 started checking the SSL certificates, but we want to disable that for the test suite. So I updated bin/test to set the env variable that lazr.restful (also updated) and launchpadlib both recognize.

This should get all tests passing with python2.7, and also update our httplib to be something reasonable. (Since Lucid, Ubuntu has been shipping httplib2-0.7.2)
-- 
https://code.launchpad.net/~jameinel/launchpad/py27-introduction-1020667/+merge/113938
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.
=== modified file 'buildout-templates/bin/test.in'
--- buildout-templates/bin/test.in	2012-06-14 17:22:03 +0000
+++ buildout-templates/bin/test.in	2012-07-09 10:00:29 +0000
@@ -61,6 +61,10 @@
 os.environ['TZ'] = 'Asia/Calcutta'
 time.tzset()
 
+# Httplib2 0.7 started validating SSL certificates, and the test suite uses a
+# self-signed certificate. So disable it with an env variable
+os.environ['LP_DISABLE_SSL_CERTIFICATE_VALIDATION'] = '1'
+
 # Storm's C extensions should already be enabled from lp_sitecustomize.py,
 # which our custom sitecustomize.py ran.
 assert os.environ['STORM_CEXTENSIONS'] == '1'

=== modified file 'versions.cfg'
--- versions.cfg	2012-07-05 19:58:42 +0000
+++ versions.cfg	2012-07-09 10:00:29 +0000
@@ -34,7 +34,7 @@
 funkload = 1.10.0
 grokcore.component = 1.6
 html5browser = 0.0.9
-httplib2 = 0.6.0
+httplib2 = 0.7.4
 importlib = 1.0.2
 ipython = 0.9.1
 iso8601 = 0.1.4
@@ -42,7 +42,7 @@
 Jinja2 = 2.2
 keyring = 0.6.2
 kombu = 2.1.1
-launchpadlib = 1.9.12
+launchpadlib = 1.10.2
 lazr.amqp = 0.1
 lazr.authentication = 0.1.1
 lazr.batchnavigator = 1.2.10
@@ -52,7 +52,7 @@
 lazr.jobrunner = 0.8
 lazr.lifecycle = 1.1
 lazr.restful = 0.19.6
-lazr.restfulclient = 0.12.2
+lazr.restfulclient = 0.13.0
 lazr.smtptest = 1.3
 lazr.testing = 0.1.1
 lazr.uri = 1.0.2
@@ -140,7 +140,7 @@
 wadllib = 1.2.0
 webunit = 1.3.8
 wsgi-fileserver = 0.2.7
-wsgi-intercept = 0.4
+wsgi-intercept = 0.5.1
 wsgi-jsonrpc = 0.2.8
 wsgi-xmlrpc = 0.2.7
 wsgiref = 0.1.2


Follow ups