diff --git a/CHANGES.md b/CHANGES.md
index 47fc31a5cb..13c53d2606 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,20 @@
-# Synapse 1.91.2 (2023-09-06)
+# Synapse 1.92.1 (2023-09-12)
+
+Stop building Ubuntu Kinetic since it is EOL and repos seem to be dead.
+
+
+# Synapse 1.92.0 (2023-09-12)
### Bugfixes
- Revert [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) introspection cache, admin impersonation and account lock. ([\#16258](https://github.com/matrix-org/synapse/issues/16258))
+### Internal Changes
+
+- Fix incorrect docstring for `Ratelimiter`. ([\#16255](https://github.com/matrix-org/synapse/issues/16255))
+- Update the release script to work on macOS. ([\#16266](https://github.com/matrix-org/synapse/issues/16266))
+
+
# Synapse 1.92.0rc1 (2023-09-05)
### Features
@@ -59,6 +70,13 @@
* Bump types-psycopg2 from 2.9.21.10 to 2.9.21.11. ([\#16200](https://github.com/matrix-org/synapse/issues/16200))
* Bump types-pyyaml from 6.0.12.10 to 6.0.12.11. ([\#16199](https://github.com/matrix-org/synapse/issues/16199))
+# Synapse 1.91.2 (2023-09-06)
+
+### Bugfixes
+
+- Revert [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) introspection cache, admin impersonation and account lock. ([\#16258](https://github.com/matrix-org/synapse/issues/16258))
+
+
# Synapse 1.91.1 (2023-09-04)
### Bugfixes
diff --git a/changelog.d/16255.misc b/changelog.d/16255.misc
deleted file mode 100644
index 94d6aff1d6..0000000000
--- a/changelog.d/16255.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect docstring for `Ratelimiter`.
diff --git a/changelog.d/16258.bugfix b/changelog.d/16258.bugfix
deleted file mode 100644
index d5ae2399e6..0000000000
--- a/changelog.d/16258.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Revert [MSC3861](https://github.com/matrix-org/matrix-spec-proposals/pull/3861) introspection cache, admin impersonation and account lock.
diff --git a/debian/changelog b/debian/changelog
index 81baa6e405..9553967098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+matrix-synapse-py3 (1.92.1) stable; urgency=medium
+
+ * New Synapse release 1.92.1.
+
+ -- Synapse Packaging team <packages@matrix.org> Tue, 12 Sep 2023 13:19:42 +0200
+
+matrix-synapse-py3 (1.92.0) stable; urgency=medium
+
+ * New Synapse release 1.92.0.
+
+ -- Synapse Packaging team <packages@matrix.org> Tue, 12 Sep 2023 11:59:23 +0200
+
matrix-synapse-py3 (1.91.2) stable; urgency=medium
* New synapse release 1.91.2.
diff --git a/pyproject.toml b/pyproject.toml
index 8747782b29..3e06abd0ca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -95,7 +95,7 @@ manifest-path = "rust/Cargo.toml"
[tool.poetry]
name = "matrix-synapse"
-version = "1.92.0rc1"
+version = "1.92.1"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "Apache-2.0"
diff --git a/scripts-dev/build_debian_packages.py b/scripts-dev/build_debian_packages.py
index c03e3418c0..b192faba14 100755
--- a/scripts-dev/build_debian_packages.py
+++ b/scripts-dev/build_debian_packages.py
@@ -32,7 +32,6 @@ DISTS = (
"debian:sid", # (EOL not specified yet) (our EOL forced by Python 3.11 is 2027-10-24)
"ubuntu:focal", # 20.04 LTS (EOL 2025-04) (our EOL forced by Python 3.8 is 2024-10-14)
"ubuntu:jammy", # 22.04 LTS (EOL 2027-04) (our EOL forced by Python 3.10 is 2026-10-04)
- "ubuntu:kinetic", # 22.10 (EOL 2023-07-20) (our EOL forced by Python 3.10 is 2026-10-04)
"ubuntu:lunar", # 23.04 (EOL 2024-01) (our EOL forced by Python 3.11 is 2027-10-24)
"debian:trixie", # (EOL not specified yet)
)
diff --git a/scripts-dev/release.py b/scripts-dev/release.py
index 4ac8eaa889..74f41a40ec 100755
--- a/scripts-dev/release.py
+++ b/scripts-dev/release.py
@@ -244,11 +244,17 @@ def _prepare() -> None:
else:
debian_version = new_version
- run_until_successful(
- f'dch -M -v {debian_version} "New Synapse release {new_version}."',
- shell=True,
- )
- run_until_successful('dch -M -r -D stable ""', shell=True)
+ if sys.platform == "darwin":
+ run_until_successful(
+ f"docker run --rm -v .:/synapse ubuntu:latest /synapse/scripts-dev/docker_update_debian_changelog.sh {new_version}",
+ shell=True,
+ )
+ else:
+ run_until_successful(
+ f'dch -M -v {debian_version} "New Synapse release {new_version}."',
+ shell=True,
+ )
+ run_until_successful('dch -M -r -D stable ""', shell=True)
# Show the user the changes and ask if they want to edit the change log.
synapse_repo.git.add("-u")
@@ -566,19 +572,27 @@ def _notify(message: str) -> None:
# for this.
click.echo(f"\a{message}")
+ app_name = "Synapse Release Script"
+
# Try and run notify-send, but don't raise an Exception if this fails
# (This is best-effort)
- # TODO Support other platforms?
- subprocess.run(
- [
- "notify-send",
- "--app-name",
- "Synapse Release Script",
- "--expire-time",
- "3600000",
- message,
- ]
- )
+ if sys.platform == "darwin":
+ # See https://developer.apple.com/library/archive/documentation/AppleScript/Conceptual/AppleScriptLangGuide/reference/ASLR_cmds.html#//apple_ref/doc/uid/TP40000983-CH216-SW224
+ subprocess.run(
+ f"""osascript -e 'display notification "{message}" with title "{app_name}"'""",
+ shell=True,
+ )
+ else:
+ subprocess.run(
+ [
+ "notify-send",
+ "--app-name",
+ app_name,
+ "--expire-time",
+ "3600000",
+ message,
+ ]
+ )
@cli.command()
|
