Merge lp:~cjwatson/launchpad/pyopenssl-0.15.1 into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 18486
Proposed branch: lp:~cjwatson/launchpad/pyopenssl-0.15.1
Merge into: lp:launchpad
Diff against target: 54 lines (+8/-1)
1 file modified
versions.cfg (+8/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/pyopenssl-0.15.1
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+331889@code.launchpad.net

Commit message

Upgrade to pyOpenSSL 0.15.1.

Description of the change

It's now a bit weird to be pinning a version of pyOpenSSL that's older than is packaged in xenial, so let's upgrade to match that. We should at some point drop it from launchpad-dependencies and just manage it ourselves, bringing us closer to being able to drop system-site-packages. This does as usual mean having to deal with upgrades ourselves, but that's true for lots of other things anyway, and Ubuntu python-openssl's last security update was four years ago so it should be manageable.

This will also be needed for newer versions of Twisted.

I think that https://code.launchpad.net/~cjwatson/meta-lp-deps/pyopenssl-deps/+merge/331954 will need to land first.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)
Revision history for this message
Colin Watson (cjwatson) wrote :

I'm reverting this because it caused builds without network access to fail: cryptography uses setup_requires for cffi, and buildout doesn't support that. We'll have to re-land an equivalent of this after https://code.launchpad.net/~cjwatson/launchpad/virtualenv-pip/+merge/331388.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'versions.cfg'
--- versions.cfg 2017-09-25 12:24:39 +0000
+++ versions.cfg 2017-10-05 19:04:47 +0000
@@ -15,6 +15,7 @@
15amqplib = 1.0.215amqplib = 1.0.2
16anyjson = 0.3.316anyjson = 0.3.3
17argparse = 1.2.117argparse = 1.2.1
18asn1crypto = 0.23.0
18auditor = 0.0.319auditor = 0.0.3
19auditorclient = 0.0.420auditorclient = 0.0.4
20auditorfixture = 0.0.721auditorfixture = 0.0.7
@@ -24,7 +25,9 @@
24bson = 0.3.325bson = 0.3.3
25bzr = 2.6.0.lp.226bzr = 2.6.0.lp.2
26celery = 3.1.1827celery = 3.1.18
28cffi = 1.11.1
27Chameleon = 2.1129Chameleon = 2.11
30cryptography = 2.0.3
28cssselect = 0.9.131cssselect = 0.9.1
29cssutils = 0.9.1032cssutils = 0.9.10
30d2to1 = 0.2.1033d2to1 = 0.2.10
@@ -33,6 +36,7 @@
33# Required by dkimpy36# Required by dkimpy
34dnspython = 1.10.037dnspython = 1.10.0
35elementtree = 1.2.6-2005031638elementtree = 1.2.6-20050316
39enum34 = 1.1.6
36epydoc = 3.0.140epydoc = 3.0.1
37extras = 0.0.341extras = 0.0.3
38FeedParser = 4.142FeedParser = 4.1
@@ -43,7 +47,9 @@
43html5browser = 0.0.947html5browser = 0.0.9
44httmock = 1.2.348httmock = 1.2.3
45httplib2 = 0.849httplib2 = 0.8
50idna = 2.6
46importlib = 1.0.251importlib = 1.0.2
52ipaddress = 1.0.18
47ipython = 0.13.253ipython = 0.13.2
48iso8601 = 0.1.454iso8601 = 0.1.4
49jsautobuild = 0.255jsautobuild = 0.2
@@ -88,12 +94,13 @@
88prettytable = 0.7.294prettytable = 0.7.2
89psycopg2 = 2.6.195psycopg2 = 2.6.1
90pyasn1 = 0.1.696pyasn1 = 0.1.6
97pycparser = 2.18
91pycrypto = 2.698pycrypto = 2.6
92Pygments = 1.699Pygments = 1.6
93pygpgme = 0.2100pygpgme = 0.2
94pyinotify = 0.9.4101pyinotify = 0.9.4
95pymacaroons = 0.9.2102pymacaroons = 0.9.2
96pyOpenSSL = 0.13103pyOpenSSL = 0.15.1
97pystache = 0.5.3104pystache = 0.5.3
98python-dateutil = 1.5105python-dateutil = 1.5
99python-debian = 0.1.23106python-debian = 0.1.23