diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-06-01 10:56:05 +0100 |
| commit | b8d49be5a1d8719ec47a44547d043874c8bfaddc (patch) | |
| tree | 52e58244f968f10176f8624eac19452d3337f810 /synapse/python_dependencies.py | |
| parent | Use Twisted-15.2.1, Use Agent.usingEndpointFactory rather than implement our ... (diff) | |
| parent | Merge pull request #172 from intelfx/contrib-systemd (diff) | |
| download | synapse-b8d49be5a1d8719ec47a44547d043874c8bfaddc.tar.xz | |
Merge branch 'develop' into markjh/twisted-15
Conflicts: synapse/python_dependencies.py
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 d1bf6d50cc..c76e16c28b 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==15.2.1": ["twisted==15.2.1"], "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", |