Merge pull request #53 from nexB/49_simplify_expression

Deduplicate license expressions correctly #49

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

.gitattributes

@@ -0,0 +1,3 @@
+# Ignore all Git auto CR/LF line endings conversions
+* -text
+pyproject.toml export-subst

.gitignore

@@ -1,3 +1,4 @@
+# Python compiled files
 *.py[cod]
 
 # virtualenv and other misc bits
@@ -16,12 +17,15 @@
 /Include
 /local
 */local/*
+/local/
+/share/
+/tcl/
+/.eggs/
 
 # Installer logs
 pip-log.txt
 
 # Unit test / coverage reports
-.tox
 .cache
 .coverage
 .coverage.*
@@ -36,10 +40,19 @@ htmlcov
 .pydevproject
 .idea
 org.eclipse.core.resources.prefs
+.vscode
+.vs
 
 # Sphinx
 docs/_build
+docs/bin
+docs/build
+docs/include
+docs/Lib
+doc/pyvenv.cfg
+pyvenv.cfg
 
+# Various junk and temp files
 .DS_Store
 *~
 .*.sw[po]
@@ -48,6 +61,13 @@ docs/_build
 *.bak
 /.cache/
 
-/share/
-/local/
+# pyenv
+/.python-version
+/man/
 /.pytest_cache/
+lib64
+tcl
+
+# Ignore Jupyter Notebook related temp files
+.ipynb_checkpoints/
+/.tox/

.readthedocs.yml

@@ -0,0 +1,18 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Where the Sphinx conf.py file is located
+sphinx:
+   configuration: docs/source/conf.py
+
+# Setting the python version and doc build requirements
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

.travis.yml

@@ -1,75 +1,22 @@
-matrix:
-  include:
-    - os: osx
-      env:
-        - PYTHON="3.6.8"
-        - TEST_SUITE="bin/py.test -vvs"
-      language: generic
-      python:
+# This is a skeleton Travis CI config file that provides a starting point for adding CI
+# to a Python project. Since we primarily develop in python3, this skeleton config file
+# will be specific to that language.
+#
+# See https://config.travis-ci.com/ for a full list of configuration options.
 
-    - os: osx
-      env:
-        - PYTHON="2.7.15"
-        - TEST_SUITE="bin/py.test -vvs"
-      language: generic
-      python:
+os: linux
 
-    - os: linux
-      sudo: required
-      env: TEST_SUITE="bin/py.test -vvs"
-      language: python
-      python: "2.7"
-      dist: xenial
-    
-    - os: linux
-      sudo: required
-      env: TEST_SUITE="bin/py.test -vvs"
-      language: python
-      python: "2.7"
-      dist: bionic
-    
-    - os: linux
-      sudo: required
-      env: TEST_SUITE="bin/py.test -vvs"
-      language: python
-      python: "3.6"
-      dist: xenial
-    
-    - os: linux
-      sudo: required
-      env: TEST_SUITE="bin/py.test -vvs"
-      language: python
-      python: "3.6"
-      dist: bionic
+dist: xenial
 
-addons:
-  homebrew:
-    packages:
-      - openssl
-      - readline
-      - sqlite3
-      - xz
-      - zlib
-      - pyenv
-    update: true
+language: python
+python:
+  - "3.6"
+  - "3.7"
+  - "3.8"
+  - "3.9"
 
-install:
-  - ./configure
+# Scripts to run at install stage
+install: ./configure --dev
 
-script:
-  # If debugging, use a subset of tests to wait less:
-  # - ./bin/py.test -n 2 -vvs --cov=src tests/scancode
-  # - echo $TEST_SUITE
-  - bin/about check --verbose .
-  - $TEST_SUITE
-
-notifications:
-  irc:
-    channels:
-      - "chat.freenode.net#aboutcode"
-  on_success: change
-  on_failure: always
-  use_notice: true
-  skip_join: true
-  template:
-    - "%{repository_slug}#%{build_number} (%{branch}-%{commit}:%{author})-%{message}- %{build_url}"
+# Scripts to run at script stage
+script: tmp/bin/pytest

AUTHORS.rst

@@ -4,3 +4,8 @@ The following organizations or individuals have contributed to this code:
 - Philippe Ombredanne @pombredanne
 - Thomas Druez @tdruez
 - Carmen Bianca Bakker @carmenbianca
+- Chin-Yeung Li @chinyeungli
+- Steven Esser @majurg
+- Sebastian Schuberth @sschuberth
+- Max Mehl @mxmehl
+- Peter Kolbus @pkolbus

CHANGELOG.rst

@@ -1,13 +1,25 @@
 Changelog
 =========
-All notable changes to this project will be documented in this file.
-
-The format is based on `Keep a
-Changelog <https://keepachangelog.com/en/1.0.0/>`__
 
 [Unreleased]
 ------------
 
+
+
+[2.0] - 2021-06-04
+------------------
+
+Added
+~~~~~
+-  Add ability to simplify license expressions without over simplifying by not
+   using using boolean logic.
+
+Changed
+~~~~~~~
+-  Drop support for python27
+-  Adopt the skeleton from https://github.com/nexB/skeleton
+
+
 [1.2] - 2019-11-14
 ------------------
 Added
@@ -22,6 +34,7 @@ Changed
 ~~~~~~~
 -  Update the thirdparty directory structure.
 
+
 [1.0] - 2019-10-16
 ------------------
 Added
@@ -33,6 +46,7 @@ Changed
 ~~~~~~~
 -  updated travis CI settings
 
+
 [0.999] - 2019-04-29
 --------------------
 -  Initial release

MANIFEST.in

@@ -1,19 +1,15 @@
 graft src
-graft etc
-graft tests
 
-prune src/license_expression.egg-info
-
-include README.rst
-include apache-2.0.LICENSE
+include *.LICENSE
 include NOTICE
-include MANIFEST.in
-include setup.py
-include setup.cfg
-include .gitignore
-include configure
-include configure.bat
-
-include .travis.yml appveyor.yml
+include *.ABOUT
+include *.toml
+include *.yml
+include *.rst
+include setup.*
+include configure*
+include requirements*
+include .git*
 
 global-exclude *.py[co] __pycache__ *.*~
+

NOTICE

@@ -1,26 +1,19 @@
-Software license
-================
-
-license-expression is a free software tool from nexB Inc. and others.
-Visit https://github.com/nexB/license-expression for support and download.
-
-Copyright (c) 2016 nexB Inc. and others. All rights reserved.
-http://nexb.com  and http://aboutcode.org 
-
-This software is licensed under the Apache License version 2.0.
-
-You may not use this software except in compliance with the License.
-You may obtain a copy of the License at: http://apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
-
-
-Third-party software licenses
-=============================
-
-license-expression embeds third-party free and open source software packages under
-various licenses. The origin and license of these packages is documented by .ABOUT
-files. The corresponding source code for pre-compiled third-party software is
-available in the thirdparty directory.
+#
+# Copyright (c) nexB Inc. and others.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Visit https://aboutcode.org and https://github.com/nexB/license-expression
+# for support and download.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#

README.rst

@@ -2,16 +2,16 @@
 license-expression
 ==================
 
-license-expression is a small utility library to parse, compare, simplify and normalize
-license expressions (e.g. SPDX license expressions) using boolean logic such as:
-`GPL-2.0 or later WITH Classpath Exception AND MIT`.
+license-expression is a comprehensive utility library to parse, compare,
+simplify and normalize license expressions (such as SPDX license expressions)
+using boolean logic like in: `GPL-2.0 or later WITH Classpath Exception AND MIT`.
 
 See also for details:
 https://spdx.org/sites/cpstandard/files/pages/files/spdxversion2.1.pdf#page=95&zoom=auto
 
 license: apache-2.0
 
-Python: 2.7 and 3.5+
+Python: 3.6+
 
 Build and tests status
 ======================
@@ -135,6 +135,7 @@ Development
 ===========
 
 * Checkout a clone from https://github.com/nexB/license-expression.git
-* Then run ``./configure`` (or ``configure.bat``) and then ``source bin/activate``. This will
-  install all vendored dependencies in a local virtualenv, including development deps.
+* Then run ``./configure`` (or ``configure.bat``) and then ``source bin/activate``.
+  This will install all vendored dependencies in a local virtualenv, including
+  development deps.
 * To run the tests, run ``py.test -vvs``

apache-2.0.LICENSE

@@ -174,3 +174,31 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+<<<<<<< HEAD
+=======
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+>>>>>>> refs/remotes/skeleton/main