Skip to content

Commit 8a0a030

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Rename license match attribute for spdx expression
Reference: #3838 Reported-by: Armijn Hemel Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent e26187a commit 8a0a030

File tree

821 files changed

+4972
-4972
lines changed

Some content is hidden

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

821 files changed

+4972
-4972
lines changed

‎src/licensedcode/match.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ def to_dict(
794794
result = {}
795795

796796
result['license_expression'] = self.rule.license_expression
797-
result['spdx_license_expression'] = self.rule.spdx_license_expression()
797+
result['license_expression_spdx'] = self.rule.spdx_license_expression()
798798
result['from_file'] = file_path
799799
result['start_line'] = self.start_line
800800
result['end_line'] = self.end_line

‎tests/cluecode/data/plugin_filter_clues/filtered-expected.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"matches": [
5353
{
5454
"license_expression": "apache-1.1",
55-
"spdx_license_expression": "Apache-1.1",
55+
"license_expression_spdx": "Apache-1.1",
5656
"from_file": "LICENSE",
5757
"start_line": 7,
5858
"end_line": 70,

‎tests/cluecode/data/plugin_filter_clues/filtered-expected2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"matches": [
5353
{
5454
"license_expression": "pygres-2.2",
55-
"spdx_license_expression": "LicenseRef-scancode-pygres-2.2",
55+
"license_expression_spdx": "LicenseRef-scancode-pygres-2.2",
5656
"from_file": "LICENSE2",
5757
"start_line": 7,
5858
"end_line": 22,

‎tests/cluecode/data/plugin_filter_clues/filtered-expected3.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"matches": [
5353
{
5454
"license_expression": "pcre",
55-
"spdx_license_expression": "LicenseRef-scancode-pcre",
55+
"license_expression_spdx": "LicenseRef-scancode-pcre",
5656
"from_file": "LICENSE3",
5757
"start_line": 1,
5858
"end_line": 47,

‎tests/cluecode/data/plugin_filter_clues/filtered-expected4.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164
"matches": [
165165
{
166166
"license_expression": "gpl-1.0-plus OR artistic-1.0",
167-
"spdx_license_expression": "GPL-1.0-or-later OR Artistic-1.0",
167+
"license_expression_spdx": "GPL-1.0-or-later OR Artistic-1.0",
168168
"from_file": "LICENSE4",
169169
"start_line": 3,
170170
"end_line": 11,
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"license_expression": "gpl-1.0",
181-
"spdx_license_expression": "GPL-1.0-only",
181+
"license_expression_spdx": "GPL-1.0-only",
182182
"from_file": "LICENSE4",
183183
"start_line": 13,
184184
"end_line": 13,
@@ -192,7 +192,7 @@
192192
},
193193
{
194194
"license_expression": "gpl-1.0",
195-
"spdx_license_expression": "GPL-1.0-only",
195+
"license_expression_spdx": "GPL-1.0-only",
196196
"from_file": "LICENSE4",
197197
"start_line": 17,
198198
"end_line": 19,
@@ -206,7 +206,7 @@
206206
},
207207
{
208208
"license_expression": "gpl-1.0",
209-
"spdx_license_expression": "GPL-1.0-only",
209+
"license_expression_spdx": "GPL-1.0-only",
210210
"from_file": "LICENSE4",
211211
"start_line": 21,
212212
"end_line": 270,
@@ -220,7 +220,7 @@
220220
},
221221
{
222222
"license_expression": "artistic-1.0",
223-
"spdx_license_expression": "Artistic-1.0",
223+
"license_expression_spdx": "Artistic-1.0",
224224
"from_file": "LICENSE4",
225225
"start_line": 273,
226226
"end_line": 273,
@@ -234,7 +234,7 @@
234234
},
235235
{
236236
"license_expression": "artistic-1.0",
237-
"spdx_license_expression": "Artistic-1.0",
237+
"license_expression_spdx": "Artistic-1.0",
238238
"from_file": "LICENSE4",
239239
"start_line": 277,
240240
"end_line": 279,
@@ -248,7 +248,7 @@
248248
},
249249
{
250250
"license_expression": "artistic-1.0",
251-
"spdx_license_expression": "Artistic-1.0",
251+
"license_expression_spdx": "Artistic-1.0",
252252
"from_file": "LICENSE4",
253253
"start_line": 281,
254254
"end_line": 281,
@@ -262,7 +262,7 @@
262262
},
263263
{
264264
"license_expression": "artistic-1.0",
265-
"spdx_license_expression": "Artistic-1.0",
265+
"license_expression_spdx": "Artistic-1.0",
266266
"from_file": "LICENSE4",
267267
"start_line": 283,
268268
"end_line": 372,
@@ -276,7 +276,7 @@
276276
},
277277
{
278278
"license_expression": "warranty-disclaimer",
279-
"spdx_license_expression": "LicenseRef-scancode-warranty-disclaimer",
279+
"license_expression_spdx": "LicenseRef-scancode-warranty-disclaimer",
280280
"from_file": "LICENSE4",
281281
"start_line": 374,
282282
"end_line": 376,

‎tests/formattedcode/data/common/manifests-expected.json

+20-20
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"matches": [
3434
{
3535
"license_expression": "cddl-1.0",
36-
"spdx_license_expression": "CDDL-1.0",
36+
"license_expression_spdx": "CDDL-1.0",
3737
"from_file": "manifests/maven/persistence-api-1.0.pom",
3838
"start_line": 1,
3939
"end_line": 1,
@@ -48,7 +48,7 @@
4848
},
4949
{
5050
"license_expression": "cddl-1.0",
51-
"spdx_license_expression": "CDDL-1.0",
51+
"license_expression_spdx": "CDDL-1.0",
5252
"from_file": "manifests/maven/persistence-api-1.0.pom",
5353
"start_line": 2,
5454
"end_line": 2,
@@ -131,7 +131,7 @@
131131
"matches": [
132132
{
133133
"license_expression": "apache-2.0",
134-
"spdx_license_expression": "Apache-2.0",
134+
"license_expression_spdx": "Apache-2.0",
135135
"from_file": "manifests/npm-license-mapping/package.json",
136136
"start_line": 1,
137137
"end_line": 1,
@@ -153,7 +153,7 @@
153153
"matches": [
154154
{
155155
"license_expression": "apache-2.0",
156-
"spdx_license_expression": "Apache-2.0",
156+
"license_expression_spdx": "Apache-2.0",
157157
"from_file": "manifests/npm-license-mapping/package.json",
158158
"start_line": 1,
159159
"end_line": 1,
@@ -236,7 +236,7 @@
236236
"matches": [
237237
{
238238
"license_expression": "mit",
239-
"spdx_license_expression": "MIT",
239+
"license_expression_spdx": "MIT",
240240
"from_file": "manifests/npm-license-string/package.json",
241241
"start_line": 1,
242242
"end_line": 1,
@@ -876,7 +876,7 @@
876876
"matches": [
877877
{
878878
"license_expression": "cddl-1.0",
879-
"spdx_license_expression": "CDDL-1.0",
879+
"license_expression_spdx": "CDDL-1.0",
880880
"from_file": "manifests/maven/persistence-api-1.0.pom",
881881
"start_line": 1,
882882
"end_line": 1,
@@ -891,7 +891,7 @@
891891
},
892892
{
893893
"license_expression": "cddl-1.0",
894-
"spdx_license_expression": "CDDL-1.0",
894+
"license_expression_spdx": "CDDL-1.0",
895895
"from_file": "manifests/maven/persistence-api-1.0.pom",
896896
"start_line": 2,
897897
"end_line": 2,
@@ -940,7 +940,7 @@
940940
"matches": [
941941
{
942942
"license_expression": "unknown-license-reference",
943-
"spdx_license_expression": "LicenseRef-scancode-unknown-license-reference",
943+
"license_expression_spdx": "LicenseRef-scancode-unknown-license-reference",
944944
"from_file": "manifests/maven/persistence-api-1.0.pom",
945945
"start_line": 17,
946946
"end_line": 19,
@@ -954,7 +954,7 @@
954954
},
955955
{
956956
"license_expression": "cddl-1.0",
957-
"spdx_license_expression": "CDDL-1.0",
957+
"license_expression_spdx": "CDDL-1.0",
958958
"from_file": "manifests/maven/persistence-api-1.0.pom",
959959
"start_line": 18,
960960
"end_line": 20,
@@ -1077,7 +1077,7 @@
10771077
"matches": [
10781078
{
10791079
"license_expression": "apache-2.0",
1080-
"spdx_license_expression": "Apache-2.0",
1080+
"license_expression_spdx": "Apache-2.0",
10811081
"from_file": "manifests/npm-license-mapping/package.json",
10821082
"start_line": 1,
10831083
"end_line": 1,
@@ -1099,7 +1099,7 @@
10991099
"matches": [
11001100
{
11011101
"license_expression": "apache-2.0",
1102-
"spdx_license_expression": "Apache-2.0",
1102+
"license_expression_spdx": "Apache-2.0",
11031103
"from_file": "manifests/npm-license-mapping/package.json",
11041104
"start_line": 1,
11051105
"end_line": 1,
@@ -1261,7 +1261,7 @@
12611261
"matches": [
12621262
{
12631263
"license_expression": "apache-2.0",
1264-
"spdx_license_expression": "Apache-2.0",
1264+
"license_expression_spdx": "Apache-2.0",
12651265
"from_file": "manifests/npm-license-mapping/package.json",
12661266
"start_line": 6,
12671267
"end_line": 6,
@@ -1282,7 +1282,7 @@
12821282
"matches": [
12831283
{
12841284
"license_expression": "apache-2.0",
1285-
"spdx_license_expression": "Apache-2.0",
1285+
"license_expression_spdx": "Apache-2.0",
12861286
"from_file": "manifests/npm-license-mapping/package.json",
12871287
"start_line": 20,
12881288
"end_line": 20,
@@ -1409,7 +1409,7 @@
14091409
"matches": [
14101410
{
14111411
"license_expression": "mit",
1412-
"spdx_license_expression": "MIT",
1412+
"license_expression_spdx": "MIT",
14131413
"from_file": "manifests/npm-license-string/package.json",
14141414
"start_line": 1,
14151415
"end_line": 1,
@@ -1512,7 +1512,7 @@
15121512
"matches": [
15131513
{
15141514
"license_expression": "mit",
1515-
"spdx_license_expression": "MIT",
1515+
"license_expression_spdx": "MIT",
15161516
"from_file": "manifests/npm-license-string/package.json",
15171517
"start_line": 4,
15181518
"end_line": 4,
@@ -1643,7 +1643,7 @@
16431643
"matches": [
16441644
{
16451645
"license_expression": "lgpl-3.0",
1646-
"spdx_license_expression": "LGPL-3.0-only",
1646+
"license_expression_spdx": "LGPL-3.0-only",
16471647
"from_file": "manifests/pypi/bluepyopt_setup.py",
16481648
"start_line": 1,
16491649
"end_line": 1,
@@ -1665,7 +1665,7 @@
16651665
"matches": [
16661666
{
16671667
"license_expression": "lgpl-3.0",
1668-
"spdx_license_expression": "LGPL-3.0-only",
1668+
"license_expression_spdx": "LGPL-3.0-only",
16691669
"from_file": "manifests/pypi/bluepyopt_setup.py",
16701670
"start_line": 1,
16711671
"end_line": 1,
@@ -1832,7 +1832,7 @@
18321832
"matches": [
18331833
{
18341834
"license_expression": "lgpl-3.0",
1835-
"spdx_license_expression": "LGPL-3.0-only",
1835+
"license_expression_spdx": "LGPL-3.0-only",
18361836
"from_file": "manifests/pypi/bluepyopt_setup.py",
18371837
"start_line": 9,
18381838
"end_line": 20,
@@ -1853,7 +1853,7 @@
18531853
"matches": [
18541854
{
18551855
"license_expression": "lgpl-3.0",
1856-
"spdx_license_expression": "LGPL-3.0-only",
1856+
"license_expression_spdx": "LGPL-3.0-only",
18571857
"from_file": "manifests/pypi/bluepyopt_setup.py",
18581858
"start_line": 65,
18591859
"end_line": 65,
@@ -1874,7 +1874,7 @@
18741874
"matches": [
18751875
{
18761876
"license_expression": "lgpl-3.0",
1877-
"spdx_license_expression": "LGPL-3.0-only",
1877+
"license_expression_spdx": "LGPL-3.0-only",
18781878
"from_file": "manifests/pypi/bluepyopt_setup.py",
18791879
"start_line": 74,
18801880
"end_line": 75,

0 commit comments

Comments
 (0)