TST: adjust for changes in pyproject-metadata 0.9.0

Author: dnicolodi

pyproject.toml

@@ -47,6 +47,7 @@ dynamic = [
 [project.optional-dependencies]
 test = [
   'build',
+  'packaging >= 23.1',
   'pytest >= 6.0',
   'pytest-cov[toml]',
   'pytest-mock',

tests/conftest.py

@@ -16,6 +16,7 @@
 
 from venv import EnvBuilder
 
+import packaging.metadata
 import packaging.version
 import pytest
 
@@ -24,6 +25,12 @@
 from mesonpy._util import chdir
 
 
+def metadata(data):
+    meta, other = packaging.metadata.parse_email(data)
+    assert not other
+    return meta
+
+
 def adjust_packaging_platform_tag(platform: str) -> str:
     if platform.startswith(('manylinux', 'musllinux')):
         # The packaging module generates overly specific platforms tags on

tests/test_metadata.py

@@ -48,5 +48,11 @@ def test_missing_version(package_missing_version):
     pyproject = {'project': {
         'name': 'missing-version',
     }}
-    with pytest.raises(pyproject_metadata.ConfigurationError, match='Field "project.version" missing'):
+    match = '|'.join((
+        # pyproject-metatadata 0.8.0 and later
+        re.escape('Field "project.version" missing and "version" not specified in "project.dynamic"'),
+        # pyproject-metatadata 0.9.0 and later
+        re.escape('Field "project.version" missing and \'version\' not specified in "project.dynamic"'),
+    ))
+    with pytest.raises(pyproject_metadata.ConfigurationError, match=match):
         Metadata.from_pyproject(pyproject, pathlib.Path())

tests/test_sdist.py

@@ -10,29 +10,36 @@
 import textwrap
 import time
 
+from itertools import chain
+
 import pytest
 
 import mesonpy
 
-from .conftest import in_git_repo_context
+from .conftest import in_git_repo_context, metadata
 
 
 def test_no_pep621(sdist_library):
     with tarfile.open(sdist_library, 'r:gz') as sdist:
-        sdist_pkg_info = sdist.extractfile('library-1.0.0/PKG-INFO').read().decode()
+        sdist_pkg_info = sdist.extractfile('library-1.0.0/PKG-INFO').read()
 
-    assert sdist_pkg_info == textwrap.dedent('''\
+    assert metadata(sdist_pkg_info) == metadata(textwrap.dedent('''\
         Metadata-Version: 2.1
         Name: library
         Version: 1.0.0
-    ''')
+    '''))
 
 
 def test_pep621(sdist_full_metadata):
     with tarfile.open(sdist_full_metadata, 'r:gz') as sdist:
-        sdist_pkg_info = sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read().decode()
+        sdist_pkg_info = sdist.extractfile('full_metadata-1.2.3/PKG-INFO').read()
+
+    meta = metadata(sdist_pkg_info)
 
-    metadata = textwrap.dedent('''\
+    # pyproject-metadata prior to 0.9.0 strips trailing newlines
+    meta['license'] = meta['license'].rstrip()
+
+    assert meta == metadata(textwrap.dedent('''\
         Metadata-Version: 2.1
         Name: full-metadata
         Version: 1.2.3
@@ -67,20 +74,18 @@ def test_pep621(sdist_full_metadata):
         # full-metadata
 
         An example package with all of the PEP 621 metadata!
-    ''')
-
-    assert sdist_pkg_info == metadata
+    '''))
 
 
 def test_dynamic_version(sdist_dynamic_version):
     with tarfile.open(sdist_dynamic_version, 'r:gz') as sdist:
-        sdist_pkg_info = sdist.extractfile('dynamic_version-1.0.0/PKG-INFO').read().decode()
+        sdist_pkg_info = sdist.extractfile('dynamic_version-1.0.0/PKG-INFO').read()
 
-    assert sdist_pkg_info == textwrap.dedent('''\
+    assert metadata(sdist_pkg_info) == metadata(textwrap.dedent('''\
         Metadata-Version: 2.1
         Name: dynamic-version
         Version: 1.0.0
-    ''')
+    '''))
 
 
 def test_contents(sdist_library):