diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-04 18:22:41 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-04 18:22:41 +0000 |
| commit | 506a63de67b63e09b500f377afd8074e25ea0d83 (patch) | |
| tree | 2c311b5c243ac8567f27aae7ba1a0dd2a6a0a1cd /synapse/python_dependencies.py | |
| parent | Re-add docstring, with caveats detailed (diff) | |
| parent | Remove the psutil dependency (#6318) (diff) | |
| download | synapse-506a63de67b63e09b500f377afd8074e25ea0d83.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_groups
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", |