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

Proposed by John A Meinel
Status: Superseded
Proposed branch: lp:~jameinel/launchpad/py27-introduction-1020667
Merge into: lp:launchpad
Diff against target: 54 lines (+8/-4)
2 files modified
buildout-templates/bin/test.in (+4/-0)
versions.cfg (+4/-4)
To merge this branch: bzr merge lp:~jameinel/launchpad/py27-introduction-1020667
Reviewer Review Type Date Requested Status
Martin Packman (community) Approve
Review via email: mp+113559@code.launchpad.net

This proposal has been superseded by a proposal from 2012-07-09.

Commit message

Update launchpadlib to 0.10.2 and httplib2 to 0.7.4. This fixes the last known python-2.7 failing test.

Description of the change

This just updates launchpad to use newer versions of launchpadlib (0.10.2, to be released soon, see: https://code.launchpad.net/~jameinel/launchpadlib/py27-config-ordering-1020667/+merge/113558)

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.

With these two updates, the launchpad test suite passes on python-2.7.

This can't be landed until the above merge proposal is approved, merged, and the new version of launchpadlib is built.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

I approve to the extent I am permitted.

review: Approve
Revision history for this message
John A Meinel (jameinel) wrote :

I started running a full test suite run, and stuff breaks with httplib2-0.7.4. My guess is that httplib2 started checking certificates, and it doesn't like the self-signed cert the test suite uses.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout-templates/bin/test.in'
2--- buildout-templates/bin/test.in 2012-06-14 17:22:03 +0000
3+++ buildout-templates/bin/test.in 2012-07-09 09:55:23 +0000
4@@ -61,6 +61,10 @@
5 os.environ['TZ'] = 'Asia/Calcutta'
6 time.tzset()
7
8+# Httplib2 0.7 started validating SSL certificates, and the test suite uses a
9+# self-signed certificate. So disable it with an env variable
10+os.environ['LP_DISABLE_SSL_CERTIFICATE_VALIDATION'] = '1'
11+
12 # Storm's C extensions should already be enabled from lp_sitecustomize.py,
13 # which our custom sitecustomize.py ran.
14 assert os.environ['STORM_CEXTENSIONS'] == '1'
15
16=== modified file 'versions.cfg'
17--- versions.cfg 2012-07-05 19:58:42 +0000
18+++ versions.cfg 2012-07-09 09:55:23 +0000
19@@ -34,7 +34,7 @@
20 funkload = 1.10.0
21 grokcore.component = 1.6
22 html5browser = 0.0.9
23-httplib2 = 0.6.0
24+httplib2 = 0.7.4
25 importlib = 1.0.2
26 ipython = 0.9.1
27 iso8601 = 0.1.4
28@@ -42,7 +42,7 @@
29 Jinja2 = 2.2
30 keyring = 0.6.2
31 kombu = 2.1.1
32-launchpadlib = 1.9.12
33+launchpadlib = 1.10.2
34 lazr.amqp = 0.1
35 lazr.authentication = 0.1.1
36 lazr.batchnavigator = 1.2.10
37@@ -52,7 +52,7 @@
38 lazr.jobrunner = 0.8
39 lazr.lifecycle = 1.1
40 lazr.restful = 0.19.6
41-lazr.restfulclient = 0.12.2
42+lazr.restfulclient = 0.13.0
43 lazr.smtptest = 1.3
44 lazr.testing = 0.1.1
45 lazr.uri = 1.0.2
46@@ -140,7 +140,7 @@
47 wadllib = 1.2.0
48 webunit = 1.3.8
49 wsgi-fileserver = 0.2.7
50-wsgi-intercept = 0.4
51+wsgi-intercept = 0.5.1
52 wsgi-jsonrpc = 0.2.8
53 wsgi-xmlrpc = 0.2.7
54 wsgiref = 0.1.2