txpkgupload

Merge ~cjwatson/txpkgupload:Twisted-20.3.0+lp5 into txpkgupload:master

  1. Git
  2. lp:~cjwatson/txpkgupload
  3. Twisted-20.3.0+lp5
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: c1c6416cd8e3f8ad160587f90fd3c73dae89de5c
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/txpkgupload:Twisted-20.3.0+lp5
Merge into: txpkgupload:master
Diff against target: 53 lines (+6/-3)
2 files modified
requirements.txt (+5/-2)
setup.py (+1/-1)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+415429@code.launchpad.net

Commit message

Upgrade to Twisted 20.3.0+lp5 and lazr.sshserver 0.1.13

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/requirements.txt b/requirements.txt
2index 6aa2d95..b0afb01 100644
3--- a/requirements.txt
4+++ b/requirements.txt
5@@ -15,13 +15,14 @@ FormEncode==1.3.1
6 httplib2==0.8
7 hyperlink==18.0.0
8 idna==2.6
9+importlib-metadata==2.1.1
10 incremental==17.5.0
11 ipaddress==1.0.18
12 iso8601==0.1.4
13 keyring==0.6.2
14 launchpadlib==1.10.9
15 lazr.restfulclient==0.14.3
16-lazr.sshserver==0.1.11
17+lazr.sshserver==0.1.13
18 lazr.uri==1.0.5
19 linecache2==1.0.0
20 oauthlib==3.1.0
21@@ -33,6 +34,7 @@ pbr==1.8.1
22 pyasn1==0.1.6
23 pycparser==2.18
24 PyHamcrest==1.10.1
25+PyNaCl==1.3.0
26 python-dateutil==2.8.1
27 python-gettext==4.0
28 python-mimeparse==0.1.4
29@@ -42,9 +44,10 @@ six==1.12.0
30 testresources==0.2.7
31 testtools==2.3.0
32 traceback2==1.4.0
33-Twisted[conch]==20.3.0
34+Twisted[conch]==20.3.0+lp5
35 unittest2==1.1.0+lp1
36 wadllib==1.3.2
37+zipp==1.2.0
38 zope.browser==2.3
39 zope.component==4.6.1
40 zope.configuration==4.4.0
41diff --git a/setup.py b/setup.py
42index b7e66ad..2a765ed 100755
43--- a/setup.py
44+++ b/setup.py
45@@ -58,7 +58,7 @@ setup(
46 'PyYAML',
47 'setuptools',
48 'six>=1.12.0',
49- 'Twisted[conch]',
50+ 'Twisted[conch_nacl]',
51 'zope.component',
52 'zope.interface>=3.6.0',
53 'zope.security',

Subscribers

People subscribed via source and target branches

to all changes: