Skip to content

Commit c7fd59a

Browse files
committed
Rename asserted_license to declared_licensing #275
Using "licensing" rather than license makes it clear that this is not a normalized scancode "license" but is instead the original, as "asserted" or "declared" licensing in a package manifest. Declared is the term used by SPDX. Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent 079d976 commit c7fd59a

File tree

567 files changed

+1003
-763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

567 files changed

+1003
-763
lines changed

etc/scripts/json2csv.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -241,13 +241,6 @@ def collect_keys(mapping, key_group):
241241
# All copyright statements are joined in a single multiline value
242242
pack[nk] = '\n'.join(val)
243243

244-
elif k == 'asserted_licenses':
245-
# FIXME: we only keep some license data for now
246-
# All licenses are joined in a single multi-line value
247-
licenses = [license_info.get('license') for license_info in val]
248-
licenses = [lic for lic in licenses if lic]
249-
pack[nk] = '\n'.join(licenses)
250-
251244
collect_keys(pack, 'package')
252245
yield pack
253246

etc/scripts/sch2js/doc/Dependency-json-schema.json

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-04/schema#",
3+
"id": "",
4+
"type": "object",
5+
"title": "dependent package",
6+
"description": "An identifiable dependent package package object.",
7+
"properties": {
8+
"purl": {
9+
"oneOf": [
10+
{
11+
"type": "string",
12+
"title": "Dependent package URL",
13+
"description": "A compact purl package URL"
14+
},
15+
{
16+
"type": "null"
17+
}
18+
]
19+
},
20+
"requirement": {
21+
"oneOf": [
22+
{
23+
"type": "string",
24+
"title": "dependent package version requirement",
25+
"description": "A string defining version(s)requirements. Package-type specific."
26+
},
27+
{
28+
"type": "null"
29+
}
30+
]
31+
},
32+
"scope": {
33+
"oneOf": [
34+
{
35+
"type": "string",
36+
"title": "dependency scope",
37+
"description": "The scope of this dependency, such as runtime, install, etc. This is package-type specific and is the original scope string."
38+
},
39+
{
40+
"type": "null"
41+
}
42+
]
43+
},
44+
"is_runtime": {
45+
"oneOf": [
46+
{
47+
"type": "boolean",
48+
"title": "is optional flag",
49+
"description": "True if this dependency is an optional dependency"
50+
},
51+
{
52+
"type": "null"
53+
}
54+
]
55+
},
56+
"is_optional": {
57+
"oneOf": [
58+
{
59+
"type": "boolean"
60+
},
61+
{
62+
"type": "null"
63+
}
64+
]
65+
},
66+
"is_resolved": {
67+
"oneOf": [
68+
{
69+
"type": "boolean",
70+
"title": "is resolved flag",
71+
"description": "True if this dependency version requirement has been resolved and this dependency url points to an exact version."
72+
},
73+
{
74+
"type": "null"
75+
}
76+
]
77+
}
78+
}
79+
}

0 commit comments

Comments
 (0)