Add support for license_files specified in setup.py

src/wheel/bdist_wheel.py

@@ -15,7 +15,6 @@
 import warnings
 from collections import OrderedDict
 from email.generator import BytesGenerator, Generator
-from glob import iglob
 from io import BytesIO
 from shutil import rmtree
 from sysconfig import get_config_var
@@ -432,38 +431,20 @@ def _ensure_relative(self, path):
 
     @property
     def license_paths(self):
-        metadata = self.distribution.get_option_dict("metadata")
+        metadata = self.distribution.metadata
         files = set()
-        patterns = sorted(
-            {option for option in metadata.get("license_files", ("", ""))[1].split()}
-        )
 
-        if "license_file" in metadata:
+        license_file = getattr(metadata, "license_file", None)
+        if license_file:
             warnings.warn(
                 'The "license_file" option is deprecated. Use '
                 '"license_files" instead.',
                 DeprecationWarning,
             )
-            files.add(metadata["license_file"][1])
-
-        if "license_file" not in metadata and "license_files" not in metadata:
-            patterns = ("LICEN[CS]E*", "COPYING*", "NOTICE*", "AUTHORS*")
-
-        for pattern in patterns:
-            for path in iglob(pattern):
-                if path.endswith("~"):
-                    log.debug(
-                        f'ignoring license file "{path}" as it looks like a ' f"backup"
-                    )
-                    continue
-
-                if path not in files and os.path.isfile(path):
-                    log.info(
-                        f'adding license file "{path}" (matched pattern "{pattern}")'
-                    )
-                    files.add(path)
-
-        return files
+            files.add(license_file)
+
+        license_files = getattr(metadata, "license_files", None) or []
+        return sorted({*files, *license_files})
 
     def egg2dist(self, egginfo_path, distinfo_path):
         """Convert an .egg-info directory into a .dist-info directory"""

tests/test_bdist_wheel.py

@@ -8,6 +8,7 @@
 from zipfile import ZipFile
 
 import pytest
+from setuptools import __version__ as setuptools_version
 
 from wheel.bdist_wheel import bdist_wheel
 from wheel.wheelfile import WheelFile
@@ -34,21 +35,27 @@
     "LICENSE~",
     "AUTHORS~",
 }
-
-
-@pytest.fixture
-def dummy_dist(tmpdir_factory):
-    basedir = tmpdir_factory.mktemp("dummy_dist")
-    basedir.join("setup.py").write(
-        """\
+SETUPPY_EXAMPLE = """\
 from setuptools import setup
 
 setup(
     name='dummy_dist',
-    version='1.0'
+    version='1.0',
 )
 """
+
+
+def lincense_files_in_old_setuptools(old_version):
+    return pytest.mark.xfail(
+        tuple(setuptools_version.split(".")) < tuple(old_version.split(".")),
+        reason=f"setuptools < {old_version} has problems with license_files",
     )
+
+
+@pytest.fixture
+def dummy_dist(tmpdir_factory):
+    basedir = tmpdir_factory.mktemp("dummy_dist")
+    basedir.join("setup.py").write(SETUPPY_EXAMPLE)
     for fname in DEFAULT_LICENSE_FILES | OTHER_IGNORED_FILES:
         basedir.join(fname).write("")
 
@@ -71,6 +78,7 @@ def test_unicode_record(wheel_paths):
     assert "åäö_日本語.py".encode() in record
 
 
+@lincense_files_in_old_setuptools("57.0")
 def test_licenses_default(dummy_dist, monkeypatch, tmpdir):
     monkeypatch.chdir(dummy_dist)
     subprocess.check_call(
@@ -83,6 +91,7 @@ def test_licenses_default(dummy_dist, monkeypatch, tmpdir):
         assert set(wf.namelist()) == DEFAULT_FILES | license_files
 
 
+@lincense_files_in_old_setuptools("56.0")
 def test_licenses_deprecated(dummy_dist, monkeypatch, tmpdir):
     dummy_dist.join("setup.cfg").write("[metadata]\nlicense_file=licenses/DUMMYFILE")
     monkeypatch.chdir(dummy_dist)
@@ -94,10 +103,29 @@ def test_licenses_deprecated(dummy_dist, monkeypatch, tmpdir):
         assert set(wf.namelist()) == DEFAULT_FILES | license_files
 
 
-def test_licenses_override(dummy_dist, monkeypatch, tmpdir):
-    dummy_dist.join("setup.cfg").write(
-        "[metadata]\nlicense_files=licenses/*\n  LICENSE"
-    )
+@pytest.mark.parametrize(
+    "config_file, config",
+    [
+        pytest.param(
+            "setup.cfg",
+            "[metadata]\nlicense_files=licenses/*\n  LICENSE",
+            marks=lincense_files_in_old_setuptools("57.0"),
+        ),
+        pytest.param(
+            "setup.cfg",
+            "[metadata]\nlicense_files=licenses/*, LICENSE",
+            marks=lincense_files_in_old_setuptools("57.0"),
+        ),
+        (
+            "setup.py",
+            SETUPPY_EXAMPLE.replace(
+                ")", "  license_files=['licenses/DUMMYFILE', 'LICENSE'])"
+            ),
+        ),
+    ],
+)
+def test_licenses_override(dummy_dist, monkeypatch, tmpdir, config_file, config):
+    dummy_dist.join(config_file).write(config)
     monkeypatch.chdir(dummy_dist)
     subprocess.check_call(
         [sys.executable, "setup.py", "bdist_wheel", "-b", str(tmpdir), "--universal"]