Merge branch 'develop' into uia-fallback

To get the flattened synapse.rest.client package of matrix-org#10600
govynnus · Aug 17, 2021 · 200d4c6 · 200d4c6
2 parents 70e653e + 1a9f531
commit 200d4c6
Show file tree

Hide file tree

Showing 181 changed files with 5,078 additions and 3,295 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,8 +13,9 @@ This document aims to get you started with contributing to this repo!
 - [7. Turn coffee and documentation into code and documentation!](#7-turn-coffee-and-documentation-into-code-and-documentation)
 - [8. Test, test, test!](#8-test-test-test)
   * [Run the linters.](#run-the-linters)
-  * [Run the unit tests.](#run-the-unit-tests)
-  * [Run the integration tests.](#run-the-integration-tests)
+  * [Run the unit tests.](#run-the-unit-tests-twisted-trial)
+  * [Run the integration tests (SyTest).](#run-the-integration-tests-sytest)
+  * [Run the integration tests (Complement).](#run-the-integration-tests-complement)
 - [9. Submit your patch.](#9-submit-your-patch)
   * [Changelog](#changelog)
     + [How do I know what to call the changelog file before I create the PR?](#how-do-i-know-what-to-call-the-changelog-file-before-i-create-the-pr)
@@ -197,7 +198,7 @@ The following command will let you run the integration test with the most common
 configuration:
 
 ```sh
-$ docker run --rm -it -v /path/where/you/have/cloned/the/repository\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:py37
+$ docker run --rm -it -v /path/where/you/have/cloned/the/repository\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:buster
 ```
 
 This configuration should generally cover  your needs. For more details about other configurations, see [documentation in the SyTest repo](https://github.com/matrix-org/sytest/blob/develop/docker/README.md).

diff --git a/changelog.d/10394.feature b/changelog.d/10394.feature
@@ -0,0 +1 @@
+Initial local support for [MSC3266](https://github.com/matrix-org/synapse/pull/10394), Room Summary over the unstable `/rooms/{roomIdOrAlias}/summary` API.
diff --git a/changelog.d/10524.feature b/changelog.d/10524.feature
@@ -0,0 +1 @@
+Port the PresenceRouter module interface to the new generic interface.
diff --git a/changelog.d/10569.feature b/changelog.d/10569.feature
@@ -0,0 +1 @@
+Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946).
diff --git a/changelog.d/10570.feature b/changelog.d/10570.feature
@@ -0,0 +1 @@
+Update the Synapse Grafana dashboard.
diff --git a/changelog.d/10576.misc b/changelog.d/10576.misc
@@ -0,0 +1 @@
+Move `/batch_send` endpoint defined by [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) to the `/v2_alpha` directory.
diff --git a/changelog.d/10578.feature b/changelog.d/10578.feature
@@ -0,0 +1 @@
+Add an admin API (`GET /_synapse/admin/username_available`) to check if a username is available (regardless of registration settings).
diff --git a/changelog.d/10587.misc b/changelog.d/10587.misc
@@ -0,0 +1 @@
+Allow multiple custom directories in `read_templates`.
diff --git a/changelog.d/10590.misc b/changelog.d/10590.misc
@@ -0,0 +1 @@
+Re-organize the `synapse.federation.transport.server` module to create smaller files.
diff --git a/changelog.d/10591.misc b/changelog.d/10591.misc
@@ -0,0 +1 @@
+Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10598.feature b/changelog.d/10598.feature
@@ -0,0 +1 @@
+Allow editing a user's `external_ids` via the "Edit User" admin API. Contributed by @dklimpel.
diff --git a/changelog.d/10599.doc b/changelog.d/10599.doc
@@ -0,0 +1 @@
+Update CONTRIBUTING.md to fix index links and the instructions for SyTest in docker.
diff --git a/changelog.d/10600.misc b/changelog.d/10600.misc
@@ -0,0 +1 @@
+Flatten the `synapse.rest.client` package by moving the contents of `v1` and `v2_alpha` into the parent.
diff --git a/changelog.d/10602.feature b/changelog.d/10602.feature
@@ -0,0 +1 @@
+The Synapse manhole no longer needs coroutines to be wrapped in `defer.ensureDeferred`.
diff --git a/changelog.d/10606.bugfix b/changelog.d/10606.bugfix
@@ -0,0 +1 @@
+Fix errors on /sync when read receipt data is a string. Only affects homeservers with the experimental flag for [MSC2285](https://github.com/matrix-org/matrix-doc/pull/2285) enabled. Contributed by @SimonBrandner.
diff --git a/changelog.d/10611.bugfix b/changelog.d/10611.bugfix
@@ -0,0 +1 @@
+Additional validation for the spaces summary API to avoid errors like `ValueError: Stop argument for islice() must be None or an integer`. The missing validation has existed since v1.31.0.
diff --git a/changelog.d/10614.misc b/changelog.d/10614.misc
@@ -0,0 +1 @@
+Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10620.misc b/changelog.d/10620.misc
@@ -0,0 +1 @@
+Fix up a couple of links to the database schema documentation.
diff --git a/changelog.d/10623.bugfix b/changelog.d/10623.bugfix
@@ -0,0 +1 @@
+Revert behaviour introduced in v1.38.0 that strips `org.matrix.msc2732.device_unused_fallback_key_types` from `/sync` when its value is empty. This field should instead always be present according to [MSC2732](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2732-olm-fallback-keys.md).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Initial local support for [MSC3266](https://github.com/matrix-org/synapse/pull/10394), Room Summary over the unstable `/rooms/{roomIdOrAlias}/summary` API.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Port the PresenceRouter module interface to the new generic interface.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add pagination to the spaces summary based on updates to [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Move `/batch_send` endpoint defined by [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) to the `/v2_alpha` directory.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add an admin API (`GET /_synapse/admin/username_available`) to check if a username is available (regardless of registration settings).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Allow multiple custom directories in `read_templates`.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Re-organize the `synapse.federation.transport.server` module to create smaller files.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Clean up some of the federation event authentication code for clarity.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Allow editing a user's `external_ids` via the "Edit User" admin API. Contributed by @dklimpel.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Update CONTRIBUTING.md to fix index links and the instructions for SyTest in docker.