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

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
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 Approve
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.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/bootstrap-requirements.txt b/bootstrap-requirements.txt
index 566a7b5..880e758 100644
--- a/bootstrap-requirements.txt
+++ b/bootstrap-requirements.txt
@@ -1,2 +1,2 @@
1pip==7.1.21pip==9.0.1
2setuptools==18.42setuptools==38.5.1
diff --git a/requirements.txt b/requirements.txt
index 914b1df..45c6863 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,23 @@
1appdirs==1.4.3
2asn1crypto==0.24.0
1beautifulsoup4==4.3.23beautifulsoup4==4.3.2
2cffi==0.9.14cffi==1.11.4
5constantly==15.1.0
3contextlib2==0.4.06contextlib2==0.4.0
4cornice==0.19.07cornice==0.19.0
8cryptography==2.1.4
5docutils==0.129docutils==0.12
10enum34==1.1.6
6envdir==0.711envdir==0.7
7extras==0.0.312extras==0.0.3
8fixtures==1.0.013fixtures==1.0.0
9flake8==2.4.014flake8==2.4.0
10gmpy==1.1715gmpy==1.17
11gunicorn==19.3.016gunicorn==19.3.0
12lazr.sshserver==0.1.417idna==2.6
18incremental==17.5.0
19ipaddress==1.0.19
20lazr.sshserver==0.1.7
13linecache2==1.0.021linecache2==1.0.0
14mccabe==0.322mccabe==0.3
15Paste==2.0.223Paste==2.0.2
@@ -34,7 +42,7 @@ six==1.9.0
34testtools==1.8.142testtools==1.8.1
35traceback2==1.4.043traceback2==1.4.0
36translationstring==1.344translationstring==1.3
37Twisted==15.5.045Twisted[conch]==16.5.0
38unittest2==1.0.146unittest2==1.0.1
39venusian==1.047venusian==1.0
40waitress==0.8.948waitress==0.8.9
diff --git a/setup.py b/setup.py
index 36a1156..38b6681 100755
--- a/setup.py
+++ b/setup.py
@@ -20,12 +20,12 @@ with open(os.path.join(here, 'NEWS')) as f:
20requires = [20requires = [
21 'contextlib2',21 'contextlib2',
22 'cornice',22 'cornice',
23 'lazr.sshserver>=0.1.2',23 'lazr.sshserver>=0.1.7',
24 'Paste',24 'Paste',
25 'pygit2>=0.24.0,<0.25.0',25 'pygit2>=0.24.0,<0.25.0',
26 'python-openid',26 'python-openid',
27 'PyYAML',27 'PyYAML',
28 'Twisted',28 'Twisted[conch]',
29 'waitress',29 'waitress',
30 'zope.interface',30 'zope.interface',
31 ]31 ]
diff --git a/system-dependencies.txt b/system-dependencies.txt
index 818f04f..092754d 100644
--- a/system-dependencies.txt
+++ b/system-dependencies.txt
@@ -3,5 +3,6 @@ cgit
3git3git
4libffi-dev4libffi-dev
5libgit2-245libgit2-24
6libssl-dev
6python-dev7python-dev
7python-virtualenv8python-virtualenv
diff --git a/turnip/pack/http.py b/turnip/pack/http.py
index 42fed27..99635ff 100644
--- a/turnip/pack/http.py
+++ b/turnip/pack/http.py
@@ -182,8 +182,8 @@ class HTTPPackClientProtocol(PackProtocol):
182 self.factory.http_request.write(data)182 self.factory.http_request.write(data)
183183
184 def connectionLost(self, reason):184 def connectionLost(self, reason):
185 self.factory.http_request.unregisterProducer()
186 if not self.factory.http_request.finished:185 if not self.factory.http_request.finished:
186 self.factory.http_request.unregisterProducer()
187 if reason.check(error.ConnectionDone):187 if reason.check(error.ConnectionDone):
188 # We assume that the backend will have sent an error if188 # We assume that the backend will have sent an error if
189 # necessary; otherwise an empty response is permitted (and189 # necessary; otherwise an empty response is permitted (and

Subscribers

People subscribed via source and target branches