diff --git a/setup.py b/setup.py index 4d870fb2..6645deda 100644 --- a/setup.py +++ b/setup.py @@ -78,7 +78,7 @@ def read(*names, **kwargs): 'saneyaml', 'boolean.py >= 3.5, < 4.0', - 'license_expression >= 0.94, < 1.0', + 'license_expression >= 0.94', ], extras_require={ ":python_version < '3.6'": ['backports.csv'], diff --git a/thirdparty/boolean.py-3.6-py2.py3-none-any.whl b/thirdparty/boolean.py-3.6-py2.py3-none-any.whl deleted file mode 100644 index b1f55798..00000000 Binary files a/thirdparty/boolean.py-3.6-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/boolean.py-3.6-py2.py3-none-any.whl.ABOUT b/thirdparty/boolean.py-3.6-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 81f89eaf..00000000 --- a/thirdparty/boolean.py-3.6-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,21 +0,0 @@ -about_resource: boolean.py-3.6-py2.py3-none-any.whl -name: boolean.py -version: '3.6' -attribute: yes -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 -licenses: - - file: bsd-simplified.LICENSE - key: bsd-simplified - name: BSD-2-Clause - url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:bsd-simplified -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 diff --git a/thirdparty/boolean.py-3.7-py2.py3-none-any.whl b/thirdparty/boolean.py-3.7-py2.py3-none-any.whl new file mode 100644 index 00000000..6f153e95 Binary files /dev/null and b/thirdparty/boolean.py-3.7-py2.py3-none-any.whl differ diff --git a/thirdparty/boolean.py-3.7-py2.py3-none-any.whl.ABOUT b/thirdparty/boolean.py-3.7-py2.py3-none-any.whl.ABOUT new file mode 100644 index 00000000..2380120c --- /dev/null +++ b/thirdparty/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/boolean.py-3.6-py2.py3-none-any.whl.NOTICE b/thirdparty/boolean.py-3.7-py2.py3-none-any.whl.NOTICE similarity index 98% rename from thirdparty/boolean.py-3.6-py2.py3-none-any.whl.NOTICE rename to thirdparty/boolean.py-3.7-py2.py3-none-any.whl.NOTICE index b1b5bb34..8819ea10 100644 --- a/thirdparty/boolean.py-3.6-py2.py3-none-any.whl.NOTICE +++ b/thirdparty/boolean.py-3.7-py2.py3-none-any.whl.NOTICE @@ -1,23 +1,23 @@ -Copyright (c) 2009-2017 Sebastian Kraemer, basti.kr@gmail.com -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this -list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +Copyright (c) 2009-2017 Sebastian Kraemer, basti.kr@gmail.com +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/thirdparty/license_expression-0.99-py2.py3-none-any.whl b/thirdparty/license_expression-0.99-py2.py3-none-any.whl deleted file mode 100644 index de496136..00000000 Binary files a/thirdparty/license_expression-0.99-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/license_expression-0.99-py2.py3-none-any.whl.ABOUT b/thirdparty/license_expression-0.99-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 1037c040..00000000 --- a/thirdparty/license_expression-0.99-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,24 +0,0 @@ -about_resource: license_expression-0.99-py2.py3-none-any.whl -name: license-expression -version: '0.99' -attribute: yes -checksum_md5: cff177fd902ec3ee425fc2db26974aaa -checksum_sha1: 8d89733bf0012122d557b1b8a6c79a70fa742c46 -contact: http://www.nexb.com/contactus.html -copyright: Copyright (c) 2017 nexB Inc. and others. -description: | - Utility library to parse, normalize and compare License expressions for Python - using a boolean logic engine. For expressions using SPDX or any other license - id scheme. -download_url: https://files.pythonhosted.org/packages/8a/8e/f9786e4f61f5626d34e9a826790035817ff8c6b8100f0bd019a5eed00631/license_expression-0.99-py2.py3-none-any.whl -homepage_url: https://github.com/nexB/license-expression -license_expression: apache-2.0 -licenses: - - file: apache-2.0.LICENSE - key: apache-2.0 - name: Apache License 2.0 - url: https://enterprise.dejacode.com/urn/?urn=urn:dje:license:apache-2.0 -notice_file: license_expression-0.99-py2.py3-none-any.whl.NOTICE -notice_url: https://github.com/nexB/license-expression/blob/master/NOTICE -owner: nexB -owner_url: http://www.nexb.com/ diff --git a/thirdparty/license_expression-1.0-py2.py3-none-any.whl b/thirdparty/license_expression-1.0-py2.py3-none-any.whl new file mode 100644 index 00000000..b31e31d3 Binary files /dev/null and b/thirdparty/license_expression-1.0-py2.py3-none-any.whl differ diff --git a/thirdparty/license_expression-1.0-py2.py3-none-any.whl.ABOUT b/thirdparty/license_expression-1.0-py2.py3-none-any.whl.ABOUT new file mode 100644 index 00000000..9bfac760 --- /dev/null +++ b/thirdparty/license_expression-1.0-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,19 @@ +about_resource: license_expression-1.0-py2.py3-none-any.whl +attribute: true +checksum_md5: 3c1a679c30ef4bd3c8b25858ae1461bf +checksum_sha1: 2aac7a7035a46caaeca2a2c50a41b929e3d95fa9 +contact: http://www.nexb.com/contactus.html +copyright: Copyright (c) 2017 nexB Inc. and others. +description: Utility library to parse, normalize and compare License expressions for + Python using a boolean logic engine. For expressions using SPDX or any other license + id scheme. +download_url: https://files.pythonhosted.org/packages/12/7a/dd02b8ac8f0cd81557012b8f249ba4d0d32fe8f98e8d951ebc882187fd92/license_expression-1.0-py2.py3-none-any.whl +homepage_url: https://github.com/nexB/license-expression +license_expression: apache-2.0 +license_file: apache-2.0.LICENSE +name: license-expression +notice_file: license_expression-1.0-py2.py3-none-any.whl.NOTICE +notice_url: https://github.com/nexB/license-expression/blob/master/NOTICE +owner: nexB +owner_url: http://www.nexb.com/ +version: '1.0' diff --git a/thirdparty/license_expression-0.99-py2.py3-none-any.whl.NOTICE b/thirdparty/license_expression-1.0-py2.py3-none-any.whl.NOTICE similarity index 100% rename from thirdparty/license_expression-0.99-py2.py3-none-any.whl.NOTICE rename to thirdparty/license_expression-1.0-py2.py3-none-any.whl.NOTICE