Skip to content

Commit a44c4ab

Browse files
committed
Update boolean.py library
* Bump boolean.py library to v3.7, which adds the ability to sort OR leave boolean expressions unsorted. * Add test case for simplify() sorting Addresses: #32 Signed-off-by: Steven Esser <sesser@nexb.com>
1 parent 538f083 commit a44c4ab

6 files changed

Lines changed: 21 additions & 15 deletions

tests/test_license_expression.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,14 @@ def test_parse_simplify_and_contain_and_equal(self):
552552
expr3 = licensing.parse('mit and LGPL2.1')
553553
self.assertTrue(expr3 in expr2)
554554

555+
def test_parse_simplify_no_sort(self):
556+
licensing = Licensing()
557+
558+
expr = licensing.parse('gpl-2.0 OR apache-2.0 OR gpl-2.0')
559+
560+
self.assertEqual(expr.simplify(), expr.simplify(sort=False))
561+
self.assertNotEqual(expr.simplify().pretty(), expr.simplify(sort=False).pretty())
562+
555563
def test_license_expression_is_equivalent(self):
556564
lic = Licensing()
557565
is_equiv = lic.is_equivalent
-21.5 KB
Binary file not shown.

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

Lines changed: 0 additions & 15 deletions
This file was deleted.
21.6 KB
Binary file not shown.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
about_resource: boolean.py-3.7-py2.py3-none-any.whl
2+
download_url: https://files.pythonhosted.org/packages/dc/53/b9c4f026bac231cbf7ddc214d879c3bdb5cda9a57adbe10520deeae4f154/boolean.py-3.7-py2.py3-none-any.whl
3+
license_expression: bsd-simplified
4+
attribute: yes
5+
checksum_md5: 97af5906f5eaa22539a034a99c24c824
6+
checksum_sha1: 514c2b60f10521988063a9e6b56e3fae24b393c7
7+
package_url: pkg:pypi/boolean.py@3.7
8+
licenses:
9+
- key: bsd-simplified
10+
name: BSD-2-Clause
11+
file: bsd-simplified.LICENSE
12+
name: boolean.py
13+
version: '3.7'

thirdparty/prod/boolean.py-3.6-py2.py3-none-any.whl.NOTICE renamed to thirdparty/prod/boolean.py-3.7-py2.py3-none-any.whl.NOTICE

File renamed without changes.

0 commit comments

Comments
 (0)