Merge ~cjwatson/turnip:twisted-16.5.0 into turnip:master

Proposed by Colin Watson on 2018-02-26
Status: Merged
Approved by: Colin Watson on 2018-02-26
Approved revision: 4c7e0d4f1d36da93d1461d93b79d0f1fc3d2295b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/turnip:twisted-16.5.0
Merge into: turnip:master
Diff against target: 92 lines (+17/-8)
5 files modified
bootstrap-requirements.txt (+2/-2)
requirements.txt (+11/-3)
setup.py (+2/-2)
system-dependencies.txt (+1/-0)
turnip/pack/http.py (+1/-1)
Reviewer Review Type Date Requested Status
William Grant code 2018-02-26 Approve on 2018-02-26
Review via email: mp+339505@code.launchpad.net

Commit message

Upgrade to Twisted 16.5.0

cryptography requires libssl-dev as a system dependency, as well as pip
and setuptools upgrades to parse a new environment marker. The
twisted.web.http.Request changes in 16.3.0 require a small change to
HTTPPackClientProtocol.connectionLost, since trying to call
unregisterProducer on a finished request now crashes.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bootstrap-requirements.txt b/bootstrap-requirements.txt
2index 566a7b5..880e758 100644
3--- a/bootstrap-requirements.txt
4+++ b/bootstrap-requirements.txt
5@@ -1,2 +1,2 @@
6-pip==7.1.2
7-setuptools==18.4
8+pip==9.0.1
9+setuptools==38.5.1
10diff --git a/requirements.txt b/requirements.txt
11index 914b1df..45c6863 100644
12--- a/requirements.txt
13+++ b/requirements.txt
14@@ -1,15 +1,23 @@
15+appdirs==1.4.3
16+asn1crypto==0.24.0
17 beautifulsoup4==4.3.2
18-cffi==0.9.1
19+cffi==1.11.4
20+constantly==15.1.0
21 contextlib2==0.4.0
22 cornice==0.19.0
23+cryptography==2.1.4
24 docutils==0.12
25+enum34==1.1.6
26 envdir==0.7
27 extras==0.0.3
28 fixtures==1.0.0
29 flake8==2.4.0
30 gmpy==1.17
31 gunicorn==19.3.0
32-lazr.sshserver==0.1.4
33+idna==2.6
34+incremental==17.5.0
35+ipaddress==1.0.19
36+lazr.sshserver==0.1.7
37 linecache2==1.0.0
38 mccabe==0.3
39 Paste==2.0.2
40@@ -34,7 +42,7 @@ six==1.9.0
41 testtools==1.8.1
42 traceback2==1.4.0
43 translationstring==1.3
44-Twisted==15.5.0
45+Twisted[conch]==16.5.0
46 unittest2==1.0.1
47 venusian==1.0
48 waitress==0.8.9
49diff --git a/setup.py b/setup.py
50index 36a1156..38b6681 100755
51--- a/setup.py
52+++ b/setup.py
53@@ -20,12 +20,12 @@ with open(os.path.join(here, 'NEWS')) as f:
54 requires = [
55 'contextlib2',
56 'cornice',
57- 'lazr.sshserver>=0.1.2',
58+ 'lazr.sshserver>=0.1.7',
59 'Paste',
60 'pygit2>=0.24.0,<0.25.0',
61 'python-openid',
62 'PyYAML',
63- 'Twisted',
64+ 'Twisted[conch]',
65 'waitress',
66 'zope.interface',
67 ]
68diff --git a/system-dependencies.txt b/system-dependencies.txt
69index 818f04f..092754d 100644
70--- a/system-dependencies.txt
71+++ b/system-dependencies.txt
72@@ -3,5 +3,6 @@ cgit
73 git
74 libffi-dev
75 libgit2-24
76+libssl-dev
77 python-dev
78 python-virtualenv
79diff --git a/turnip/pack/http.py b/turnip/pack/http.py
80index 42fed27..99635ff 100644
81--- a/turnip/pack/http.py
82+++ b/turnip/pack/http.py
83@@ -182,8 +182,8 @@ class HTTPPackClientProtocol(PackProtocol):
84 self.factory.http_request.write(data)
85
86 def connectionLost(self, reason):
87- self.factory.http_request.unregisterProducer()
88 if not self.factory.http_request.finished:
89+ self.factory.http_request.unregisterProducer()
90 if reason.check(error.ConnectionDone):
91 # We assume that the backend will have sent an error if
92 # necessary; otherwise an empty response is permitted (and

Subscribers

People subscribed via source and target branches