From cd84827a9003ad8c6064c08dbf69f31fcde6d895 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Wed, 23 Oct 2024 08:32:45 +0200 Subject: [PATCH 1/2] CI: pyproject-metadata 0.9.0 has been released, no need to test rc --- .github/workflows/tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f5a3e9a5b..42201ae96 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -105,10 +105,6 @@ jobs: - os: ubuntu-latest python: '3.12' pyproject_metadata: '==0.8.0' - # Tets with pyproject-metadata release candidate - - os: ubuntu-latest - python: '3.12' - pyproject_metadata: '==0.9.0rc1' steps: - name: Checkout From 3eb11b05f220436b683465c655a5e4e0d3e0a101 Mon Sep 17 00:00:00 2001 From: Daniele Nicolodi Date: Wed, 23 Oct 2024 08:47:23 +0200 Subject: [PATCH 2/2] MAINT: fixes to comply with pyproject-metadata 0.9.0 type annotations --- mesonpy/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonpy/__init__.py b/mesonpy/__init__.py index b0ed1eac6..476957c5b 100644 --- a/mesonpy/__init__.py +++ b/mesonpy/__init__.py @@ -240,7 +240,7 @@ def __init__(self, name: str, *args: Any, **kwargs: Any): super().__init__(name, *args, **kwargs) @classmethod - def from_pyproject( + def from_pyproject( # type: ignore[override] cls, data: Mapping[str, Any], project_dir: Path = os.path.curdir, @@ -345,7 +345,7 @@ def _libs_dir(self) -> str: @property def _license_file(self) -> Optional[pathlib.Path]: license_ = self._metadata.license - if license_: + if license_ and isinstance(license_, pyproject_metadata.License): return license_.file return None