Merge pull request #41 from nexB/32-update-boolean.py

Update boolean.py library

Author: pombredanne

.travis.yml

@@ -1,49 +1,67 @@
 matrix:
   include:
     - os: osx
-      language: generic
       env:
-        - PYENV_PYTHON="2.7.14"
+        - PYTHON="3.6.8"
+        - TEST_SUITE="bin/py.test -vvs"
+      language: generic
+      python:
 
     - os: osx
-      language: generic
       env:
-        - PYENV_PYTHON="3.6.1"
-
-    - os: linux
+        - PYTHON="2.7.15"
+        - TEST_SUITE="bin/py.test -vvs"
       language: generic
-      env:
-        - PYENV_PYTHON="2.7.14"
+      python:
 
     - os: linux
-      language: generic
-      env:
-        - PYENV_PYTHON="3.6.1"
+      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
 
+addons:
+  homebrew:
+    packages:
+      - openssl
+      - readline
+      - sqlite3
+      - xz
+      - zlib
+      - pyenv
+    update: true
 
 install:
-  - |
-    if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-        rm -rf ~/.pyenv
-        git clone https://github.com/pyenv/pyenv.git ~/.pyenv
-        echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
-        echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
-        echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> ~/.bash_profile
-        exec "$SHELL"
-    fi
-  - which pyenv
-  - pyenv install --list
-  - python --version
-  - pyenv install "$PYENV_PYTHON"
-  - pyenv global "$PYENV_PYTHON"
-  - python --version
   - ./configure
 
-
 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-code check --verbose .
-  - "bin/py.test -vvs"
-
+  - $TEST_SUITE
 
 notifications:
   irc:

azure-pipelines.yml

@@ -62,7 +62,7 @@ jobs:
                   python_version: '3.6'
                   python_architecture: 'x86'
               py37:
-                  python_version: '3.7.3'
+                  python_version: '3.7.4'
                   python_architecture: 'x86'
 
     - template: etc/ci/azure-win.yml

tests/test_license_expression.py

@@ -552,6 +552,16 @@ def test_parse_simplify_and_contain_and_equal(self):
         expr3 = licensing.parse('mit and LGPL2.1')
         self.assertTrue(expr3 in expr2)
 
+    def test_parse_simplify_no_sort(self):
+        licensing = Licensing()
+        expr = licensing.parse('gpl-2.0 OR apache-2.0')
+        expr2 = licensing.parse('apache-2.0 OR gpl-2.0')
+
+        self.assertEqual(expr, expr2)
+        self.assertEqual(expr.simplify(), expr2.simplify())
+        self.assertEqual(expr.simplify(sort=False), expr2.simplify())
+        self.assertNotEqual(expr.simplify(sort=False).pretty(), expr2.pretty())
+
     def test_license_expression_is_equivalent(self):
         lic = Licensing()
         is_equiv = lic.is_equivalent

thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl

@@ -0,0 +1,8 @@
+about_resource: boolean.py-3.7-py2.py3-none-any.whl
+download_url: https://files.pythonhosted.org/packages/dc/53/b9c4f026bac231cbf7ddc214d879c3bdb5cda9a57adbe10520deeae4f154/boolean.py-3.7-py2.py3-none-any.whl
+attribute: yes
+checksum_md5: 97af5906f5eaa22539a034a99c24c824
+checksum_sha1: 514c2b60f10521988063a9e6b56e3fae24b393c7
+license_expression: bsd-simplified
+name: boolean.py
+version: '3.7'