From 119596ab8fc42d76950ca1e6db632d4e557d29af Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 12 Apr 2018 17:28:24 +0100
Subject: [PATCH 1/3] Update canonicaljson dependency
1.1.0 and 1.1.1 were broken, so we're updating this to help people make sure
they don't end up on a broken version.
Also, 1.1.0 is speedier...
---
synapse/python_dependencies.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index 40eedb63cb..ab2545db91 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -22,7 +22,7 @@ REQUIREMENTS = {
"jsonschema>=2.5.1": ["jsonschema>=2.5.1"],
"frozendict>=0.4": ["frozendict"],
"unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
- "canonicaljson>=1.0.0": ["canonicaljson>=1.0.0"],
+ "canonicaljson>=1.1.2": ["canonicaljson>=1.1.2"],
"signedjson>=1.0.0": ["signedjson>=1.0.0"],
"pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
"service_identity>=1.0.0": ["service_identity>=1.0.0"],
From fac3f9e678452020e0e6b2c182913d4be965ab9b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 13 Apr 2018 10:21:38 +0100
Subject: [PATCH 2/3] Bump canonicaljson to 1.1.3
1.1.2 was a bit broken too :/
---
synapse/python_dependencies.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index ab2545db91..5cabf7dabe 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -22,7 +22,7 @@ REQUIREMENTS = {
"jsonschema>=2.5.1": ["jsonschema>=2.5.1"],
"frozendict>=0.4": ["frozendict"],
"unpaddedbase64>=1.1.0": ["unpaddedbase64>=1.1.0"],
- "canonicaljson>=1.1.2": ["canonicaljson>=1.1.2"],
+ "canonicaljson>=1.1.3": ["canonicaljson>=1.1.3"],
"signedjson>=1.0.0": ["signedjson>=1.0.0"],
"pynacl>=1.2.1": ["nacl>=1.2.1", "nacl.bindings"],
"service_identity>=1.0.0": ["service_identity>=1.0.0"],
From 51d628d28dda540d71ac147f3a11b6a559f7bf8d Mon Sep 17 00:00:00 2001
From: Neil Johnson <neil@fragile.org.uk>
Date: Fri, 13 Apr 2018 12:08:19 +0100
Subject: [PATCH 3/3] Bump version and Change log
---
CHANGES.rst | 8 ++++++++
synapse/__init__.py | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index a838c092fe..19b7af606b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.27.4 (2018-04-13)
+======================================
+
+Changes:
+
+* Update canonicaljson dependency (#3095)
+
+
Changes in synapse v0.27.3 (2018-04-11)
======================================
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1fa2de5268..0c1c16b9a4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
-__version__ = "0.27.3"
+__version__ = "0.27.4"