Skip to content

Commit 2a1cbc6

Browse files
FredHappyfaceFredHappyface
authored
Merge pull request #130 from robertuss12/fix_gnu_library
Fixed GNU Library being not recognized, added UPL-1.0
2 parents 3df7ac5 + 76c912a commit 2a1cbc6

5 files changed

Lines changed: 57 additions & 27 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
All major and minor version changes will be documented in this file. Details of
44
patch-level version changes can be found in [commit messages](../../commits/master).
55

6+
## 2025.1.1 - 2025/10/03
7+
8+
- Fixed GNU Library (old alternative license name) not being recognized as LGPL 2.0.
9+
- Added UPL-1.0 license to license types and updated the matrix (similar to MIT).
10+
611
## 2025.1.0 - 2025/03/26
712

813
- Updated internal machineary

‎licensecheck/license_matrix/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
"MIT": L.MIT,
6565
"BSD": L.BSD,
6666
"ISC": L.ISC,
67+
"UPL-1.0": L.UPL_1,
6768
"NCSA": L.NCSA,
6869
"PYTHON": L.PSFL,
6970
"PSF-2.0": L.PSFL,
@@ -78,6 +79,7 @@
7879
"LGPL-3.0-OR-LATER": L.LGPL_3_PLUS,
7980
"LGPL-2.0-ONLY": L.LGPL_2,
8081
"LGPLV2": L.LGPL_2,
82+
"GNU LIBRARY": L.LGPL_2,
8183
"LGPL-3.0-ONLY": L.LGPL_3,
8284
"LGPLV3": L.LGPL_3,
8385
"LGPL": L.LGPL_X,

‎licensecheck/license_matrix/matrix.csv‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
my/deps,PUBLIC,UNLICENSE,MIT,BOOST,BSD,ISC,NCSA,PSFL,APACHE,ECLIPSE,ACADEMIC_FREE,LGPL_X,LGPL_2,LGPL_3,LGPL_2_PLUS,LGPL_3_PLUS,GPL_X,GPL_2,GPL_3,GPL_2_PLUS,GPL_3_PLUS,AGPL_3_PLUS,MPL,EU,PROPRIETARY,NO_LICENSE
2-
PUBLIC,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3-
UNLICENSE,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
4-
MIT,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
5-
BOOST,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
6-
BSD,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
7-
ISC,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
8-
NCSA,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
9-
PSFL,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
10-
APACHE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
11-
ECLIPSE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
12-
ACADEMIC_FREE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
13-
LGPL_X,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
14-
LGPL_2,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
15-
LGPL_3,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
16-
LGPL_2_PLUS,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
17-
LGPL_3_PLUS,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
18-
GPL_X,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0
19-
GPL_2,1,1,1,1,1,1,1,1,0,0,0,1,1,0,1,0,1,1,0,1,0,0,1,1,0,0
20-
GPL_3,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,1,1,1,0,1,1,0,0
21-
GPL_2_PLUS,1,1,1,1,1,1,1,1,0,0,0,1,1,0,1,0,1,1,0,1,0,0,1,1,0,0
22-
GPL_3_PLUS,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,1,1,1,0,1,1,0,0
23-
AGPL_3_PLUS,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0
24-
MPL,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0
25-
EU,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0
26-
PROPRIETARY,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
27-
NO_LICENSE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
1+
my/deps,PUBLIC,UNLICENSE,MIT,BOOST,BSD,ISC,UPL_1,NCSA,PSFL,APACHE,ECLIPSE,ACADEMIC_FREE,LGPL_X,LGPL_2,LGPL_3,LGPL_2_PLUS,LGPL_3_PLUS,GPL_X,GPL_2,GPL_3,GPL_2_PLUS,GPL_3_PLUS,AGPL_3_PLUS,MPL,EU,PROPRIETARY,NO_LICENSE
2+
PUBLIC,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3+
UNLICENSE,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
4+
MIT,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
5+
BOOST,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
6+
BSD,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
7+
ISC,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
8+
UPL_1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
9+
NCSA,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
10+
PSFL,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
11+
APACHE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
12+
ECLIPSE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
13+
ACADEMIC_FREE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,1,0,0,0
14+
LGPL_X,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
15+
LGPL_2,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
16+
LGPL_3,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
17+
LGPL_2_PLUS,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
18+
LGPL_3_PLUS,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
19+
GPL_X,1,1,1,1,1,1,1,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0
20+
GPL_2,1,1,1,1,1,1,1,1,1,0,0,0,1,1,0,1,0,1,1,0,1,0,0,1,1,0,0
21+
GPL_3,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,1,1,1,0,1,1,0,0
22+
GPL_2_PLUS,1,1,1,1,1,1,1,1,1,0,0,0,1,1,0,1,0,1,1,0,1,0,0,1,1,0,0
23+
GPL_3_PLUS,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,0,0,1,1,1,0,1,1,0,0
24+
AGPL_3_PLUS,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0
25+
MPL,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0
26+
EU,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0
27+
PROPRIETARY,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0
28+
NO_LICENSE,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0

‎licensecheck/types.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class License(Enum):
7070
ISC = 13
7171
NCSA = 14
7272
PSFL = 15
73+
UPL_1 = 16
7374
# Other permissive
7475
APACHE = 20
7576
ECLIPSE = 21

‎tests/test_license_matrix.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import logging
2+
3+
import pytest
4+
5+
from licensecheck.license_matrix import licenseType, ucstr
6+
from licensecheck.types import L
7+
8+
9+
@pytest.mark.parametrize("license_string", [ucstr("GNU LIBRARY"), ucstr("UPL-1.0")])
10+
def test_gnu_library_and_upl_1_is_recognized_without_warnings(
11+
caplog: pytest.LogCaptureFixture, license_string: ucstr
12+
) -> None:
13+
with caplog.at_level(logging.WARNING):
14+
# Correct license where found.
15+
license_type = licenseType(license_string)
16+
assert len(license_type) == 1
17+
assert isinstance(license_type[0], L)
18+
assert L.UNKNOWN not in license_type
19+
# No warnings were emitted.
20+
if len(caplog.records):
21+
assert license_string not in caplog.text

0 commit comments

Comments
 (0)