Skip to content

Commit 9da6fb2

Browse files
AyanSinhaMahapatraAyanSinhaMahapatra
committed
Fix test failures and disable tracing
Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
1 parent 07cd836 commit 9da6fb2

File tree

12 files changed

+70
-70
lines changed

12 files changed

+70
-70
lines changed

‎src/licensedcode/match.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
The filter functions are executed in a specific sequence over the list of matches.
4343
"""
4444

45-
TRACE = True
46-
TRACE_MERGE = True
45+
TRACE = False
46+
TRACE_MERGE = False
4747
TRACE_REFINE = False
4848
TRACE_FILTER_FALSE_POSITIVE = False
4949
TRACE_FILTER_CONTAINED = False

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@
325325
"matches": [
326326
{
327327
"license_expression": "lgpl-3.0",
328-
"spdx_license_expression": "LGPL-3.0-only",
328+
"license_expression_spdx": "LGPL-3.0-only",
329329
"from_file": "manifests/pypi/bluepyopt_setup.py",
330330
"start_line": 1,
331331
"end_line": 1,
@@ -347,7 +347,7 @@
347347
"matches": [
348348
{
349349
"license_expression": "lgpl-3.0",
350-
"spdx_license_expression": "LGPL-3.0-only",
350+
"license_expression_spdx": "LGPL-3.0-only",
351351
"from_file": "manifests/pypi/bluepyopt_setup.py",
352352
"start_line": 1,
353353
"end_line": 1,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
"system_environment": {
2121
"operating_system": "linux",
2222
"cpu_architecture": "64",
23-
"platform": "Linux-5.15.0-116-generic-x86_64-with-glibc2.35",
24-
"platform_version": "#126-Ubuntu SMP Mon Jul 1 10:14:24 UTC 2024",
25-
"python_version": "3.10.12 (main, Mar 22 2024, 16:50:05) [GCC 11.4.0]"
23+
"platform": "Linux-5.15.0-122-generic-x86_64-with-glibc2.35",
24+
"platform_version": "#132-Ubuntu SMP Thu Aug 29 13:45:52 UTC 2024",
25+
"python_version": "3.10.12 (main, Sep 11 2024, 15:47:36) [GCC 11.4.0]"
2626
},
27-
"spdx_license_list_version": "3.24",
27+
"spdx_license_list_version": "3.25",
2828
"files_count": 4
2929
}
3030
}
@@ -357,7 +357,7 @@
357357
"matches": [
358358
{
359359
"license_expression": "lgpl-3.0",
360-
"spdx_license_expression": "LGPL-3.0-only",
360+
"license_expression_spdx": "LGPL-3.0-only",
361361
"from_file": "manifests/pypi/bluepyopt_setup.py",
362362
"start_line": 1,
363363
"end_line": 1,
@@ -379,7 +379,7 @@
379379
"matches": [
380380
{
381381
"license_expression": "lgpl-3.0",
382-
"spdx_license_expression": "LGPL-3.0-only",
382+
"license_expression_spdx": "LGPL-3.0-only",
383383
"from_file": "manifests/pypi/bluepyopt_setup.py",
384384
"start_line": 1,
385385
"end_line": 1,

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ headers:
2929
system_environment:
3030
operating_system: linux
3131
cpu_architecture: 64
32-
platform: Linux-6.5.0-1025-oem-x86_64-with-glibc2.35
33-
platform_version: '#26-Ubuntu SMP PREEMPT_DYNAMIC Tue Jun 18 12:35:22 UTC 2024'
34-
python_version: 3.11.8 (main, Feb 12 2024, 14:25:06) [GCC 11.4.0]
32+
platform: Linux-5.15.0-122-generic-x86_64-with-glibc2.35
33+
platform_version: '#132-Ubuntu SMP Thu Aug 29 13:45:52 UTC 2024'
34+
python_version: 3.10.12 (main, Sep 11 2024, 15:47:36) [GCC 11.4.0]
3535
spdx_license_list_version: '3.25'
3636
files_count: 4
3737
summary:
@@ -340,7 +340,7 @@ packages:
340340
license_expression_spdx: LGPL-3.0-only
341341
matches:
342342
- license_expression: lgpl-3.0
343-
spdx_license_expression: LGPL-3.0-only
343+
license_expression_spdx: LGPL-3.0-only
344344
from_file: manifests/pypi/bluepyopt_setup.py
345345
start_line: 1
346346
end_line: 1
@@ -357,7 +357,7 @@ packages:
357357
license_expression_spdx: LGPL-3.0-only
358358
matches:
359359
- license_expression: lgpl-3.0
360-
spdx_license_expression: LGPL-3.0-only
360+
license_expression_spdx: LGPL-3.0-only
361361
from_file: manifests/pypi/bluepyopt_setup.py
362362
start_line: 1
363363
end_line: 1

‎tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/libgcrypt20/copyright-detailed.expected.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ license_detections:
2323
GPL-2.0-or-later)
2424
matches:
2525
- license_expression: gpl-2.0-plus
26-
spdx_license_expression: GPL-2.0-or-later
26+
license_expression_spdx: GPL-2.0-or-later
2727
from_file:
2828
start_line: 210
2929
end_line: 211

‎tests/packagedcode/data/license_detection/reference-to-package/fusiondirectory.expected.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7674,7 +7674,7 @@
76747674
"matches": [
76757675
{
76767676
"license_expression": "lgpl-3.0",
7677-
"spdx_license_expression": "LGPL-3.0-only",
7677+
"license_expression_spdx": "LGPL-3.0-only",
76787678
"from_file": "fusiondirectory/debian/copyright.in",
76797679
"start_line": 2925,
76807680
"end_line": 2925,
@@ -7986,7 +7986,7 @@
79867986
"matches": [
79877987
{
79887988
"license_expression": "mit",
7989-
"spdx_license_expression": "MIT",
7989+
"license_expression_spdx": "MIT",
79907990
"from_file": "fusiondirectory/debian/copyright.in",
79917991
"start_line": 3010,
79927992
"end_line": 3010,
@@ -8002,7 +8002,7 @@
80028002
},
80038003
{
80048004
"license_expression": "other-permissive",
8005-
"spdx_license_expression": "LicenseRef-scancode-other-permissive",
8005+
"license_expression_spdx": "LicenseRef-scancode-other-permissive",
80068006
"from_file": "fusiondirectory/debian/copyright.in",
80078007
"start_line": 3010,
80088008
"end_line": 3010,
@@ -8026,7 +8026,7 @@
80268026
"matches": [
80278027
{
80288028
"license_expression": "public-domain",
8029-
"spdx_license_expression": "LicenseRef-scancode-public-domain",
8029+
"license_expression_spdx": "LicenseRef-scancode-public-domain",
80308030
"from_file": "fusiondirectory/debian/copyright.in",
80318031
"start_line": 3016,
80328032
"end_line": 3016,
@@ -8042,7 +8042,7 @@
80428042
},
80438043
{
80448044
"license_expression": "bsd-original",
8045-
"spdx_license_expression": "BSD-4-Clause",
8045+
"license_expression_spdx": "BSD-4-Clause",
80468046
"from_file": "fusiondirectory/debian/copyright.in",
80478047
"start_line": 3016,
80488048
"end_line": 3016,
@@ -8058,7 +8058,7 @@
80588058
},
80598059
{
80608060
"license_expression": "gpl-1.0-plus",
8061-
"spdx_license_expression": "GPL-1.0-or-later",
8061+
"license_expression_spdx": "GPL-1.0-or-later",
80628062
"from_file": "fusiondirectory/debian/copyright.in",
80638063
"start_line": 3016,
80648064
"end_line": 3016,
@@ -14402,7 +14402,7 @@
1440214402
"matches": [
1440314403
{
1440414404
"license_expression": "lgpl-3.0",
14405-
"spdx_license_expression": "LGPL-3.0-only",
14405+
"license_expression_spdx": "LGPL-3.0-only",
1440614406
"from_file": "fusiondirectory/debian/copyright.in",
1440714407
"start_line": 2925,
1440814408
"end_line": 2925,
@@ -14714,7 +14714,7 @@
1471414714
"matches": [
1471514715
{
1471614716
"license_expression": "mit",
14717-
"spdx_license_expression": "MIT",
14717+
"license_expression_spdx": "MIT",
1471814718
"from_file": "fusiondirectory/debian/copyright.in",
1471914719
"start_line": 3010,
1472014720
"end_line": 3010,
@@ -14730,7 +14730,7 @@
1473014730
},
1473114731
{
1473214732
"license_expression": "other-permissive",
14733-
"spdx_license_expression": "LicenseRef-scancode-other-permissive",
14733+
"license_expression_spdx": "LicenseRef-scancode-other-permissive",
1473414734
"from_file": "fusiondirectory/debian/copyright.in",
1473514735
"start_line": 3010,
1473614736
"end_line": 3010,
@@ -14754,7 +14754,7 @@
1475414754
"matches": [
1475514755
{
1475614756
"license_expression": "public-domain",
14757-
"spdx_license_expression": "LicenseRef-scancode-public-domain",
14757+
"license_expression_spdx": "LicenseRef-scancode-public-domain",
1475814758
"from_file": "fusiondirectory/debian/copyright.in",
1475914759
"start_line": 3016,
1476014760
"end_line": 3016,
@@ -14770,7 +14770,7 @@
1477014770
},
1477114771
{
1477214772
"license_expression": "bsd-original",
14773-
"spdx_license_expression": "BSD-4-Clause",
14773+
"license_expression_spdx": "BSD-4-Clause",
1477414774
"from_file": "fusiondirectory/debian/copyright.in",
1477514775
"start_line": 3016,
1477614776
"end_line": 3016,
@@ -14786,7 +14786,7 @@
1478614786
},
1478714787
{
1478814788
"license_expression": "gpl-1.0-plus",
14789-
"spdx_license_expression": "GPL-1.0-or-later",
14789+
"license_expression_spdx": "GPL-1.0-or-later",
1479014790
"from_file": "fusiondirectory/debian/copyright.in",
1479114791
"start_line": 3016,
1479214792
"end_line": 3016,

‎tests/packagedcode/data/license_detection/reference-to-package/paddlenlp.expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@
10551055
},
10561056
{
10571057
"license_expression": "apache-2.0",
1058-
"spdx_license_expression": "Apache-2.0",
1058+
"license_expression_spdx": "Apache-2.0",
10591059
"from_file": "paddlenlp/README_en.md",
10601060
"start_line": 8,
10611061
"end_line": 8,
@@ -1640,7 +1640,7 @@
16401640
},
16411641
{
16421642
"license_expression": "apache-2.0",
1643-
"spdx_license_expression": "Apache-2.0",
1643+
"license_expression_spdx": "Apache-2.0",
16441644
"from_file": "paddlenlp/README_en.md",
16451645
"start_line": 8,
16461646
"end_line": 8,

‎tests/packagedcode/data/license_detection/reference-to-package/samba.expected.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@
720720
"matches": [
721721
{
722722
"license_expression": "gpl-3.0",
723-
"spdx_license_expression": "GPL-3.0-only",
723+
"license_expression_spdx": "GPL-3.0-only",
724724
"from_file": "samba/README.contributing",
725725
"start_line": 38,
726726
"end_line": 38,
@@ -736,7 +736,7 @@
736736
},
737737
{
738738
"license_expression": "lgpl-3.0",
739-
"spdx_license_expression": "LGPL-3.0-only",
739+
"license_expression_spdx": "LGPL-3.0-only",
740740
"from_file": "samba/README.contributing",
741741
"start_line": 38,
742742
"end_line": 38,
@@ -752,7 +752,7 @@
752752
},
753753
{
754754
"license_expression": "gpl-2.0",
755-
"spdx_license_expression": "GPL-2.0-only",
755+
"license_expression_spdx": "GPL-2.0-only",
756756
"from_file": "samba/README.contributing",
757757
"start_line": 39,
758758
"end_line": 39,
@@ -1116,7 +1116,7 @@
11161116
"matches": [
11171117
{
11181118
"license_expression": "gpl-3.0",
1119-
"spdx_license_expression": "GPL-3.0-only",
1119+
"license_expression_spdx": "GPL-3.0-only",
11201120
"from_file": "samba/README.contributing",
11211121
"start_line": 38,
11221122
"end_line": 38,
@@ -1132,7 +1132,7 @@
11321132
},
11331133
{
11341134
"license_expression": "lgpl-3.0",
1135-
"spdx_license_expression": "LGPL-3.0-only",
1135+
"license_expression_spdx": "LGPL-3.0-only",
11361136
"from_file": "samba/README.contributing",
11371137
"start_line": 38,
11381138
"end_line": 38,
@@ -1148,7 +1148,7 @@
11481148
},
11491149
{
11501150
"license_expression": "gpl-2.0",
1151-
"spdx_license_expression": "GPL-2.0-only",
1151+
"license_expression_spdx": "GPL-2.0-only",
11521152
"from_file": "samba/README.contributing",
11531153
"start_line": 39,
11541154
"end_line": 39,
@@ -1500,7 +1500,7 @@
15001500
"matches": [
15011501
{
15021502
"license_expression": "gpl-3.0",
1503-
"spdx_license_expression": "GPL-3.0-only",
1503+
"license_expression_spdx": "GPL-3.0-only",
15041504
"from_file": "samba/README.contributing",
15051505
"start_line": 38,
15061506
"end_line": 38,
@@ -1516,7 +1516,7 @@
15161516
},
15171517
{
15181518
"license_expression": "lgpl-3.0",
1519-
"spdx_license_expression": "LGPL-3.0-only",
1519+
"license_expression_spdx": "LGPL-3.0-only",
15201520
"from_file": "samba/README.contributing",
15211521
"start_line": 38,
15221522
"end_line": 38,
@@ -1532,7 +1532,7 @@
15321532
},
15331533
{
15341534
"license_expression": "gpl-2.0",
1535-
"spdx_license_expression": "GPL-2.0-only",
1535+
"license_expression_spdx": "GPL-2.0-only",
15361536
"from_file": "samba/README.contributing",
15371537
"start_line": 39,
15381538
"end_line": 39,
@@ -1893,7 +1893,7 @@
18931893
},
18941894
{
18951895
"license_expression": "gpl-3.0",
1896-
"spdx_license_expression": "GPL-3.0-only",
1896+
"license_expression_spdx": "GPL-3.0-only",
18971897
"from_file": "samba/README.contributing",
18981898
"start_line": 38,
18991899
"end_line": 38,
@@ -1909,7 +1909,7 @@
19091909
},
19101910
{
19111911
"license_expression": "lgpl-3.0",
1912-
"spdx_license_expression": "LGPL-3.0-only",
1912+
"license_expression_spdx": "LGPL-3.0-only",
19131913
"from_file": "samba/README.contributing",
19141914
"start_line": 38,
19151915
"end_line": 38,
@@ -1925,7 +1925,7 @@
19251925
},
19261926
{
19271927
"license_expression": "gpl-2.0",
1928-
"spdx_license_expression": "GPL-2.0-only",
1928+
"license_expression_spdx": "GPL-2.0-only",
19291929
"from_file": "samba/README.contributing",
19301930
"start_line": 39,
19311931
"end_line": 39,

‎tests/packagedcode/data/npm/alias/package.json.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"matches": [
3333
{
3434
"license_expression": "blueoak-1.0.0",
35-
"spdx_license_expression": "BlueOak-1.0.0",
35+
"license_expression_spdx": "BlueOak-1.0.0",
3636
"from_file": null,
3737
"start_line": 1,
3838
"end_line": 1,

‎tests/packagedcode/data/npm/pnpm/pnpm-lock/v5/cobe-scan.expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"matches": [
100100
{
101101
"license_expression": "mit",
102-
"spdx_license_expression": "MIT",
102+
"license_expression_spdx": "MIT",
103103
"from_file": "cobe/website/package.json",
104104
"start_line": 1,
105105
"end_line": 1,
@@ -4144,7 +4144,7 @@
41444144
"matches": [
41454145
{
41464146
"license_expression": "mit",
4147-
"spdx_license_expression": "MIT",
4147+
"license_expression_spdx": "MIT",
41484148
"from_file": "cobe/website/package.json",
41494149
"start_line": 1,
41504150
"end_line": 1,

0 commit comments

Comments
 (0)