Merge pull request #401 from takluyver/i399

Only add COPYING* & LICENSE* matches if they are regular files
pypa · Mar 21, 2021 · 915e63f · 915e63f
2 parents bbd08ed 8f50a67
commit 915e63f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/flit_core/flit_core/tests/samples/inclusion/LICENSES/README b/flit_core/flit_core/tests/samples/inclusion/LICENSES/README
@@ -0,0 1,2 @@
 This directory will match the LICENSE* glob which Flit uses to add license
 files to wheel metadata.
diff --git a/flit_core/flit_core/tests/test_wheel.py b/flit_core/flit_core/tests/test_wheel.py
@@ -0,0 1,12 @@
 from pathlib import Path
 
 from testpath import assert_isfile
 
 from flit_core.wheel import make_wheel_in
 
 samples_dir = Path(__file__).parent / 'samples'
 
 def test_licenses_dir(tmp_path):
  # Smoketest for https://github.com/takluyver/flit/issues/399
  info = make_wheel_in(samples_dir / 'inclusion' / 'pyproject.toml', tmp_path)
  assert_isfile(info.file)
diff --git a/flit_core/flit_core/wheel.py b/flit_core/flit_core/wheel.py
@@ -197,8 197,9 @@ def write_metadata(self):
  common.write_entry_points(self.entrypoints, f)
 
  for base in ('COPYING', 'LICENSE'):
- for path in sorted(glob(str(self.directory / (base   '*')))):
- self._add_file(path, '%s/%s' % (self.dist_info, osp.basename(path)))
  for path in sorted(self.directory.glob(base   '*')):
  if path.is_file():
  self._add_file(path, '%s/%s' % (self.dist_info, path.name))
 
  with self._write_to_zip(self.dist_info   '/WHEEL') as f:
  _write_wheel_file(f, supports_py2=self.metadata.supports_py2)