Merge branch 'master' into develop

* master: 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out. Attempt to clarify Python version requirements (#7161) Improve the UX of the login fallback when using SSO (#7152) Update the wording of the config comment Lint Changelog Regenerate sample config Whitelist the login fallback by default for SSO
Synapse 1.12.1 (2020-04-02)
2020-04-02 16:24:38 +01:00 · 2020-04-02 16:20:54 +01:00 · 2020-04-02 11:32:16 +01:00 · 2020-03-31 11:58:48 +01:00 · 2020-03-31 11:49:43 +01:00 · 2020-03-31 11:30:34 +01:00
4 changed files with 26 additions and 4 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -6,6 +6,22 @@ Next version
  configuration then this template will need to be duplicated into that
  directory.

+Synapse 1.12.1 (2020-04-02)
+===========================
+
+No significant changes since 1.12.1rc1.
+
+
+Synapse 1.12.1rc1 (2020-03-31)
+==============================
+
+Bugfixes
+--------
+
+- Fix starting workers when federation sending not split out. ([\#7133](https://github.com/matrix-org/synapse/issues/7133)). Introduced in v1.12.0.
+- Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo. ([\#7155](https://github.com/matrix-org/synapse/issues/7155)). Introduced in v1.12.0rc1.
+- Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature. ([\#7177](https://github.com/matrix-org/synapse/issues/7177)). Introduced in v1.11.0.
+
 Synapse 1.12.0 (2020-03-23)
 ===========================

--- a/INSTALL.md
+++ b/INSTALL.md
@ -36,7 +36,7 @@ that your email address is probably `user@example.com` rather than
 System requirements:

 - POSIX-compliant system (tested on Linux & OS X)
- Python 3.5, 3.6, 3.7 or 3.8.
+- Python 3.5.2 or later, up to Python 3.8.
 - At least 1GB of free RAM if you want to join large public rooms like #matrix:matrix.org

 Synapse is written in Python but some of the libraries it uses are written in
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.12.1) stable; urgency=medium
+
+  * New synapse release 1.12.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 02 Apr 2020 11:30:47 +0000
+
 matrix-synapse-py3 (1.12.0) stable; urgency=medium

  * New synapse release 1.12.0.
--- a/synapse/init.py
+++ b/synapse/init.py
@ -36,7 +36,7 @@ try:
 except ImportError:
    pass

-__version__ = "1.12.0"
+__version__ = "1.12.1"

 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
    # We import here so that we don't have to install a bunch of deps when
Author	SHA1	Message	Date
Andrew Morgan	61bb834364	Merge branch 'master' into develop * master: 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out. Attempt to clarify Python version requirements (#7161) Improve the UX of the login fallback when using SSO (#7152) Update the wording of the config comment Lint Changelog Regenerate sample config Whitelist the login fallback by default for SSO	2020-04-02 16:24:38 +01:00
Andrew Morgan	84a901cf0c	Synapse 1.12.1 (2020-04-02) =========================== No significant changes since 1.12.1rc1. Synapse 1.12.1rc1 (2020-03-31) ============================== Bugfixes -------- - Fix starting workers when federation sending not split out. ([\#7133](https://github.com/matrix-org/synapse/issues/7133)). Introduced in v1.12.0. - Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo. ([\#7155](https://github.com/matrix-org/synapse/issues/7155)). Introduced in v1.12.0rc1. - Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature. ([\#7177](https://github.com/matrix-org/synapse/issues/7177)). Introduced in v1.11.0. -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEgQG31Z317NrSMt0QiISIDS7+X/QFAl6GAZMTHGFuZHJld0Bh bW9yZ2FuLnh5egAKCRCIhIgNLv5f9JqOD/4kjIBwKSOaUzYhzaP+4o4fDwz49IiO GzSgq6bf+C1V6Vev/7+N1is0FnbfelaJZHf7wM1044tozL+puPqaGl2A/Zjxs8Pf x9LpS53yOBsYYUvvYSUdE8MlWPimV/EERJa9eoIKloMt2vtcNpwwE+KYygqPR6Rz xvexnh5FwOj9zQAS3KDE+ZUbgrx+S+VkV6C5tlDziuOlT1VZBsGGj/SmfKX9d11z e22hgebAaEKheACAEvrHzGl5JyR8fmAuBOSWRmybucyzAQRGNm4yqoOaonD8ic0l CkbjC1ix5BdfP2vAww6wzWRDXSmU1qk8hC4/SXCaS/xH2RN5Jh9ptnw0tuWwP0dk J8joNBGR3cOrDDwjnqguqE1fckLTa/JOxNy8JzVTugO0v1KmDk7kYuO6GOapNmXI qUuqrQARTCsoAt6r5qMlyKw/yk4vjLdZ9VxRDtI4uz/P+WeWS4LTG8G9eMKjZ9Kd rOaIlO7lA6vwFMd7Twe1p6y721yfhGyp6Jcz6UDOdh+cbxZ1fSg8/SsYA9NrbqOk 4bHt7s8YNI/V2kU+LxuZjtOFENa7XvsR/rURts2GvNGDusZJMNHl8aJvOCnF+ReO M6Ayzx+91R3oRaRdmuuvwLdFStrnSfHp7XcZYOGvN8fUBocfB2c+yZR5H9MhWSnv h1Gndj+lR7uvKg== =/J/H -----END PGP SIGNATURE----- Merge tag 'v1.12.1' Synapse 1.12.1 (2020-04-02) =========================== No significant changes since 1.12.1rc1. Synapse 1.12.1rc1 (2020-03-31) ============================== Bugfixes -------- - Fix starting workers when federation sending not split out. ([\#7133](https://github.com/matrix-org/synapse/issues/7133)). Introduced in v1.12.0. - Avoid importing `sqlite3` when using the postgres backend. Contributed by David Vo. ([\#7155](https://github.com/matrix-org/synapse/issues/7155)). Introduced in v1.12.0rc1. - Fix a bug which could cause outbound federation traffic to stop working if a client uploaded an incorrect e2e device signature. ([\#7177](https://github.com/matrix-org/synapse/issues/7177)). Introduced in v1.11.0. * tag 'v1.12.1': 1.12.1 Note where bugs were introduced 1.12.1rc1 Newsfile Rewrite changelog Add changelog Only import sqlite3 when type checking Fix another instance Only setdefault for signatures if device has key_json Fix starting workers when federation sending not split out.	2020-04-02 16:20:54 +01:00
Andrew Morgan	529462b5c0	1.12.1	2020-04-02 11:32:16 +01:00
Andrew Morgan	677d0edbac	Note where bugs were introduced	2020-03-31 11:58:48 +01:00
Andrew Morgan	3fb9fc40f5	1.12.1rc1	2020-03-31 11:49:43 +01:00
Erik Johnston	5d99bde788	Newsfile	2020-03-31 11:30:34 +01:00
Andrew Morgan	2cf115f0ea	Rewrite changelog	2020-03-31 11:30:16 +01:00
Andrew Morgan	2cb38ca871	Add changelog	2020-03-31 11:30:05 +01:00
David Vo	5bd2b27525	Only import sqlite3 when type checking Fixes: #7127 Signed-off-by: David Vo <david@vovo.id.au>	2020-03-31 11:27:17 +01:00
Andrew Morgan	b5d0b038f4	Fix another instance	2020-03-31 11:26:37 +01:00
Andrew Morgan	b5ecafd157	Only setdefault for signatures if device has key_json	2020-03-31 11:26:29 +01:00
Erik Johnston	db098ec994	Fix starting workers when federation sending not split out.	2020-03-31 11:25:21 +01:00
Richard van der Hoff	e577c5d607	Attempt to clarify Python version requirements (#7161 ) In particular, we depend on `typing.TYPE_CHECKING`, which is only present in 3.5.2. It turns out that Ubuntu Xenial, despite having a package called `python 3 (3.5.1-3)`, actually has python 3.5.2, so I think this is fine.	2020-03-30 13:55:01 +01:00
Brendan Abolivier	90246344e3	Improve the UX of the login fallback when using SSO (#7152 ) * Don't show the login forms if we're currently logging in with a password or a token. * Submit directly the SSO login form, showing only a spinner to the user, in order to eliminate from the clunkiness of SSO through this fallback.	2020-03-27 15:44:13 +01:00
Brendan Abolivier	319c41f573	Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback Always whitelist the login fallback for SSO	2020-03-27 15:34:41 +01:00
Brendan Abolivier	63aea691a7	Update the wording of the config comment	2020-03-27 15:09:12 +01:00
Brendan Abolivier	bdf3cdaec8	Lint	2020-03-26 19:06:44 +01:00
Brendan Abolivier	48b37f61ce	Changelog	2020-03-26 19:02:59 +01:00
Brendan Abolivier	7083147961	Regenerate sample config	2020-03-26 19:01:54 +01:00
Brendan Abolivier	c2ab0b3066	Whitelist the login fallback by default for SSO	2020-03-26 18:58:58 +01:00