Release 1.96.1.0 for synapse 1.96.1

julianhille · Nov 19, 2023 · a636920 · a636920
1 parent 5cb3bde
commit a636920
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### [1.96.1.0] - 2023-11-19
+
+### Updated
+
+- Synapse to 1.96.1 (there is not matrix-synapse 1.96.0 release)
+
 ### [1.95.1.0] - 2023-11-19
 
 ### Updated
@@ -251,7 +257,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Location of github action workflow file `build.yml`
 - Fix robustness for matrix-synapse name and packages changes and rebuilding in the same path (updater script)
 
-[unreleased]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.95.1.0...HEAD
+[unreleased]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.96.1.0...HEAD
+[1.96.1.0]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.95.1.0...v1.96.1.0
 [1.95.1.0]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.95.0.0...v1.95.1.0
 [1.95.0.0]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.94.0.0...v1.95.0.0
 [1.94.0.0]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.93.0.0...v1.94.0.0

diff --git a/matrix_synapse_testutils/server.py b/matrix_synapse_testutils/server.py
@@ -43,9 +43,11 @@
 from unittest.mock import Mock
 
 import attr
+from incremental import Version
 from typing_extensions import ParamSpec
 from zope.interface import implementer
 
+import twisted
 from twisted.internet import address, tcp, threads, udp
 from twisted.internet._resolver import SimpleResolverComplexifier
 from twisted.internet.defer import Deferred, fail, maybeDeferred, succeed
@@ -474,6 +476,16 @@ def getHostByName(
                     return fail(DNSLookupError("OH NO: unknown %s" % (name,)))
                 return succeed(lookups[name])
 
+        # In order for the TLS protocol tests to work, modify _get_default_clock
+        # on newer Twisted versions to use the test reactor's clock.
+        #
+        # This is *super* dirty since it is never undone and relies on the next
+        # test to overwrite it.
+        if twisted.version > Version("Twisted", 23, 8, 0):
+            from twisted.protocols import tls
+
+            tls._get_default_clock = lambda: self  # type: ignore[attr-defined]
+
         self.nameResolver = SimpleResolverComplexifier(FakeResolver())
         super().__init__()
 

diff --git a/matrix_synapse_testutils/unittest.py b/matrix_synapse_testutils/unittest.py
@@ -30,6 +30,7 @@
     Generic,
     Iterable,
     List,
+    Mapping,
     NoReturn,
     Optional,
     Tuple,
@@ -251,7 +252,7 @@ def assertObjectHasAttributes(self, attrs: Dict[str, object], obj: object) -> No
             except AssertionError as e:
                 raise (type(e))(f"Assert error for '.{key}':") from e
 
-    def assert_dict(self, required: dict, actual: dict) -> None:
+    def assert_dict(self, required: Mapping, actual: Mapping) -> None:
         """Does a partial assert of a dict.
 
         Args:

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@ classifiers = [
     "Topic :: Software Development"
 ]
 dependencies = [
-    "matrix-synapse[test]==1.95.1"
+    "matrix-synapse[test]==1.96.1"
 ]
 
 [project.urls]