From 823ab9d2ec4ab89f90c0a781d872c9071b4afc13 Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 20 May 2019 18:25:19 -0400
Subject: Add support for `license_files` option in metadata

---
 setuptools/command/sdist.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'setuptools/command')

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index dc253981..24316640 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -200,10 +200,12 @@ class sdist(sdist_add_defaults, orig.sdist):
         manifest.close()
 
     def check_license(self):
-        """Checks if license_file' is configured and adds it to
-        'self.filelist' if the value contains a valid path.
+        """Checks if license_file' or 'license_files' is configured and adds any
+        valid paths to 'self.filelist'.
         """
 
+        files = set()
+
         opts = self.distribution.get_option_dict('metadata')
 
         # ignore the source of the value
@@ -211,11 +213,19 @@ class sdist(sdist_add_defaults, orig.sdist):
 
         if license_file is None:
             log.debug("'license_file' option was not specified")
-            return
+        else:
+            files.add(license_file)
 
-        if not os.path.exists(license_file):
-            log.warn("warning: Failed to find the configured license file '%s'",
-                    license_file)
-            return
+        try:
+            files.update(self.distribution.metadata.license_files)
+        except TypeError:
+            log.warn("warning: 'license_files' option is malformed")
+
+        for f in files:
+            if not os.path.exists(f):
+                log.warn(
+                    "warning: Failed to find the configured license file '%s'",
+                    f)
+                continue
 
-        self.filelist.append(license_file)
+            self.filelist.append(f)
-- 
cgit v1.2.3


From 4a31168e517134529c229b310e89039323fdb02f Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 28 Oct 2019 18:45:42 -0400
Subject: Use an OrderedSet for accumulating license files

---
 setuptools/command/sdist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'setuptools/command')

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 24316640..6043e0b9 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -5,7 +5,7 @@ import sys
 import io
 import contextlib
 
-from setuptools.extern import six
+from setuptools.extern import six, ordered_set
 
 from .py36compat import sdist_add_defaults
 
@@ -204,7 +204,7 @@ class sdist(sdist_add_defaults, orig.sdist):
         valid paths to 'self.filelist'.
         """
 
-        files = set()
+        files = ordered_set.OrderedSet()
 
         opts = self.distribution.get_option_dict('metadata')
 
-- 
cgit v1.2.3


From e08ec2b640f6b2bf943fea70e2a7f9881bbe6e91 Mon Sep 17 00:00:00 2001
From: Mick Koch <mick@kochm.co>
Date: Mon, 28 Oct 2019 19:16:13 -0400
Subject: Filter out missing files and use extend()

---
 setuptools/command/sdist.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'setuptools/command')

diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 6043e0b9..55ecdd97 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -226,6 +226,6 @@ class sdist(sdist_add_defaults, orig.sdist):
                 log.warn(
                     "warning: Failed to find the configured license file '%s'",
                     f)
-                continue
+                files.remove(f)
 
-            self.filelist.append(f)
+        self.filelist.extend(files)
-- 
cgit v1.2.3