From 8825955956550852d03f5957fb6a9b4c86f50790 Mon Sep 17 00:00:00 2001 From: "riseproject-dev[bot]" <330740410+riseproject-dev[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2026 08:35:01 +0000 Subject: [PATCH 1/2] shapely: Add version 2.2.0 Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> --- docs/packages/shapely.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/packages/shapely.yaml b/docs/packages/shapely.yaml index 5afaf567a446..da42bf645b1e 100644 --- a/docs/packages/shapely.yaml +++ b/docs/packages/shapely.yaml @@ -17,3 +17,4 @@ versions: - filename: shapely-2.1.2-cp314-cp314t-manylinux_2_39_riscv64.whl sha256: 3a04ef36a912c3b9fa4a6adec07adbd6e3b835f7e9651f893f1b014db4140eed requires-python: '>=3.10' +- version: 2.2.0 From 5520846f88c13eb2b5a52e35241341b0ead1d3c6 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sat, 10 Oct 2026 20:51:16 +0000 Subject: [PATCH 2/2] shapely: fix build backend for 2.2.0's meson-python switch 2.2.0 moved shapely's build backend from setuptools to meson-python (mesonpy), but CIBW_BEFORE_BUILD still only preinstalled cython/numpy/ setuptools/wheel for --no-build-isolation. pip then fails metadata generation with BackendUnavailable: Cannot import 'mesonpy' on every interpreter, since the GEOS/Docker side of the build is unaffected. Install meson/meson-python/ninja instead of setuptools/wheel, matching the pattern already used for other meson-python projects in this repo (build-beancount.yml, build-matscipy.yml). --- .github/workflows/build-shapely.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-shapely.yml b/.github/workflows/build-shapely.yml index ea56a1237d95..be9773064ce6 100644 --- a/.github/workflows/build-shapely.yml +++ b/.github/workflows/build-shapely.yml @@ -104,7 +104,11 @@ jobs: env: CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.BASEIMAGE }}_geos:${{ env.GEOS_VERSION }} CIBW_BUILD_FRONTEND: "pip; args: --no-build-isolation" - CIBW_BEFORE_BUILD: pip install cython numpy setuptools wheel + # 2.2.0 switched the build backend from setuptools to meson-python (mesonpy); + # preinstalling the old setuptools/wheel pair leaves mesonpy missing and the + # build fails with "BackendUnavailable: Cannot import 'mesonpy'" (see + # build-beancount.yml/build-matscipy.yml for the same meson-python pattern). + CIBW_BEFORE_BUILD: pip install cython numpy meson meson-python ninja CIBW_ENVIRONMENT: PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ - name: Check the wheel ships the GEOS licence and the compiled extensions