Skip to content

Commit aa16d4d

Browse files
committed
Remove vendored packaging
1 parent 95a8099 commit aa16d4d

File tree

10 files changed

+8
-1268
lines changed

10 files changed

+8
-1268
lines changed

flit_core/flit_core/config.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818
except ImportError:
1919
import tomli as tomllib
2020

21-
try:
22-
from .vendor.packaging import licenses
23-
# Some downstream distributors remove the vendored packaging.
24-
# When that is removed, import packaging from the regular location.
25-
except ImportError:
26-
from packaging import licenses
27-
2821
from .common import normalise_core_metadata_name
2922
from .versionno import normalise_version
3023

@@ -544,10 +537,7 @@ def read_pep621_metadata(proj, path) -> LoadedConfig:
544537
_check_types(proj, 'license', (str, dict))
545538
if isinstance(proj['license'], str):
546539
license_expr = proj['license']
547-
try:
548-
license_expr = licenses.canonicalize_license_expression(license_expr)
549-
except licenses.InvalidLicenseExpression as ex:
550-
raise ConfigError(ex.args[0])
540+
# TODO Validate and normalize license expression
551541
md_dict['license_expression'] = license_expr
552542
else:
553543
license_tbl = proj['license']
@@ -567,11 +557,7 @@ def read_pep621_metadata(proj, path) -> LoadedConfig:
567557
lc.referenced_files.append(license_tbl['file'])
568558
elif 'text' in license_tbl:
569559
license = license_tbl['text']
570-
try:
571-
# Normalize license if it's a valid SPDX expression
572-
license = licenses.canonicalize_license_expression(license)
573-
except licenses.InvalidLicenseExpression:
574-
pass
560+
# TODO Normalize license if it's a valid SPDX expression
575561
md_dict['license'] = license
576562
else:
577563
raise ConfigError(

flit_core/flit_core/vendor/packaging-24.2.dist-info/LICENSE

Lines changed: 0 additions & 3 deletions
This file was deleted.

flit_core/flit_core/vendor/packaging-24.2.dist-info/LICENSE.APACHE

Lines changed: 0 additions & 177 deletions
This file was deleted.

flit_core/flit_core/vendor/packaging-24.2.dist-info/LICENSE.BSD

Lines changed: 0 additions & 23 deletions
This file was deleted.

flit_core/flit_core/vendor/packaging-24.2.dist-info/METADATA

Lines changed: 0 additions & 102 deletions
This file was deleted.

flit_core/flit_core/vendor/packaging/__init__.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)