launchpad-reviewers team mailing list archive

[Colin Watson <mp+415429@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/txpkgupload:Twisted-20.3.0+lp5 into txpkgupload:master.

Commit message:
Upgrade to Twisted 20.3.0+lp5 and lazr.sshserver 0.1.13

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #907675 in txpkgupload: "Add support for Ed25519 SSH keys"
  https://bugs.launchpad.net/txpkgupload/+bug/907675
  Bug #1933722 in txpkgupload: "Launchpad doesn't support secure SSH parameters"
  https://bugs.launchpad.net/txpkgupload/+bug/1933722

For more details, see:
https://code.launchpad.net/~cjwatson/txpkgupload/+git/txpkgupload/+merge/415429

Between them, these add support for SSH Ed25519 keys (given a small additional change to Launchpad) and RSA SHA-2 signatures.

Dependencies MP: https://code.launchpad.net/~cjwatson/txpkgupload/+git/dependencies/+merge/415426
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/txpkgupload:Twisted-20.3.0+lp5 into txpkgupload:master.

diff --git a/requirements.txt b/requirements.txt
index 6aa2d95..b0afb01 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,13 +15,14 @@ FormEncode==1.3.1
 httplib2==0.8
 hyperlink==18.0.0
 idna==2.6
+importlib-metadata==2.1.1
 incremental==17.5.0
 ipaddress==1.0.18
 iso8601==0.1.4
 keyring==0.6.2
 launchpadlib==1.10.9
 lazr.restfulclient==0.14.3
-lazr.sshserver==0.1.11
+lazr.sshserver==0.1.13
 lazr.uri==1.0.5
 linecache2==1.0.0
 oauthlib==3.1.0
@@ -33,6 +34,7 @@ pbr==1.8.1
 pyasn1==0.1.6
 pycparser==2.18
 PyHamcrest==1.10.1
+PyNaCl==1.3.0
 python-dateutil==2.8.1
 python-gettext==4.0
 python-mimeparse==0.1.4
@@ -42,9 +44,10 @@ six==1.12.0
 testresources==0.2.7
 testtools==2.3.0
 traceback2==1.4.0
-Twisted[conch]==20.3.0
+Twisted[conch]==20.3.0+lp5
 unittest2==1.1.0+lp1
 wadllib==1.3.2
+zipp==1.2.0
 zope.browser==2.3
 zope.component==4.6.1
 zope.configuration==4.4.0
diff --git a/setup.py b/setup.py
index b7e66ad..2a765ed 100755
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ setup(
         'PyYAML',
         'setuptools',
         'six>=1.12.0',
-        'Twisted[conch]',
+        'Twisted[conch_nacl]',
         'zope.component',
         'zope.interface>=3.6.0',
         'zope.security',