Skip to content

Commit e4cc6c3

Browse files
committed
tools/license.sh: recognize Python-2.0 and [email protected], and correct yarn.lock
* Python-2.0 is a notice type license https://www.npmjs.com/package/argparse * We updated to [email protected] https://go-review.googlesource.com/c/vscode-go/+/369740 https://www.npmjs.com/package/json-schema: Code is licensed under the AFL or BSD 3-Clause license. Both AFL and BSD 3-Clause are notice type. Change-Id: I6275c18339fcdf3f78d06871989aee61d74176bb Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/370656 Trust: Hyang-Ah Hana Kim <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]> Trust: Nooras Saba‎ <[email protected]> Reviewed-by: Polina Sokolova <[email protected]>
1 parent ed978a6 commit e4cc6c3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

tools/license.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ export GIT_GOFMT_HOOK=off
2626

2727
YARN="${ROOT}/node_modules/.bin/yarn"
2828

29+
# convert packages-lock.json to yarn.lock
30+
$YARN import
31+
2932
ALL_LICENSES=$(
3033
$YARN licenses list --json --no-progress 2>/dev/null|
3134
jq 'select(.type == "table") | .data.body | map( {name: .[0], version: .[1], license: .[2], url: .[3], verndor: .[4], vendorName: .[5]} )')
@@ -43,9 +46,10 @@ NG=$(echo "${ALL_LICENSES}" | jq '
4346
"(MIT OR Apache-2.0)": 1,
4447
"(MIT AND Zlib)": 1,
4548
"(MIT AND BSD-3-Clause)": 1,
49+
"Python-2.0": 1,
4650
} as $allowed_licenses |
4751
{
48-
"json-schema@0.2.3": 1,
52+
"json-schema@0.4.0": 1,
4953
} as $allow_list |
5054
.[] | select(.license | in($allowed_licenses) | not)
5155
| select((.name+"@"+.version) | in($allow_list) | not) ')

0 commit comments

Comments
 (0)