diff --git a/.travis.yml b/.travis.yml index 72773ea..3c2c8d1 100644 --- a/.travis.yml +++ b/.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: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7201e21..dc0a03d 100644 --- a/azure-pipelines.yml +++ b/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 diff --git a/tests/test_license_expression.py b/tests/test_license_expression.py index 826a029..57d9d6e 100644 --- a/tests/test_license_expression.py +++ b/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 diff --git a/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl b/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl deleted file mode 100644 index b1f5579..0000000 Binary files a/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl.ABOUT b/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 3df1f3a..0000000 --- a/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,15 +0,0 @@ -about_resource: boolean.py-3.6-py2.py3-none-any.whl -attribute: true -checksum_md5: da39999eb131b589e84ad935dc4ca642 -checksum_sha1: d31b55e7ad2ee917232b3213afe3ae9678156a9f -copyright: Copyright (c) 2009-2016 Sebastian Kraemer, basti.kr@gmail.com and others -description: Implements boolean algebra in one module. -download_url: https://files.pythonhosted.org/packages/9b/27/d22062a221010e17935237ba4b574cd828238ea02e0765337c238466a512/boolean.py-3.6-py2.py3-none-any.whl -homepage_url: https://github.com/bastikr/boolean.py -license_expression: bsd-simplified -license_file: bsd-simplified.LICENSE -name: boolean.py -notice_file: boolean.py-3.6-py2.py3-none-any.whl.NOTICE -notice_url: https://github.com/bastikr/boolean.py/blob/master/LICENSE.txt -owner: Sebastian Kraemer -version: '3.6' diff --git a/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl b/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl new file mode 100644 index 0000000..6f153e9 Binary files /dev/null and b/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl differ diff --git a/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl.ABOUT b/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..2380120 --- /dev/null +++ b/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl.ABOUT @@ -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' diff --git a/thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl.NOTICE b/thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl.NOTICE similarity index 100% rename from thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl.NOTICE rename to thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl.NOTICE