Merge lp:~cjwatson/launchpad/upgrade-paramiko into lp:launchpad

[Colin Watson]

Upgrade to paramiko 2.4.1.

This adds Python 3 support, along with very many other things that mostly don't matter for our limited use of paramiko.

This requires cherry-picking https://code.launchpad.net/~andrewsomething/bzr/bts794146/+merge/266499, and there's exactly one PyNaCl version that both satisfies paramiko's dependency and works with the libsodium version in xenial.

The bzr cherry-pick is at https://code.launchpad.net/~cjwatson/bzr/bzr-2.6.0-lp-3.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'constraints.txt'
--- constraints.txt	2018-05-14 11:58:37 +0000
+++ constraints.txt	2018-05-18 21:30:21 +0000
@@ -229,10 +229,11 @@
 Automat==0.6.0
 Babel==2.5.1
 backports.lzma==0.0.3
+bcrypt==3.1.4
 BeautifulSoup==3.2.1
 billiard==3.3.0.23
 bson==0.3.3
-bzr==2.6.0.lp.2
+bzr==2.6.0.lp.3
 celery==3.1.26.post2
 cffi==1.11.2
 Chameleon==2.11
@@ -306,7 +307,7 @@
 oops-wsgi==0.0.8
 ordereddict==1.1
 oslo.config==1.3.0
-paramiko==1.7.7.2
+paramiko==2.4.1
 pathlib2==2.3.2
 pbr==0.11.1
 pgbouncer==0.0.8
@@ -316,10 +317,10 @@
 pyasn1==0.4.2
 pyasn1-modules==0.2.1
 pycparser==2.18
-pycrypto==2.6
 pygpgme==0.2
 pyinotify==0.9.4
 pymacaroons==0.9.2
+PyNaCl==1.0.1
 pyOpenSSL==17.5.0
 pystache==0.5.3
 python-dateutil==1.5