From 768b6a4bf63c19df5dd4afbda4960fe482cbc950 Mon Sep 17 00:00:00 2001
From: Daniele Nicolodi <daniele@grinta.net>
Date: Wed, 30 Apr 2025 10:37:52 +0200
Subject: [PATCH 1/2] CI: test with Meson versions 1.6.1 and 1.7.2

Meson 1.8.0 has been released. Add the older releases to the CI matrix.
---
 .github/workflows/tests.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 08bbe00a..e51eb185 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -91,6 +91,12 @@ jobs:
           - os: ubuntu-latest
             python: '3.12'
             meson: '~=1.5.0'
+          - os: ubuntu-latest
+            python: '3.12'
+            meson: '~=1.6.0'
+          - os: ubuntu-latest
+            python: '3.12'
+            meson: '~=1.7.0'
           # Test with Meson master branch.
           - os: ubuntu-latest
             python: '3.12'

From fcd16bbc7a191345f958f44842df41dca43d5925 Mon Sep 17 00:00:00 2001
From: Daniele Nicolodi <daniele@grinta.net>
Date: Wed, 30 Apr 2025 10:45:43 +0200
Subject: [PATCH 2/2] CI: test with minimum version of dependencies

---
 .github/workflows/tests.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e51eb185..9dfd8188 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,7 +54,7 @@ jobs:
           - '3.13'
         meson:
           -
-        pyproject_metadata:
+        dependencies:
           -
         include:
           - os: ubuntu-latest
@@ -70,6 +70,8 @@ jobs:
           # Test with older supported Meson version.  Meson up to
           # version 1.2.3 requires distutils, which has been removed
           # from the stdlib in Python 3.12, thus test with Pythn 3.11.
+          # To avoid having too many CI jobs, combine this with tests
+          # with the minimum version of other dependencies.
           - os: ubuntu-latest
             python: '3.11'
             meson: '~=0.64.0'
@@ -91,12 +93,15 @@ jobs:
           - os: ubuntu-latest
             python: '3.12'
             meson: '~=1.5.0'
+            dependencies: 'packaging==23.2 pyproject-metadata==0.9.0'
           - os: ubuntu-latest
             python: '3.12'
             meson: '~=1.6.0'
+            dependencies: 'pyproject-metadata==0.9.0'
           - os: ubuntu-latest
             python: '3.12'
             meson: '~=1.7.0'
+            dependencies: 'packaging==23.2'
           # Test with Meson master branch.
           - os: ubuntu-latest
             python: '3.12'
@@ -130,9 +135,9 @@ jobs:
         run: python -m pip install "meson ${{ matrix.meson }}"
         if: ${{ matrix.meson }}
 
-      - name: Install pyproject-metadata
-        run: python -m pip install "pyproject-metadata ${{ matrix.pyproject_metadata }}"
-        if: ${{ matrix.pyproject_metadata }}
+      - name: Install dependencies
+        run: python -m pip install ${{ matrix.dependencies }}
+        if: ${{ matrix.dependencies }}
 
       - name: Install
         run: python -m pip install .[test]