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.

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

feat: Analyze licenses or-ed together separately #100

Merged
merged 2 commits into from
Dec 29, 2022

Conversation

thehale
Copy link
Contributor

@thehale thehale commented Dec 28, 2022

Multi-licensed packages may specify their allowed licenses using an or
designation.

This commit adds support for parsing out those or-ed licenses as if they had
been listed separately.

For example, the pypdfium2 project uses the valid SPDX license identifier of Apache-2.0 OR BSD-3-Clause.

The contribution instructions direct new code contributors to run test using
`tox`. However, `tox` is not included in the `test-requirements.txt` file,
requiring an extra step for new contributors to install `tox` manually.

This commit adds `tox` to the `test-requirements.txt` file so that new code
contributors automatically get it when they install the test requirements.
Multi-licensed packages may specify their allowed licenses using an `or`
designation.

This commit adds support for parsing out those `or`-ed licenses as if they had
been listed separately.
@codecov-commenter
Copy link

Codecov Report

Merging #100 (2bc5f20) into master (d16e5ef) will increase coverage by 0.26%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master     #100      +/-   ##
==========================================
+ Coverage   84.25%   84.51%   +0.26%     
==========================================
  Files           9        9              
  Lines         470      478       +8     
  Branches       93       95       +2     
==========================================
+ Hits          396      404       +8     
  Misses         62       62              
  Partials       12       12              
Impacted Files Coverage Δ
tests/test_check_package.py 100.00% <ø> (ø)
liccheck/command_line.py 76.80% <100.00%> (+0.72%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@ochedru
Copy link
Collaborator

ochedru commented Dec 29, 2022

Thank you for your PR!

@ochedru ochedru merged commit 11bae51 into dhatim:master Dec 29, 2022
ochedru pushed a commit that referenced this pull request Jan 5, 2023
This reverts commit 11bae51, reversing
changes made to d16e5ef.
thehale added a commit to thehale/python-license-check that referenced this pull request May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants