Launchpad itself

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

  1. pyopenssl-0.15.1
  2. Merge into devel
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
1=== modified file 'versions.cfg'
2--- versions.cfg 2017-09-25 12:24:39 +0000
3+++ versions.cfg 2017-10-05 19:04:47 +0000
4@@ -15,6 +15,7 @@
5 amqplib = 1.0.2
6 anyjson = 0.3.3
7 argparse = 1.2.1
8+asn1crypto = 0.23.0
9 auditor = 0.0.3
10 auditorclient = 0.0.4
11 auditorfixture = 0.0.7
12@@ -24,7 +25,9 @@
13 bson = 0.3.3
14 bzr = 2.6.0.lp.2
15 celery = 3.1.18
16+cffi = 1.11.1
17 Chameleon = 2.11
18+cryptography = 2.0.3
19 cssselect = 0.9.1
20 cssutils = 0.9.10
21 d2to1 = 0.2.10
22@@ -33,6 +36,7 @@
23 # Required by dkimpy
24 dnspython = 1.10.0
25 elementtree = 1.2.6-20050316
26+enum34 = 1.1.6
27 epydoc = 3.0.1
28 extras = 0.0.3
29 FeedParser = 4.1
30@@ -43,7 +47,9 @@
31 html5browser = 0.0.9
32 httmock = 1.2.3
33 httplib2 = 0.8
34+idna = 2.6
35 importlib = 1.0.2
36+ipaddress = 1.0.18
37 ipython = 0.13.2
38 iso8601 = 0.1.4
39 jsautobuild = 0.2
40@@ -88,12 +94,13 @@
41 prettytable = 0.7.2
42 psycopg2 = 2.6.1
43 pyasn1 = 0.1.6
44+pycparser = 2.18
45 pycrypto = 2.6
46 Pygments = 1.6
47 pygpgme = 0.2
48 pyinotify = 0.9.4
49 pymacaroons = 0.9.2
50-pyOpenSSL = 0.13
51+pyOpenSSL = 0.15.1
52 pystache = 0.5.3
53 python-dateutil = 1.5
54 python-debian = 0.1.23