diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-02 18:11:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-02 18:11:24 +0100 |
| commit | e585c83209349d2d6e679cccc9f916edd2df1728 (patch) | |
| tree | 4b54914df6bfee4cfcf0a0dcbe4b2393d8f0ea4f /synapse/python_dependencies.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-e585c83209349d2d6e679cccc9f916edd2df1728.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 630e92c90e..7052333c19 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -40,7 +40,6 @@ REQUIREMENTS = { "pymacaroons-pynacl": ["pymacaroons"], "msgpack-python>=0.3.0": ["msgpack"], "phonenumbers>=8.2.0": ["phonenumbers"], - "affinity": ["affinity"], } CONDITIONAL_REQUIREMENTS = { "web_client": { @@ -59,6 +58,9 @@ CONDITIONAL_REQUIREMENTS = { "psutil": { "psutil>=2.0.0": ["psutil>=2.0.0"], }, + "affinity": { + "affinity": ["affinity"], + }, } |