Add License-File field to package metadata

2 files changed, 8 insertions, 47 deletions

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1f120b67..26ff9a4c 100644
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -539,6 +539,7 @@ class manifest_maker(sdist):
         if not os.path.exists(self.manifest):
             self.write_manifest()  # it must exist so it'll get in the list
         self.add_defaults()
+        self.add_license_files()
         if os.path.exists(self.template):
             self.read_template()
         self.prune_file_list()
@@ -575,7 +576,6 @@ class manifest_maker(sdist):
 
     def add_defaults(self):
         sdist.add_defaults(self)
-        self.check_license()
         self.filelist.append(self.template)
         self.filelist.append(self.manifest)
         rcfiles = list(walk_revctrl())
@@ -592,6 +592,13 @@ class manifest_maker(sdist):
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 
+    def add_license_files(self):
+        license_files = self.distribution.metadata.license_files_computed
+        for lf in license_files:
+            log.info("adding license file '%s'", lf)
+            pass
+        self.filelist.extend(license_files)
+
     def prune_file_list(self):
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index a6ea814a..4a014283 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -4,9 +4,6 @@ import os
 import sys
 import io
 import contextlib
-from glob import iglob
-
-from setuptools.extern import ordered_set
 
 from .py36compat import sdist_add_defaults
 
@@ -190,46 +187,3 @@ class sdist(sdist_add_defaults, orig.sdist):
                 continue
             self.filelist.append(line)
         manifest.close()
-
-    def check_license(self):
-        """Checks if license_file' or 'license_files' is configured and adds any
-        valid paths to 'self.filelist'.
-        """
-        opts = self.distribution.get_option_dict('metadata')
-
-        files = ordered_set.OrderedSet()
-        try:
-            license_files = self.distribution.metadata.license_files
-        except TypeError:
-            log.warn("warning: 'license_files' option is malformed")
-            license_files = ordered_set.OrderedSet()
-        patterns = license_files if isinstance(license_files, ordered_set.OrderedSet) \
-            else ordered_set.OrderedSet(license_files)
-
-        if 'license_file' in opts:
-            log.warn(
-                "warning: the 'license_file' option is deprecated, "
-                "use 'license_files' instead")
-            patterns.append(opts['license_file'][1])
-
-        if 'license_file' not in opts and 'license_files' not in opts:
-            # Default patterns match the ones wheel uses
-            # See https://wheel.readthedocs.io/en/stable/user_guide.html
-            # -> 'Including license files in the generated wheel file'
-            patterns = ('LICEN[CS]E*', 'COPYING*', 'NOTICE*', 'AUTHORS*')
-
-        for pattern in patterns:
-            for path in iglob(pattern):
-                if path.endswith('~'):
-                    log.debug(
-                        "ignoring license file '%s' as it looks like a backup",
-                        path)
-                    continue
-
-                if path not in files and os.path.isfile(path):
-                    log.info(
-                        "adding license file '%s' (matched pattern '%s')",
-                        path, pattern)
-                    files.add(path)
-
-        self.filelist.extend(sorted(files))