diff options
| author | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-01-21 14:04:19 +0000 |
| commit | 35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3 (patch) | |
| tree | 2c844b79665fc32b0bfc49285586394edf367131 /synapse/python_dependencies.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff) | |
| download | synapse-35e1d67b4e9c2c8b0abf35d41c2d9c56d486f6e3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_invite_server
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 69c5f9fe2e..882e844eb1 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -40,7 +40,11 @@ REQUIREMENTS = [ "signedjson>=1.0.0", "pynacl>=1.2.1", "service_identity>=16.0.0", - "Twisted>=17.1.0", + + # our logcontext handling relies on the ability to cancel inlineCallbacks + # (https://twistedmatrix.com/trac/ticket/4632) which landed in Twisted 18.7. + "Twisted>=18.7.0", + "treq>=15.1", # Twisted has required pyopenssl 16.0 since about Twisted 16.6. "pyopenssl>=16.0.0", @@ -52,15 +56,18 @@ REQUIREMENTS = [ "pillow>=3.1.2", "sortedcontainers>=1.4.4", "psutil>=2.0.0", - "pymacaroons-pynacl>=0.9.3", - "msgpack-python>=0.4.2", + "pymacaroons>=0.13.0", + "msgpack>=0.5.0", "phonenumbers>=8.2.0", "six>=1.10", # prometheus_client 0.4.0 changed the format of counter metrics # (cf https://github.com/matrix-org/synapse/issues/4001) "prometheus_client>=0.0.18,<0.4.0", + # we use attr.s(slots), which arrived in 16.0.0 - "attrs>=16.0.0", + # Twisted 18.7.0 requires attrs>=17.4.0 + "attrs>=17.4.0", + "netaddr>=0.7.18", ] |