summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorMarc Mueller <30130371+cdce8p@users.noreply.github.com>2021-04-03 21:34:00 +0200
committerMarc Mueller <30130371+cdce8p@users.noreply.github.com>2021-04-03 21:34:00 +0200
commit608c376e86326c879dd52b56660b2247a3ca854e (patch)
tree5ce7ced6a4e80a07aaa51f05d479fd0341dfa482 /setuptools
parent0f34639e5aa630b8cbe32af9cfe8dfec7be890e7 (diff)
downloadpython-setuptools-git-608c376e86326c879dd52b56660b2247a3ca854e.tar.gz
Small changes
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/command/sdist.py3
-rw-r--r--setuptools/tests/test_egg_info.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py
index 278b8ce0..a6ea814a 100644
--- a/setuptools/command/sdist.py
+++ b/setuptools/command/sdist.py
@@ -213,6 +213,9 @@ class sdist(sdist_add_defaults, orig.sdist):
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:
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 4751d1b5..80d35774 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -654,8 +654,7 @@ class TestEggInfo:
'LICENSE-XYZ': "XYZ license"
}, ['LICENSE-ABC'], ['LICENSE-XYZ']), # subset is manually excluded
pytest.param({
- 'setup.cfg': DALS("""
- """),
+ 'setup.cfg': "",
'LICENSE-ABC': "ABC license",
'COPYING-ABC': "ABC copying",
'NOTICE-ABC': "ABC notice",