Skip to content

Commit

Permalink
Update Twisted and dependencies.
Browse files Browse the repository at this point in the history
- Fix `twistd` invocation for Twisted v17.1.0.
- Add Twisted and service-identity explicitly to `install_requires`.
  • Loading branch information
andrewmwhite committed Oct 2, 2017
1 parent ae48382 commit 0ad000f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ services:
- STETHOSCOPE_API_INSTANCE_PATH=/code/instance
- STETHOSCOPE_LOGIN_HOST=login:5002
ports:
- "5001:5001"
- "5001:5001"
command:
- "twistd"
- "--nodaemon"
- "--pidfile"
- ""
- "web"
- "--port"
- "5001"
- "tcp:port=5001"
- "--class=stethoscope.api.resource.resource"
nginx:
build:
Expand Down
2 changes: 1 addition & 1 deletion docs/backend.rst
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ API

.. code:: sh
twistd -n web -p 5001 --class=stethoscope.api.resource.resource
twistd -n web --port 'tcp:port=5001' --class=stethoscope.api.resource.resource
.. _Flask: http://flask.pocoo.org
Expand Down
10 changes: 6 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
arrow==0.10.0
asn1crypto==0.23.0
attrs==16.3.0
attrs==17.2.0
Automat==0.6.0
certifi==2017.7.27.1
cffi==1.11.0
chardet==3.0.4
Expand All @@ -17,8 +18,9 @@ Flask-Script==2.0.5
funcsigs==1.0.2
google-api-python-client==1.5.5
httplib2==0.9.2
hyperlink==17.3.1
idna==2.6
incremental==16.10.1
incremental==17.5.0
ipaddress==1.0.18
itsdangerous==0.24
Jinja2==2.8
Expand Down Expand Up @@ -54,11 +56,11 @@ service-identity==16.0.0
six==1.11.0
stevedore==1.19.1
treq==15.1.0
Twisted==16.6.0
Twisted==17.9.0
txretry==1.0.1
git+https://github.com/wrapp/txwebretry.git@df5014019cf3a5d501bc755b9ce46509c1b31351#egg=txwebretry
uritemplate==3.0.0
urllib3==1.22
validate-email==1.3
Werkzeug==0.11.11
zope.interface==4.3.2
zope.interface==4.4.3
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@ def parse_file(filename, encoding='utf-8'):
'PyJWT>=1.4.2', # 1.4.2 contains a bugfix for a parsing issue in JWT decoding
'PyOpenSSL',
'six',
'service-identity',
'setuptools',
'stevedore',
'treq',
'Twisted',
'txretry>=1.0.1', # 1.0.1 introduced support for Python 3
'txwebretry',
'validate-email',
Expand Down

0 comments on commit 0ad000f

Please sign in to comment.