Skip to content

Commit 38e288c

Browse files
JonoYangJonoYang
committed
Update get_key_files behavior
 * Just tag whether or not a file is top-level or not Signed-off-by: Jono Yang <[email protected]>
1 parent 89043bd commit 38e288c

File tree

13 files changed

+588
-591
lines changed

13 files changed

+588
-591
lines changed

‎src/summarycode/classify.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,5 @@ def set_classification_flags(resource,
122122
# FIXME: this will never be picked up as this is NOT available in a pre-scan plugin
123123
has_package_data = bool(getattr(resource, 'package_data', False))
124124
resource.is_manifest = is_manifest = path.endswith(_MANIF) or has_package_data
125-
if not resource.is_key_file:
126-
resource.is_key_file = (resource.is_top_level and (is_readme or is_legal or is_manifest))
125+
resource.is_key_file = (resource.is_top_level and (is_readme or is_legal or is_manifest))
127126
return resource

‎src/summarycode/classify_plugin.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ def process_codebase(self, codebase, classify, **kwargs):
135135
if not key_files:
136136
break
137137
for key_file in key_files:
138-
if key_file.is_file:
139-
key_file.is_key_file = True
140138
key_file.is_top_level = True
141139
set_classification_flags(key_file)
142140
key_file.save(codebase)

‎tests/summarycode/data/score/jar-expected.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@
355355
"is_manifest": false,
356356
"is_readme": false,
357357
"is_top_level": true,
358-
"is_key_file": true,
358+
"is_key_file": false,
359359
"detected_license_expression": null,
360360
"detected_license_expression_spdx": null,
361361
"license_detections": [],
@@ -620,7 +620,7 @@
620620
"is_manifest": false,
621621
"is_readme": false,
622622
"is_top_level": true,
623-
"is_key_file": true,
623+
"is_key_file": false,
624624
"detected_license_expression": null,
625625
"detected_license_expression_spdx": null,
626626
"license_detections": [],

‎tests/summarycode/data/summary/conflicting_license_categories/conflicting_license_categories.expected.json

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
{
2+
"packages": [],
3+
"dependencies": [],
4+
"license_detections": [
5+
{
6+
"identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
7+
"license_expression": "apache-2.0",
8+
"detection_count": 1
9+
},
10+
{
11+
"identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
12+
"license_expression": "mit",
13+
"detection_count": 1
14+
},
15+
{
16+
"identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
17+
"license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
18+
"detection_count": 1
19+
},
20+
{
21+
"identifier": "gpl_1_0_plus_and_gpl_2_0_and_gpl_2_0_plus-d3814696-f4d1-6a85-1134-6baea31b797a",
22+
"license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
23+
"detection_count": 1
24+
}
25+
],
226
"summary": {
327
"declared_license_expression": "apache-2.0 AND mit",
428
"license_clarity_score": {
@@ -46,30 +70,6 @@
4670
],
4771
"other_languages": []
4872
},
49-
"packages": [],
50-
"dependencies": [],
51-
"license_detections": [
52-
{
53-
"identifier": "apache_2_0-9804422e-94ac-ad40-b53a-ee6f8ddb7a3b",
54-
"license_expression": "apache-2.0",
55-
"detection_count": 1
56-
},
57-
{
58-
"identifier": "mit-cacd5c0c-204a-85c2-affc-e4c125b2492a",
59-
"license_expression": "mit",
60-
"detection_count": 1
61-
},
62-
{
63-
"identifier": "apache_2_0_and__apache_2_0_or_mit-9b638e72-e872-a67f-3447-eec297ef7b39",
64-
"license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
65-
"detection_count": 1
66-
},
67-
{
68-
"identifier": "gpl_1_0_plus_and_gpl_2_0_and_gpl_2_0_plus-d3814696-f4d1-6a85-1134-6baea31b797a",
69-
"license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
70-
"detection_count": 1
71-
}
72-
],
7373
"files": [
7474
{
7575
"path": "codebase",
@@ -92,6 +92,11 @@
9292
"is_script": false,
9393
"package_data": [],
9494
"for_packages": [],
95+
"is_legal": false,
96+
"is_manifest": false,
97+
"is_readme": false,
98+
"is_top_level": true,
99+
"is_key_file": false,
95100
"detected_license_expression": null,
96101
"detected_license_expression_spdx": null,
97102
"license_detections": [],
@@ -100,11 +105,6 @@
100105
"copyrights": [],
101106
"holders": [],
102107
"authors": [],
103-
"is_legal": false,
104-
"is_manifest": false,
105-
"is_readme": false,
106-
"is_top_level": true,
107-
"is_key_file": false,
108108
"files_count": 5,
109109
"dirs_count": 2,
110110
"size_count": 11417,
@@ -131,6 +131,11 @@
131131
"is_script": false,
132132
"package_data": [],
133133
"for_packages": [],
134+
"is_legal": false,
135+
"is_manifest": false,
136+
"is_readme": true,
137+
"is_top_level": true,
138+
"is_key_file": true,
134139
"detected_license_expression": null,
135140
"detected_license_expression_spdx": null,
136141
"license_detections": [],
@@ -151,11 +156,6 @@
151156
}
152157
],
153158
"authors": [],
154-
"is_legal": false,
155-
"is_manifest": false,
156-
"is_readme": true,
157-
"is_top_level": true,
158-
"is_key_file": true,
159159
"files_count": 0,
160160
"dirs_count": 0,
161161
"size_count": 0,
@@ -182,6 +182,11 @@
182182
"is_script": false,
183183
"package_data": [],
184184
"for_packages": [],
185+
"is_legal": true,
186+
"is_manifest": false,
187+
"is_readme": false,
188+
"is_top_level": true,
189+
"is_key_file": true,
185190
"detected_license_expression": "apache-2.0",
186191
"detected_license_expression_spdx": "Apache-2.0",
187192
"license_detections": [
@@ -209,11 +214,6 @@
209214
"copyrights": [],
210215
"holders": [],
211216
"authors": [],
212-
"is_legal": true,
213-
"is_manifest": false,
214-
"is_readme": false,
215-
"is_top_level": true,
216-
"is_key_file": true,
217217
"files_count": 0,
218218
"dirs_count": 0,
219219
"size_count": 0,
@@ -240,6 +240,11 @@
240240
"is_script": false,
241241
"package_data": [],
242242
"for_packages": [],
243+
"is_legal": true,
244+
"is_manifest": false,
245+
"is_readme": false,
246+
"is_top_level": true,
247+
"is_key_file": true,
243248
"detected_license_expression": "mit",
244249
"detected_license_expression_spdx": "MIT",
245250
"license_detections": [
@@ -267,11 +272,6 @@
267272
"copyrights": [],
268273
"holders": [],
269274
"authors": [],
270-
"is_legal": true,
271-
"is_manifest": false,
272-
"is_readme": false,
273-
"is_top_level": true,
274-
"is_key_file": true,
275275
"files_count": 0,
276276
"dirs_count": 0,
277277
"size_count": 0,
@@ -298,6 +298,11 @@
298298
"is_script": false,
299299
"package_data": [],
300300
"for_packages": [],
301+
"is_legal": false,
302+
"is_manifest": false,
303+
"is_readme": false,
304+
"is_top_level": true,
305+
"is_key_file": false,
301306
"detected_license_expression": null,
302307
"detected_license_expression_spdx": null,
303308
"license_detections": [],
@@ -306,11 +311,6 @@
306311
"copyrights": [],
307312
"holders": [],
308313
"authors": [],
309-
"is_legal": false,
310-
"is_manifest": false,
311-
"is_readme": false,
312-
"is_top_level": true,
313-
"is_key_file": false,
314314
"files_count": 1,
315315
"dirs_count": 0,
316316
"size_count": 119,
@@ -337,6 +337,11 @@
337337
"is_script": true,
338338
"package_data": [],
339339
"for_packages": [],
340+
"is_legal": false,
341+
"is_manifest": false,
342+
"is_readme": false,
343+
"is_top_level": false,
344+
"is_key_file": false,
340345
"detected_license_expression": "apache-2.0 AND (apache-2.0 OR mit)",
341346
"detected_license_expression_spdx": "Apache-2.0 AND (Apache-2.0 OR MIT)",
342347
"license_detections": [
@@ -398,11 +403,6 @@
398403
}
399404
],
400405
"authors": [],
401-
"is_legal": false,
402-
"is_manifest": false,
403-
"is_readme": false,
404-
"is_top_level": false,
405-
"is_key_file": false,
406406
"files_count": 0,
407407
"dirs_count": 0,
408408
"size_count": 0,
@@ -429,6 +429,11 @@
429429
"is_script": false,
430430
"package_data": [],
431431
"for_packages": [],
432+
"is_legal": false,
433+
"is_manifest": false,
434+
"is_readme": false,
435+
"is_top_level": true,
436+
"is_key_file": false,
432437
"detected_license_expression": null,
433438
"detected_license_expression_spdx": null,
434439
"license_detections": [],
@@ -437,11 +442,6 @@
437442
"copyrights": [],
438443
"holders": [],
439444
"authors": [],
440-
"is_legal": false,
441-
"is_manifest": false,
442-
"is_readme": false,
443-
"is_top_level": true,
444-
"is_key_file": false,
445445
"files_count": 1,
446446
"dirs_count": 0,
447447
"size_count": 67,
@@ -468,6 +468,11 @@
468468
"is_script": false,
469469
"package_data": [],
470470
"for_packages": [],
471+
"is_legal": false,
472+
"is_manifest": false,
473+
"is_readme": false,
474+
"is_top_level": false,
475+
"is_key_file": false,
471476
"detected_license_expression": "gpl-1.0-plus AND gpl-2.0 AND gpl-2.0-plus",
472477
"detected_license_expression_spdx": "GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later",
473478
"license_detections": [
@@ -531,11 +536,6 @@
531536
}
532537
],
533538
"authors": [],
534-
"is_legal": false,
535-
"is_manifest": false,
536-
"is_readme": false,
537-
"is_top_level": false,
538-
"is_key_file": false,
539539
"files_count": 0,
540540
"dirs_count": 0,
541541
"size_count": 0,

0 commit comments

Comments
 (0)