Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade ScanCode-toolkit to version 30.0.1 #330

Merged
merged 7 commits into from
Sep 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

### Unreleased

- Upgrade ScanCode-toolkit to version 30.1.0

- Add a SCANCODEIO_REST_API_PAGE_SIZE setting to control the number of objects
returned per page in the REST API.
https://github.com/nexB/scancode.io/issues/328
Expand Down
Binary file modified etc/thirdparty/virtualenv.pyz
Binary file not shown.
6 changes: 3 additions & 3 deletions etc/thirdparty/virtualenv.pyz.ABOUT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
about_resource: virtualenv.pyz
name: get-virtualenv
version: 20.7.0
download_url: https://github.com/pypa/get-virtualenv/raw/20.7.0/public/virtualenv.pyz
version: 20.8.0
download_url: https://github.com/pypa/get-virtualenv/raw/20.8.0/public/virtualenv.pyz
description: virtualenv is a tool to create isolated Python environments.
homepage_url: https://github.com/pypa/virtualenv
license_expression: lgpl-2.1-plus AND (bsd-new OR apache-2.0) AND mit AND python AND bsd-new
Expand All @@ -10,4 +10,4 @@ copyright: Copyright (c) The Python Software Foundation and others
redistribute: yes
attribute: yes
track_changes: yes
package_url: pkg:github/pypa/get-virtualenv@20.7.0#public/virtualenv.pyz
package_url: pkg:github/pypa/get-virtualenv@20.8.0#public/virtualenv.pyz
5 changes: 5 additions & 0 deletions scancodeio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

import os
import sys
import warnings
from pathlib import Path

from django.conf import settings
Expand All @@ -35,6 +36,10 @@
SCAN_NOTICE = Path(__file__).resolve().parent.joinpath("scan.NOTICE").read_text()


# Turn off the warnings from the `parameter_expansion` module.
warnings.filterwarnings("ignore", module="parameter_expansion")


# Resolve and set the workspace location from the settings.
WORKSPACE_LOCATION = str(Path(settings.SCANCODEIO_WORKSPACE_LOCATION).resolve())

