Merge branch 'main' into license-expression

Author: takluyver

.github/workflows/test.yml

@@ -21,7 +21,33 @@ jobs:
     strategy:
       matrix:
         platform: ["ubuntu-latest", "windows-latest"]
-        python-version: [ "3.7", "3.8", "3.9", "3.10", "3.11" , "3.12", "3.13" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11" , "3.12", "3.13" ]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install tox tox-gh-actions codecov
+
+      - name: Run tests
+        run: tox
+
+      - name: Codecov upload
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: codecov
+
+  test-py37:
+    runs-on: "ubuntu-22.04"
+    strategy:
+      matrix:
+        python-version: [ "3.7", ]
     steps:
       - uses: actions/checkout@v4
 

doc/pyproject_toml.rst

@@ -99,6 +99,9 @@ license
   A valid SPDX `license expression <https://peps.python.org/pep-0639/#term-license-expression>`_
   or a table with either a ``file`` key (a relative path to a license file) or a
   ``text`` key (the license text).
+license-files
+  A list of glob patterns for license files to include.
+  Defaults to ``['COPYING*', 'LICEN[CS]E*']``.
 authors
   A list of tables with ``name`` and ``email`` keys (both optional) describing
   the authors of the project.

flit_core/flit_core/common.py

@@ -355,6 +355,7 @@ class Metadata(object):
     obsoletes_dist = ()
     requires_external = ()
     provides_extra = ()
+    license_files = ()
     dynamic = ()
 
     metadata_version = "2.3"
@@ -436,6 +437,10 @@ def write_metadata_file(self, fp):
         for clsfr in self.classifiers:
             fp.write(u'Classifier: {}\n'.format(clsfr))
 
+        # TODO: License-File requires Metadata-Version '2.4'
+        # for file in self.license_files:
+        #     fp.write(u'License-File: {}\n'.format(file))
+
         for req in self.requires_dist:
             normalised_req = self._normalise_requires_dist(req)
             fp.write(u'Requires-Dist: {}\n'.format(normalised_req))

flit_core/flit_core/config.py

@@ -60,6 +60,7 @@ class ConfigError(ValueError):
     'readme',
     'requires-python',
     'license',
+    'license-files',
     'authors',
     'maintainers',
     'keywords',
@@ -73,6 +74,9 @@ class ConfigError(ValueError):
     'dynamic',
 }
 
