diff --git a/CHANGELOG.md b/CHANGELOG.md index 817c546..67cc4f5 100644 --- 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.95.0.0] - 2023-11-19 + +### Updated + +- Synapse to 1.95.0 + ### [1.94.0.0] - 2023-11-19 ### Updated @@ -239,7 +245,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.94.0.0...HEAD +[unreleased]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.95.0.0...HEAD +[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 [1.93.0.0]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.92.2.0...v1.93.0.0 [1.92.2.0]: https://github.com/conhealth/LifeTime-Desktop/compare/v1.92.1.0...v1.92.2.0 diff --git a/matrix_synapse_testutils/rest/client/utils.py b/matrix_synapse_testutils/rest/client/utils.py index 266d43e..1e5254c 100644 --- a/matrix_synapse_testutils/rest/client/utils.py +++ b/matrix_synapse_testutils/rest/client/utils.py @@ -37,7 +37,6 @@ from typing_extensions import Literal from twisted.test.proto_helpers import MemoryReactorClock -from twisted.web.resource import Resource from twisted.web.server import Site from synapse.api.constants import Membership @@ -45,7 +44,7 @@ from synapse.server import HomeServer from synapse.types import JsonDict -from matrix_synapse_testutils.server import FakeChannel, FakeSite, make_request +from matrix_synapse_testutils.server import FakeChannel, make_request from matrix_synapse_testutils.test_utils.html_parsers import TestHtmlParser from matrix_synapse_testutils.test_utils.oidc import FakeAuthorizationGrant, FakeOidcServer @@ -558,7 +557,6 @@ def send_state( def upload_media( self, - resource: Resource, image_data: bytes, tok: str, filename: str = "test.png", @@ -576,7 +574,7 @@ def upload_media( path = "/_matrix/media/r0/upload?filename=%s" % (filename,) channel = make_request( self.reactor, - FakeSite(resource, self.reactor), + self.site, "POST", path, content=image_data, diff --git a/matrix_synapse_testutils/unittest.py b/matrix_synapse_testutils/unittest.py index 22a0710..6d66ff8 100644 --- a/matrix_synapse_testutils/unittest.py +++ b/matrix_synapse_testutils/unittest.py @@ -60,7 +60,7 @@ from synapse.config.server import DEFAULT_ROOM_VERSION from synapse.crypto.event_signing import add_hashes_and_signatures from synapse.federation.transport.server import TransportLayerServer -from synapse.http.server import JsonResource +from synapse.http.server import JsonResource, OptionsResource from synapse.http.site import SynapseRequest, SynapseSite from synapse.logging.context import ( SENTINEL_CONTEXT, @@ -459,7 +459,7 @@ def create_test_resource(self) -> Resource: The default calls `self.create_resource_dict` and builds the resultant dict into a tree. """ - root_resource = Resource() + root_resource = OptionsResource() create_resource_tree(self.create_resource_dict(), root_resource) return root_resource diff --git a/pyproject.toml b/pyproject.toml index 566da72..fa51205 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ classifiers = [ "Topic :: Software Development" ] dependencies = [ - "matrix-synapse[test]==1.94.0" + "matrix-synapse[test]==1.95.0" ] [project.urls]