diff options
| author | Erik Johnston <erik@matrix.org> | 2019-11-05 10:27:41 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-11-05 10:27:41 +0000 |
| commit | ffe595381d508bc4b7ff1acbfb03b8d280da03a3 (patch) | |
| tree | d9dac65c36d01814fdd97d78f0d4315b38ba30ad /synapse/python_dependencies.py | |
| parent | Change to not require a state_groups.room_id index. (diff) | |
| parent | Remove the psutil dependency (#6318) (diff) | |
| download | synapse-ffe595381d508bc4b7ff1acbfb03b8d280da03a3.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/python_dependencies.py')
| -rw-r--r-- | synapse/python_dependencies.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index aa7da1c543..5871feaafd 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -61,7 +61,6 @@ REQUIREMENTS = [ "bcrypt>=3.1.0", "pillow>=4.3.0", "sortedcontainers>=1.4.4", - "psutil>=2.0.0", "pymacaroons>=0.13.0", "msgpack>=0.5.2", "phonenumbers>=8.2.0", |