+default_license_files_globs = ['COPYING*', 'LICEN[CS]E*']
+license_files_allowed_chars = re.compile(r'^[\w\-\.\/\*\?\[\]]+$')
+
 
 def read_flit_config(path):
     """Read and check the `pyproject.toml` file with data about the package.
@@ -427,6 +431,15 @@ def _prep_metadata(md_sect, path):
     # For internal use, record the main requirements as a '.none' extra.
     res.reqs_by_extra['.none'] = reqs_noextra
 
+    if path:
+        license_files = sorted(
+            _license_files_from_globs(
+                path.parent, default_license_files_globs, warn_no_files=False
+            )
+        )
+        res.referenced_files.extend(license_files)
+        md_dict['license_files'] = license_files
+
     return res
 
 def _expand_requires_extra(re):
@@ -439,6 +452,43 @@ def _expand_requires_extra(re):
                 yield '{} ; extra == "{}"'.format(req, extra)
 
 
+def _license_files_from_globs(project_dir: Path, globs, warn_no_files = True):
+    license_files = set()
+    for pattern in globs:
+        if isabs_ish(pattern):
+            raise ConfigError(
+                "Invalid glob pattern for [project.license-files]: '{}'. "
+                "Pattern must not start with '/'.".format(pattern)
+            )
+        if ".." in pattern:
+            raise ConfigError(
+                "Invalid glob pattern for [project.license-files]: '{}'. "
+                "Pattern must not contain '..'".format(pattern)
+            )
+        if license_files_allowed_chars.match(pattern) is None:
+            raise ConfigError(
+                "Invalid glob pattern for [project.license-files]: '{}'. "
+                "Pattern contains invalid characters. "
+                "https://packaging.python.org/en/latest/specifications/pyproject-toml/#license-files"
+            )
+        try:
+            files = [
+                str(file.relative_to(project_dir)).replace(osp.sep, "/")
+                for file in project_dir.glob(pattern)
+                if file.is_file()
+            ]
+        except ValueError as ex:
+            raise ConfigError(
+                "Invalid glob pattern for [project.license-files]: '{}'. {}".format(pattern, ex.args[0])
+            )
+
+        if not files and warn_no_files:
+            raise ConfigError(
+                "No files found for [project.license-files]: '{}' pattern".format(pattern)
+            )
+        license_files.update(files)
+    return license_files
+
 def _check_type(d, field_name, cls):
     if not isinstance(d[field_name], cls):
         raise ConfigError(
@@ -533,6 +583,7 @@ def read_pep621_metadata(proj, path) -> LoadedConfig:
     if 'requires-python' in proj:
         md_dict['requires_python'] = proj['requires-python']
 
+    license_files = set()
     if 'license' in proj:
         _check_types(proj, 'license', (str, dict))
         if isinstance(proj['license'], str):
@@ -554,14 +605,31 @@ def read_pep621_metadata(proj, path) -> LoadedConfig:
                     )
                 lc.referenced_files.append(license_tbl['file'])
             elif 'text' in license_tbl:
-                license = license_tbl['text']
-                # TODO Normalize license if it's a valid SPDX expression
-                md_dict['license'] = license
+                pass
             else:
                 raise ConfigError(
                     "file or text field required in [project.license] table"
                 )
 
+    if 'license-files' in proj:
+        _check_type(proj, 'license-files', list)
+        globs = proj['license-files']
+        license_files = _license_files_from_globs(path.parent, globs)
+        if isinstance(proj.get('license'), dict):
+            raise ConfigError(
+                "license-files cannot be used with a license table, "
+                "use 'project.license' with a license expression instead"
+            )
+    else:
+        license_files.update(
+            _license_files_from_globs(
+                path.parent, default_license_files_globs, warn_no_files=False
+            )
+        )
+    license_files_sorted = sorted(license_files)
+    lc.referenced_files.extend(license_files_sorted)
+    md_dict['license_files'] = license_files_sorted
+
     if 'authors' in proj:
         _check_type(proj, 'authors', list)
         md_dict.update(pep621_people(proj['authors']))

flit_core/flit_core/wheel.py

@@ -183,10 +183,8 @@ def write_metadata(self):
             with self._write_to_zip(self.dist_info + '/entry_points.txt') as f:
                 common.write_entry_points(self.entrypoints, f)
 
-        for base in ('COPYING', 'LICENSE'):
-            for path in sorted(self.directory.glob(base + '*')):
-                if path.is_file():
-                    self._add_file(path, '%s/%s' % (self.dist_info, path.name))
+        for file in self.metadata.license_files:
+            self._add_file(self.directory / file, '%s/licenses/%s' % (self.dist_info, file))
 
         with self._write_to_zip(self.dist_info + '/WHEEL') as f:
             _write_wheel_file(f, supports_py2=self.metadata.supports_py2)

flit_core/pyproject.toml

@@ -13,6 +13,7 @@ dependencies = []
 requires-python = '>=3.6'
 readme = "README.rst"
 license = "BSD-3-Clause"
+license-files = ["LICENSE*", "flit_core/vendor/**/LICENSE*"]
 classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]

flit_core/tests_core/samples/pep621_license_files/LICENSE

@@ -0,0 +1 @@
+This file should be added to wheels

flit_core/tests_core/samples/pep621_license_files/README.rst

@@ -0,0 +1 @@
+Readme

flit_core/tests_core/samples/pep621_license_files/module/vendor/LICENSE_VENDOR

@@ -0,0 +1 @@
+This file should be added to wheels

flit_core/tests_core/samples/pep621_license_files/module1a.py

@@ -0,0 +1,3 @@
+"""Example module"""
+
+__version__ = '0.1'