Colin Watson has proposed merging ~cjwatson/turnip:Twisted-20.3.0+lp5 into turnip: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 turnip: "Add support for Ed25519 SSH keys" https://bugs.launchpad.net/turnip/+bug/907675 Bug #1933722 in turnip: "Launchpad doesn't support secure SSH parameters" https://bugs.launchpad.net/turnip/+bug/1933722 For more details, see: https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/415428 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/turnip/+git/dependencies/+merge/415425 -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:Twisted-20.3.0+lp5 into turnip:master.
diff --git a/requirements.txt b/requirements.txt index 3d92580..4ccf041 100644 --- a/requirements.txt +++ b/requirements.txt @@ -29,7 +29,7 @@ importlib_metadata==1.7.0 incremental==17.5.0 ipaddress==1.0.23 kombu==4.6.11 -lazr.sshserver==0.1.11 +lazr.sshserver==0.1.13 linecache2==1.0.0 lxml==4.5.2 m2r==0.1.14 @@ -48,6 +48,7 @@ pycparser==2.17 pycrypto==2.6.1 pyflakes==2.3.1 pygit2==1.0.3 +PyNaCl==1.3.0 pyramid==1.10.4 python-mimeparse==1.6.0 python-openid2==3.2 @@ -63,12 +64,9 @@ testscenarios==0.5.0 testtools==2.4.0 traceback2==1.4.0 translationstring==1.3 -# XXX 2020-08-18 pappacena: This feature is already merged to Twisted trunk, so -# we should be able to get rid of this backport soon. -# Backport of SSH session env variables setter from -# https://github.com/twisted/twisted/pull/1173 to Twisted version 20.3.0. -# See https://code.launchpad.net/~launchpad/twisted/+git/twisted/+ref/pr-1173 -Twisted[conch]==20.3.0+lp4 +# Assorted backports of upstream Twisted PRs. See +# https://code.launchpad.net/~launchpad/twisted/+git/twisted/+ref/lp-backport. +Twisted[conch_nacl]==20.3.0+lp5 unittest2==1.1.0 vine==1.3.0 venusian==2.1.0 diff --git a/setup.py b/setup.py index d97e823..cfe18fc 100755 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ requires = [ 'python-openid2', 'PyYAML', 'statsd', - 'Twisted[conch]', + 'Twisted[conch_nacl]', 'waitress', 'zope.interface', ]
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
