launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:twisted-20.3.0+lp4 into launchpad:master.

Commit message:
Upgrade to Twisted 20.3.0+lp4

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1938335 in Launchpad itself: "Intermittent failures doing "bzr branch""
  https://bugs.launchpad.net/launchpad/+bug/1938335

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

Taken from turnip's dependencies repository.  In addition to upgrading to upstream 20.3.0, and a few other backported fixes that aren't relevant to Launchpad itself, this backports a fix to twisted.internet.process.pauseProducing/resumeProducing that caused intermittent bzr failures on Python 3.

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/406333
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:twisted-20.3.0+lp4 into launchpad:master.

diff --git a/lib/lp/codehosting/sshserver/tests/test_daemon.py b/lib/lp/codehosting/sshserver/tests/test_daemon.py
index e9b1314..5141ab7 100644
--- a/lib/lp/codehosting/sshserver/tests/test_daemon.py
+++ b/lib/lp/codehosting/sshserver/tests/test_daemon.py
@@ -14,7 +14,7 @@ from lazr.sshserver.auth import (
 from lazr.sshserver.service import Factory
 from twisted.conch.ssh.common import NS
 from twisted.conch.ssh.keys import Key
-from twisted.test.proto_helpers import StringTransport
+from twisted.internet.testing import StringTransport
 
 from lp.codehosting.sshserver.daemon import (
     get_key_path,
diff --git a/requirements/launchpad.txt b/requirements/launchpad.txt
index 7eee4bf..0ad7054 100644
--- a/requirements/launchpad.txt
+++ b/requirements/launchpad.txt
@@ -11,7 +11,7 @@ amqp==2.4.2
 anyjson==0.3.3
 appdirs==1.4.3
 asn1crypto==0.23.0
-attrs==19.1.0
+attrs==19.3.0
 Automat==0.6.0
 backports.functools-lru-cache==1.5
 backports.lzma==0.0.3
@@ -150,7 +150,8 @@ testresources==0.2.7
 testscenarios==0.4
 timeline==0.0.7
 treq==18.6.0
-Twisted==19.2.1
+# lp:~launchpad/twisted:lp-backport
+Twisted==20.3.0+lp4
 txfixtures==0.4.3
 txpkgupload==0.4
 # lp1 Set version directly in setup.py to fix wheel building.