summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-26 11:07:22 +0100
committerErik Johnston <erik@matrix.org>2016-04-26 11:07:22 +0100
commit3306cf45ca3532506db1eaee85f60b422a9810c9 (patch)
tree8e9e998985adb44ca1c2044f73f31a1002880e12 /synapse/python_dependencies.py
parentMerge pull request #752 from matrix-org/markjh/more_updates (diff)
parentMake pyjwt dependency optional (diff)
downloadsynapse-3306cf45ca3532506db1eaee85f60b422a9810c9.tar.xz
Merge pull request #750 from matrix-org/erikj/jwt_optional
Make pyjwt dependency optional
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r--synapse/python_dependencies.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py

index b25b736493..0eb3d6c1de 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py
@@ -36,7 +36,6 @@ REQUIREMENTS = { "blist": ["blist"], "pysaml2>=3.0.0,<4.0.0": ["saml2>=3.0.0,<4.0.0"], "pymacaroons-pynacl": ["pymacaroons"], - "pyjwt": ["jwt"], } CONDITIONAL_REQUIREMENTS = { "web_client": {