From 123f2c7d7817d2203afaa3b7e3aad134a10c916a Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 11 Jul 2023 12:48:52 +0100 Subject: [PATCH 1/3] Don't build wheels for CPython or PyPy 3.7 --- pyproject.toml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b61b8b17acf9..84e079ba9821 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -373,7 +373,14 @@ build-backend = "poetry.core.masonry.api" [tool.cibuildwheel] # Skip unsupported platforms (by us or by Rust). -skip = "cp36* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64" +# See https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip for the list of build targets. +# We skip: +# - CPython 3.6 and 3.7: EOLed +# - PyPy 3.7: we only support Python 3.8+ +# - musllinux i686: TODO why? +# - PyPy on Aarch64: TODO why? +# - musllinux on aarch64: TODO why? +skip = "cp36* cp37* pp37* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64" # We need a rust compiler before-all = "curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y --profile minimal" From 317da72e29a4b98514153089dd77a1d181cfdb62 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 11 Jul 2023 14:48:06 +0100 Subject: [PATCH 2/3] Update pyproject.toml comments --- pyproject.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 84e079ba9821..d56602b2df14 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -377,9 +377,10 @@ build-backend = "poetry.core.masonry.api" # We skip: # - CPython 3.6 and 3.7: EOLed # - PyPy 3.7: we only support Python 3.8+ -# - musllinux i686: TODO why? -# - PyPy on Aarch64: TODO why? -# - musllinux on aarch64: TODO why? +# - musllinux i686: excluded to reduce number of wheels we build. +# c.f. https://github.com/matrix-org/synapse/pull/12595#discussion_r963107677 +# - PyPy on Aarch64 and musllinux on aarch64: too slow to build. +# c.f. https://github.com/matrix-org/synapse/pull/14259 skip = "cp36* cp37* pp37* *-musllinux_i686 pp*aarch64 *-musllinux_aarch64" # We need a rust compiler From f303c93551707dbc127f84486cf163efa03d9e30 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 11 Jul 2023 15:00:22 +0100 Subject: [PATCH 3/3] Manually update the changelog --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d71d4124fa46..22d56a9a01ac 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,7 +24,7 @@ See [the upgrade notes](https://github.com/matrix-org/synapse/blob/release-v1.88 ### Deprecations and Removals - **Remove deprecated `worker_replication_host`, `worker_replication_http_port` and `worker_replication_http_tls` configuration options.** See the [upgrade notes](https://github.com/matrix-org/synapse/blob/release-v1.88/docs/upgrade.md#removal-of-worker_replication_-settings) for more details. ([\#15860](https://github.com/matrix-org/synapse/issues/15860)) -- Remove support for Python 3.7 and hence for Debian Buster. ([\#15851](https://github.com/matrix-org/synapse/issues/15851), [\#15892](https://github.com/matrix-org/synapse/issues/15892), [\#15893](https://github.com/matrix-org/synapse/issues/15893)) +- Remove support for Python 3.7 and hence for Debian Buster. ([\#15851](https://github.com/matrix-org/synapse/issues/15851), [\#15892](https://github.com/matrix-org/synapse/issues/15892), [\#15893](https://github.com/matrix-org/synapse/issues/15893), [\#15917](https://github.com/matrix-org/synapse/pull/15917)) ### Internal Changes