diff options
| author | mo khan <mo.khan@gmail.com> | 2020-03-31 16:35:33 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-03-31 16:35:33 +0000 |
| commit | fec5e888a10f6d6c0a64d17242d293fc9da6d3d2 (patch) | |
| tree | 92e14683798648106e573555ed4a97658dfb7122 /spec/fixtures/expected | |
| parent | d0ff10b6ae1075a13827e00dd0120fac9639fde8 (diff) | |
| parent | 67e1de7e57a843622a824f68e4ffb40d8b9ff320 (diff) | |
Merge branch '199059-setup-py' into 'master'v3.3.0
Use virtualenv and pip-licenses to scan python projects
See merge request gitlab-org/security-products/license-management!128
Diffstat (limited to 'spec/fixtures/expected')
| -rw-r--r-- | spec/fixtures/expected/python/2/pip/v2.0.json | 14 | ||||
| -rw-r--r-- | spec/fixtures/expected/python/3/pip/v2.0.json | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/spec/fixtures/expected/python/2/pip/v2.0.json b/spec/fixtures/expected/python/2/pip/v2.0.json index 1e675ff..8ed6ee7 100644 --- a/spec/fixtures/expected/python/2/pip/v2.0.json +++ b/spec/fixtures/expected/python/2/pip/v2.0.json @@ -20,6 +20,12 @@ "count": 1 }, { + "id": "MIT-CMU", + "name": "CMU License", + "url": "https://github.com/python-pillow/Pillow/blob/fffb426092c8db24a5f4b6df243a8a3c01fb63cd/LICENSE", + "count": 1 + }, + { "id": "copyright (c) 2015, julien fache", "name": "Copyright (c) 2015, Julien Fache", "url": "", @@ -30,12 +36,6 @@ "name": "Python License 2.0", "url": "https://opensource.org/licenses/Python-2.0", "count": 1 - }, - { - "id": "standard pil license", - "name": "Standard PIL License", - "url": "", - "count": 1 } ], "dependencies": [ @@ -58,7 +58,7 @@ "." ], "licenses": [ - "standard pil license" + "MIT-CMU" ] }, { diff --git a/spec/fixtures/expected/python/3/pip/v2.0.json b/spec/fixtures/expected/python/3/pip/v2.0.json index 5d885ee..b5c23ae 100644 --- a/spec/fixtures/expected/python/3/pip/v2.0.json +++ b/spec/fixtures/expected/python/3/pip/v2.0.json @@ -26,6 +26,12 @@ "count": 1 }, { + "id": "MIT-CMU", + "name": "CMU License", + "url": "https://github.com/python-pillow/Pillow/blob/fffb426092c8db24a5f4b6df243a8a3c01fb63cd/LICENSE", + "count": 1 + }, + { "id": "copyright (c) 2015, julien fache", "name": "Copyright (c) 2015, Julien Fache", "url": "", @@ -36,12 +42,6 @@ "name": "Python License 2.0", "url": "https://opensource.org/licenses/Python-2.0", "count": 1 - }, - { - "id": "standard pil license", - "name": "Standard PIL License", - "url": "", - "count": 1 } ], "dependencies": [ @@ -64,7 +64,7 @@ "." ], "licenses": [ - "standard pil license" + "MIT-CMU" ] }, { |