diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-29 14:58:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-29 14:58:56 +0100 |
| commit | 45bac68064754117f371e93169e332115201aee7 (patch) | |
| tree | 3af9696ad2f57e13f2c876e9a41b7c18f75437f1 /synapse/python_dependencies.py | |
| parent | SYN-395: Fix CAPTCHA, don't double decode json (diff) | |
| parent | Bump syutil version (diff) | |
| download | synapse-45bac68064754117f371e93169e332115201aee7.tar.xz | |
Merge pull request #169 from matrix-org/erikj/ultrajson
Use ultrajson when possible. Add option to turn off freezing of events.
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", |