Support 'metadata_version' == '2.4' (PEP 639).

tseaver · tseaver · commit 4cedaf9ca6b6 · 2024-12-02T12:21:59.000-05:00
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,11 @@
 ``pkginfo`` Changelog
 =====================
 
+1.12.0 (unreleased)
+-------------------
+
+- Support 'metadata_version' == '2.4' (PEP 639).
+
 1.11.3 (2024-12-02)
 -------------------
 
diff --git a/pkginfo/distribution.py b/pkginfo/distribution.py
@@ -78,6 +78,11 @@ def _collapse_leading_ws(header, txt):
 
 HEADER_ATTRS_2_3 = HEADER_ATTRS_2_2  # PEP 685
 
+HEADER_ATTRS_2_4 = HEADER_ATTRS_2_3 + ( # PEP 639
+    ('License-Expression', 'license_expression', False),
+    ('License-File', 'license_file', True),
+)
+
 HEADER_ATTRS = {
     '1.0': HEADER_ATTRS_1_0,
     '1.1': HEADER_ATTRS_1_1,
@@ -86,6 +91,7 @@ def _collapse_leading_ws(header, txt):
     '2.1': HEADER_ATTRS_2_1,
     '2.2': HEADER_ATTRS_2_2,
     '2.3': HEADER_ATTRS_2_3,
+    '2.4': HEADER_ATTRS_2_4,
 }
 
 def _version_tuple(metadata_version):
@@ -154,6 +160,9 @@ class Distribution(object):
     description_content_type = None
     # version 2.2
     dynamic = ()
+    # version 2.4
+    license_expression = None
+    license_file = ()
 
     def extractMetadata(self):
         data = self.read()
diff --git a/pkginfo/distribution.pyi b/pkginfo/distribution.pyi
@@ -22,6 +22,7 @@ HEADER_ATTRS_2_0 = HEADER_ATTRS_1_2
 HEADER_ATTRS_2_1: _header_attrs
 HEADER_ATTRS_2_2: _header_attrs
 HEADER_ATTRS_2_3: _header_attrs
+HEADER_ATTRS_2_4: _header_attrs
 HEADER_ATTRS: Dict[str, _header_attrs]
 _metadata_version = Tuple[int, int]
 METADATA_VERSIONS: Sequence[_metadata_version]
@@ -65,6 +66,8 @@ class Distribution:
     provides_extras: Sequence[str]
     description_content_type: str | None
     dynamic: Sequence[str]
+    license_expression: str | None
+    license_file: Sequence[str]
     def extractMetadata(self) -> None: ...
     def read(self) -> bytes: ...
     def parse(self, data: bytes) -> None: ...
diff --git a/pkginfo/tests/test_distribution.py b/pkginfo/tests/test_distribution.py
@@ -640,5 +640,22 @@ def test_distribution_parse_Dynamic_single():
 def test_distribution_parse_Dynamic_multiple():
     dist = _make_distribution('2.2')
     dist.parse('Dynamic: Platforms\n'
-                'Dynamic: Supported-Platforms')
+               'Dynamic: Supported-Platforms')
     assert list(dist.dynamic) == ['Platforms', 'Supported-Platforms']
+
+# Metadata version 2.4, defined in PEP 639.
+def test_distribution_parse_License_Expression_single():
+    dist = _make_distribution('2.4')
+    dist.parse('License-Expression: MIT')
+    assert dist.license_expression == 'MIT'
+
+def test_distribution_parse_License_File_single():
+    dist = _make_distribution('2.4')
+    dist.parse('License-File: LICENSE.txt')
+    assert list(dist.license_file) == ['LICENSE.txt']
+
+def test_distribution_parse_License_File_multiple():
+    dist = _make_distribution('2.4')
+    dist.parse('License-File: LICENSE.txt\n'
+               'License-File: docs/LICENSE.rst')
+    assert list(dist.license_file) == ['LICENSE.txt', 'docs/LICENSE.rst']
