← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/txpkgupload:Twisted-20.3.0+lp6 into txpkgupload:master

 

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

Commit message:
Upgrade to Twisted 20.3.0+lp6

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/415608

This fixes a regression caused by upgrading to >= 20.3.0+lp2.

Dependencies MP: https://code.launchpad.net/~cjwatson/txpkgupload/+git/dependencies/+merge/415607
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/txpkgupload:Twisted-20.3.0+lp6 into txpkgupload:master.
diff --git a/requirements.txt b/requirements.txt
index b0afb01..f94ce00 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,7 +44,7 @@ six==1.12.0
 testresources==0.2.7
 testtools==2.3.0
 traceback2==1.4.0
-Twisted[conch]==20.3.0+lp5
+Twisted[conch]==20.3.0+lp6
 unittest2==1.1.0+lp1
 wadllib==1.3.2
 zipp==1.2.0