Skip to content

Deduplicate license expressions correctly #49 - #53

Merged
pombredanne merged 92 commits into
masterfrom
49_simplify_expression
Jun 4, 2021
Merged

Deduplicate license expressions correctly #49#53
pombredanne merged 92 commits into
masterfrom
49_simplify_expression

Conversation

@chinyeungli

@chinyeungli chinyeungli commented Feb 16, 2021

Copy link
Copy Markdown
Contributor

Instead of using the simplify() from boolean.py (as it over
simplifies the expression and the order cannot be kept),
implement a new function Licensing.dedup(expression)
to de-duplicate the license_expression and keep the order
of the license key.

Signed-off-by: Chin Yeung Li tli@nexb.com

steven-esser and others added 30 commits September 22, 2020 15:53
Signed-off-by: Steven Esser <sesser@nexb.com>
This commit adds the inital skeleton files needed for a bare-bones
python library. Includes a simple configure script and setup.py file

Signed-off-by: Steven Esser <sesser@nexb.com>
Signed-off-by: Steven Esser <sesser@nexb.com>
* Add AUTHORS.rst
* Add CHANGELOG.rst
* Add setup.cfg

Signed-off-by: Steven Esser <sesser@nexb.com>
* Add PEP 517/518 pyproject.toml file
* Add setuptools_scm to handle versioning
* Add setup.py content to setup.cfg
* Update setup.py to act as a shim (so pip install -e works)

Addresses: #2

Signed-off-by: Steven Esser <sesser@nexb.com>
Signed-off-by: Steven Esser <sesser@nexb.com>
Signed-off-by: Steven Esser <sesser@nexb.com>
Signed-off-by: Steven Esser <sesser@nexb.com>
Signed-off-by: Steven Esser <sesser@nexb.com>
Signed-off-by: Steven Esser <sesser@nexb.com>
    * Create configure.bat so we can use our skeleton for Windows projects

Signed-off-by: Jono Yang <jyang@nexb.com>
    * Remove unused variables and options

Signed-off-by: Jono Yang <jyang@nexb.com>
Signed-off-by: Jono Yang <jyang@nexb.com>
    * Remove rerun option from azure-pipelines.yml

Signed-off-by: Jono Yang <jyang@nexb.com>
Signed-off-by: Jono Yang <jyang@nexb.com>
    * We have this to ensure the line ending of configure.bat is always CRLF

Signed-off-by: Jono Yang <jyang@nexb.com>
Signed-off-by: Jono Yang <jyang@nexb.com>
Merge changes from develop to main
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Update .gitignore to ignore Jupyter temp files
Signed-off-by: Steven Esser <sesser@nexb.com>
Adds a RTD configuration file (v2) to customize builds.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Taken from https://www.apache.org/licenses/LICENSE-2.0.txt

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Ensure we use official full text of Apache 2.0
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
This was they do not end up in the template CHANGELOG.rst

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
From aboutcode-org/typecode#20

Reported-by: Pierre Tardy <pierre.tardy@renault.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
And remove v prefix from fallback version

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne pombredanne changed the title Fixed #49 - issue for over-simplified Deduplicate license expressions correctly #49 Jun 4, 2021
@pombredanne
pombredanne force-pushed the 49_simplify_expression branch 2 times, most recently from d33b7f5 to 64c15a6 Compare June 4, 2021 18:30
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
pombredanne force-pushed the 49_simplify_expression branch from 64c15a6 to 92706e9 Compare June 4, 2021 18:32
@pombredanne
pombredanne requested a review from JonoYang June 4, 2021 18:36
@pombredanne

Copy link
Copy Markdown
Member

All tests are passing on Appveyor and Travis. Azure is clogged so we will ignore it.

@JonoYang JonoYang left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@pombredanne
pombredanne merged commit 88977ce into master Jun 4, 2021
@pombredanne
pombredanne deleted the 49_simplify_expression branch June 4, 2021 18:40
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.

5 participants