Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PEP 639: Implement License-Expression and License-File #828

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open

PEP 639: Implement License-Expression and License-File #828

wants to merge 27 commits into from

Commits on Sep 5, 2024

  1. PEP 639: Implement License-Expression and License-File

    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    de8b239 View commit details
    Browse the repository at this point in the history

  2. wire in vendoring library to manage vendored dependencies

    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    44beda7 View commit details
    Browse the repository at this point in the history

  3. vendor license_expression and boolean.py

    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    2b1a9f7 View commit details
    Browse the repository at this point in the history

  4. harmonize with documentation 

    although inconsistent (see Requires-External, Provides-Extra, Provides-Dist, Obsoletes-Dist...) pluralize the result for multiple use of `License-File`

https://packaging.pypa.io/en/stable/metadata.html#packaging.metadata.RawMetadata

> Any core metadata field that can be specified multiple times or can hold multiple values in a single field have a key with a plural name.
    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9bfa714 View commit details
    Browse the repository at this point in the history

  5. exclude vendored spdx data from sdist/whl. build/bring our own 

    Per feedback, integrate a variant of pypa#799 that builds a minimal JSON dataset to feed vendored license-expression

32K	src/packaging/_spdx.json

vs

848K	src/packaging/_vendor/license_expression/data/scancode-licensedb-index.json
    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    1aea212 View commit details
    Browse the repository at this point in the history

  6. migrate to parser based on hatchling's 

    - back away from vendoring
- adapt hatchling's license expression parser to accept well-formed LicenseRef-
- back to python storage of license data
    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    cec33f1 View commit details
    Browse the repository at this point in the history

  7. string -> re

    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    cfb3af1 View commit details
    Browse the repository at this point in the history

  8. License-File: disallow unresolved globs and non-relative paths

    @ewdurbin
    ewdurbin committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    d6b47d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge branch 'main' into pep_639

    @brettcannon
    brettcannon committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    a55f422 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Apply suggestions from code review 

    Co-authored-by: Brett Cannon <brett@python.org>
    @ewdurbin @brettcannon
    ewdurbin and brettcannon committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    afa5d4c View commit details
    Browse the repository at this point in the history

  2. update typing for licenses.spdx

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    396e4ef View commit details
    Browse the repository at this point in the history

  3. Extend typing improvements in licenses.spdx to include Exception

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    21a2821 View commit details
    Browse the repository at this point in the history

  4. fixup names, Exception is not a good one.

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    4ac18f0 View commit details
    Browse the repository at this point in the history

  5. better enforcement of license-file paths

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    46a7491 View commit details
    Browse the repository at this point in the history

  6. subclass ValueError for invalid license expressions

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    cd7105f View commit details
    Browse the repository at this point in the history

  7. and empty license expression is invalid

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    e469b7e View commit details
    Browse the repository at this point in the history

  8. create a "NormalizedLicenseExpression" type

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    e699391 View commit details
    Browse the repository at this point in the history

  9. rename normalize -> canonicalize

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    22fa9cd View commit details
    Browse the repository at this point in the history

  10. add tests to ensure license and exception ids conform 

    since the value is typed as a TypedDict, mypy will detect if new keys appear or others disappear
    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    f952ab9 View commit details
    Browse the repository at this point in the history

  11. update name of var

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    30e34f1 View commit details
    Browse the repository at this point in the history

  12. match formatting standards

    @ewdurbin
    ewdurbin committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    8906b16 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. reorganize the licenses module a bit

    @ewdurbin
    ewdurbin committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    a361294 View commit details
    Browse the repository at this point in the history

  2. apply code-review suggestions for update_licenses task

    @ewdurbin
    ewdurbin committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    9cee38e View commit details
    Browse the repository at this point in the history

  3. fix tests after spdx module was made private

    @ewdurbin
    ewdurbin committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    81efbda View commit details
    Browse the repository at this point in the history

  4. add docs

    @ewdurbin
    ewdurbin committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    701217b View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Merge branch 'main' into pep_639

    @brettcannon
    brettcannon committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    4539543 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. add additional test cases and handle LicenseRef- identifiers not alre… 

    …ady padded by spaces
    @ewdurbin
    ewdurbin committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    64d3647 View commit details
    Browse the repository at this point in the history