From 77d86d8b041b02a34ae31c1ac102721b4c3c1c36 Mon Sep 17 00:00:00 2001 From: Dr Alex Meakins Date: Fri, 22 Aug 2025 14:55:59 +0100 Subject: [PATCH 1/4] Update ci.yml Pin meson version, attempting to identify if the new meson release is the cause. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9734d021..6e4bc92b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install Python dependencies - run: python -m pip install --prefer-binary meson-python meson ninja setuptools setuptools-scm "cython>=3.1" "matplotlib>=3,<4" ${{ matrix.numpy-version }} + run: python -m pip install --prefer-binary meson-python "meson==1.8.3" ninja setuptools setuptools-scm "cython>=3.1" "matplotlib>=3,<4" ${{ matrix.numpy-version }} - name: Build and install Raysect run: dev/install_editable.sh - name: Run tests From 29067e5d12fca0b2659804c08785865daf6669b8 Mon Sep 17 00:00:00 2001 From: Dr Alex Meakins Date: Fri, 22 Aug 2025 15:41:51 +0100 Subject: [PATCH 2/4] Update ci.yml Revert pinned meson version. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e4bc92b..9734d021 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install Python dependencies - run: python -m pip install --prefer-binary meson-python "meson==1.8.3" ninja setuptools setuptools-scm "cython>=3.1" "matplotlib>=3,<4" ${{ matrix.numpy-version }} + run: python -m pip install --prefer-binary meson-python meson ninja setuptools setuptools-scm "cython>=3.1" "matplotlib>=3,<4" ${{ matrix.numpy-version }} - name: Build and install Raysect run: dev/install_editable.sh - name: Run tests From 1f032f0f549872e100ffb7f40e61ef91998750cc Mon Sep 17 00:00:00 2001 From: Dr Alex Meakins Date: Fri, 22 Aug 2025 15:42:32 +0100 Subject: [PATCH 3/4] Update meson.build Fixed typo that is now caught by meson since 1.8.4. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 62bcf36f..0a8c31e8 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ # The template file used to generate this file is dev/root-meson.build. project('raysect', 'cython', - default_options: ['python.install-env=auto'], + default_options: ['python.install_env=auto'], version: run_command(['dev/build/update_version.sh'], check: true).stdout().strip() ) From a660c7c8bb42b6ef2d5aa0948f3b14be9ffc6048 Mon Sep 17 00:00:00 2001 From: Dr Alex Meakins Date: Fri, 22 Aug 2025 15:43:28 +0100 Subject: [PATCH 4/4] Update root-meson.build Fixed typo caught by improved option handling in meson 1.8.4. --- dev/root-meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/root-meson.build b/dev/root-meson.build index a3034a21..6f38254f 100644 --- a/dev/root-meson.build +++ b/dev/root-meson.build @@ -1,5 +1,5 @@ project('raysect', 'cython', - default_options: ['python.install-env=auto'], + default_options: ['python.install_env=auto'], version: run_command(['dev/build/update_version.sh'], check: true).stdout().strip() )