diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-04-14 16:36:36 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-04-14 16:36:36 +0100 |
| commit | 4847a9534da41efba0f3d35824d4207bb76353a5 (patch) | |
| tree | b8ce499d268ae75450df2edcb92f079f7db0e82b /synapse | |
| parent | Merge pull request #121 from matrix-org/key-api-restructure (diff) | |
| parent | Update syutil version to 0.0.4 (diff) | |
| download | synapse-4847a9534da41efba0f3d35824d4207bb76353a5.tar.xz | |
Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4
Update syutil version to 0.0.4
Diffstat (limited to '')
| -rw-r--r-- | synapse/config/server.py | 2 | ||||
| -rw-r--r-- | synapse/python_dependencies.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 58a828cc4c..d4c223f348 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -110,7 +110,7 @@ class ServerConfig(Config): with open(args.signing_key_path, "w") as signing_key_file: syutil.crypto.signing_key.write_signing_keys( signing_key_file, - (syutil.crypto.signing_key.generate_singing_key("auto"),), + (syutil.crypto.signing_key.generate_signing_key("auto"),), ) else: signing_keys = cls.read_file(args.signing_key_path, "signing_key") diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 6b6d5508b8..dac927d0a7 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -4,7 +4,7 @@ from distutils.version import LooseVersion logger = logging.getLogger(__name__) REQUIREMENTS = { - "syutil>=0.0.3": ["syutil"], + "syutil>=0.0.4": ["syutil"], "Twisted==14.0.2": ["twisted==14.0.2"], "service_identity>=1.0.0": ["service_identity>=1.0.0"], "pyopenssl>=0.14": ["OpenSSL>=0.14"], @@ -43,8 +43,8 @@ DEPENDENCY_LINKS = [ ), github_link( project="matrix-org/syutil", - version="v0.0.3", - egg="syutil-0.0.3", + version="v0.0.4", + egg="syutil-0.0.4", ), github_link( project="matrix-org/matrix-angular-sdk", |