Expand Down
23 changes: 15 additions & 8 deletions scanpipe/tests/data/is-npm-1.0.0_scan_codebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,30 @@
"headers": [
{
"tool_name": "scancode-toolkit",
"tool_version": "21.8.4",
"tool_version": "30.0.0",
"options": {
"input": [
"/private/var/folders/9g/tyhtzf892s7fz0slkrjr00y80000gn/T/tmpvmetnjpz/projects/analysis-e162d559/codebase"
"/private/var/folders/9g/tyhtzf892s7fz0slkrjr00y80000gn/T/tmp4amsms81/projects/analysis-1bc069d1/codebase"
],
"--copyright": true,
"--email": true,
"--info": true,
"--json-pp": "/private/var/folders/9g/tyhtzf892s7fz0slkrjr00y80000gn/T/tmpvmetnjpz/projects/analysis-e162d559/output/scancode-2021-08-31-13-17-58.json",
"--json-pp": "/private/var/folders/9g/tyhtzf892s7fz0slkrjr00y80000gn/T/tmp4amsms81/projects/analysis-1bc069d1/output/scancode-2021-09-24-07-35-06.json",
"--license": true,
"--license-text": true,
"--package": true,
"--processes": "4",
"--url": true,
"--verbose": true
},
"notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
"start_timestamp": "2021-08-31T131759.285074",
"end_timestamp": "2021-08-31T131801.286781",
"duration": 2.001734972000122,
"start_timestamp": "2021-09-24T073507.973838",
"end_timestamp": "2021-09-24T073510.775932",
"output_format_version": "1.0.0",
"duration": 2.8021748065948486,
"message": null,
"errors": [],
"extra_data": {
"spdx_license_list_version": "3.14",
"files_count": 4
}
}
Expand Down Expand Up @@ -71,7 +72,7 @@
"base_name": "is-npm-1.0.0",
"extension": ".tgz",
"size": 756,
"date": "2021-08-31",
"date": "2021-09-24",
"sha1": "f2fb63a65e4905b406c86072765a1a4dc793b9f4",
"md5": "effb58881c1aca12da9d3a18335bdc3f",
"sha256": "89906b3f5e7c0bdc75d22ea509870f14b8164394e9e344f8c2ea8c590e550b14",
Expand Down Expand Up @@ -228,6 +229,7 @@
"short_name": "MIT License",
"category": "Permissive",
"is_exception": false,
"is_unknown": false,
"owner": "MIT",
"homepage_url": "http://opensource.org/licenses/mit-license.php",
"text_url": "http://opensource.org/licenses/mit-license.php",
Expand All @@ -244,11 +246,13 @@
"licenses": [
"mit"
],
"referenced_filenames": [],
"is_license_text": false,
"is_license_notice": false,
"is_license_reference": false,
"is_license_tag": true,
"is_license_intro": false,
"has_unknown": false,
"matcher": "2-aho",
"rule_length": 2,
"matched_length": 2,
Expand Down Expand Up @@ -376,6 +380,7 @@
"short_name": "MIT License",
"category": "Permissive",
"is_exception": false,
"is_unknown": false,
"owner": "MIT",
"homepage_url": "http://opensource.org/licenses/mit-license.php",
"text_url": "http://opensource.org/licenses/mit-license.php",
Expand All @@ -392,11 +397,13 @@
"licenses": [
"mit"
],
"referenced_filenames": [],
"is_license_text": false,
"is_license_notice": false,
"is_license_reference": false,
"is_license_tag": true,
"is_license_intro": false,
"has_unknown": false,
"matcher": "2-aho",
"rule_length": 2,
"matched_length": 2,
Expand Down
54 changes: 19 additions & 35 deletions scanpipe/tests/data/is-npm-1.0.0_scan_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,37 @@
"headers": [
{
"tool_name": "scancode-toolkit",
"tool_version": "21.7.30",
"tool_version": "30.1.0",
"options": {
"input": [
"/tmp/tmpkzp1f_pw/projects/analysis-03087122/codebase"
"/tmp/tmp9zcsy8i8/projects/analysis-97db36b0/codebase"
],
"--classify": true,
"--consolidate": true,
"--copyright": true,
"--email": true,
"--info": true,
"--is-license-text": true,
"--json-pp": "/tmp/tmpkzp1f_pw/projects/analysis-03087122/output/scancode-2021-08-03-19-09-26.json",
"--json-pp": "/tmp/tmp9zcsy8i8/projects/analysis-97db36b0/output/scancode-2021-09-25-12-04-14.json",
"--license": true,
"--license-clarity-score": true,
"--license-text": true,
"--package": true,
"--processes": "7",
"--summary": true,
"--summary-key-files": true,
"--url": true
"--url": true,
"--verbose": true
},
"notice": "Generated with ScanCode and provided on an \"AS IS\" BASIS, WITHOUT WARRANTIES\nOR CONDITIONS OF ANY KIND, either express or implied. No content created from\nScanCode should be considered or used as legal advice. Consult an Attorney\nfor any legal advice.\nScanCode is a free software code scanning tool from nexB Inc. and others.\nVisit https://github.com/nexB/scancode-toolkit/ for support and download.",
"start_timestamp": "2021-08-03T190927.407466",
"end_timestamp": "2021-08-03T190932.182255",
"duration": 4.774801015853882,
"start_timestamp": "2021-09-25T120415.382131",
"end_timestamp": "2021-09-25T120417.572376",
"output_format_version": "1.0.0",
"duration": 2.1902544498443604,
"message": null,
"errors": [],
"extra_data": {
"spdx_license_list_version": "3.14",
"files_count": 3
}
}
Expand Down Expand Up @@ -116,10 +120,6 @@
{
"value": "mit",
"count": 2
},
{
"value": null,
"count": 1
}
],
"copyrights": [
Expand Down Expand Up @@ -149,10 +149,6 @@
}
],
"programming_language": [
{
"value": null,
"count": 2
},
{
"value": "JavaScript",
"count": 1
Expand Down Expand Up @@ -245,37 +241,19 @@
}
],
"copyrights": [
{
"value": null,
"count": 1
},
{
"value": "(c) Sindre Sorhus (http://sindresorhus.com)",
"count": 1
}
],
"holders": [
{
"value": null,
"count": 1
},
{
"value": "Sindre Sorhus",
"count": 1
}
],
"authors": [
{
"value": null,
"count": 2
}
],
"programming_language": [
{
"value": null,
"count": 2
}
]
"authors": [],
"programming_language": []
},
"files": [
{
Expand Down Expand Up @@ -433,6 +411,7 @@
"short_name": "MIT License",
"category": "Permissive",
"is_exception": false,
"is_unknown": false,
"owner": "MIT",
"homepage_url": "http://opensource.org/licenses/mit-license.php",
"text_url": "http://opensource.org/licenses/mit-license.php",
Expand All @@ -449,11 +428,13 @@
"licenses": [
"mit"
],
"referenced_filenames": [],
"is_license_text": false,
"is_license_notice": false,
"is_license_reference": false,
"is_license_tag": true,
"is_license_intro": false,
"has_unknown": false,
"matcher": "2-aho",
"rule_length": 2,
"matched_length": 2,
Expand Down Expand Up @@ -596,6 +577,7 @@
"short_name": "MIT License",
"category": "Permissive",
"is_exception": false,
"is_unknown": false,
"owner": "MIT",
"homepage_url": "http://opensource.org/licenses/mit-license.php",
"text_url": "http://opensource.org/licenses/mit-license.php",
Expand All @@ -612,11 +594,13 @@
"licenses": [
"mit"
],
"referenced_filenames": [],
"is_license_text": false,
"is_license_notice": false,
"is_license_reference": false,
"is_license_tag": true,
"is_license_intro": false,
"has_unknown": false,
"matcher": "2-aho",
"rule_length": 2,
"matched_length": 2,
Expand Down
Loading