diff options
author | Erik Johnston <erik@matrix.org> | 2015-06-12 11:53:03 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-06-12 11:53:03 +0100 |
commit | 405f8c47961c46aa225aa4b30f3774528929d9ed (patch) | |
tree | a266f69bc3147bf232595794bb6d36e024330ef9 /synapse/python_dependencies.py | |
parent | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse (diff) | |
parent | Mention config option name (diff) | |
download | synapse-405f8c47961c46aa225aa4b30f3774528929d9ed.tar.xz |
Merge branch 'release-v0.9.2' v0.9.2
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index a45dd3c93d..f9e59dd917 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -18,7 +18,7 @@ from distutils.version import LooseVersion logger = logging.getLogger(__name__) REQUIREMENTS = { - "syutil>=0.0.6": ["syutil>=0.0.6"], + "syutil>=0.0.7": ["syutil>=0.0.7"], "Twisted==14.0.2": ["twisted==14.0.2"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], @@ -30,6 +30,7 @@ REQUIREMENTS = { "frozendict>=0.4": ["frozendict"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], + "ujson": ["ujson"], } CONDITIONAL_REQUIREMENTS = { "web_client": { @@ -52,8 +53,8 @@ def github_link(project, version, egg): DEPENDENCY_LINKS = [ github_link( project="matrix-org/syutil", - version="v0.0.6", - egg="syutil-0.0.6", + version="v0.0.7", + egg="syutil-0.0.7", ), github_link( project="matrix-org/matrix-angular-sdk", |