Update spdx license list (#4097)

ansible · Apr 9, 2024 · f6d0aae · f6d0aae
1 parent 81aa61b
commit f6d0aae
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 6 deletions.
diff --git a/.config/constraints.txt b/.config/constraints.txt
@@ -42,7 +42,7 @@ jmespath==1.0.1
 jsmin==3.0.1
 jsonschema==4.21.1
 jsonschema-specifications==2023.12.1
-license-expression==30.2.0
+license-expression==30.3.0
 linkchecker==10.4.0
 markdown==3.5.2
 markdown-exec==1.8.0

diff --git a/.config/requirements-test.in b/.config/requirements-test.in
@@ -2,7 +2,7 @@ black # IDE support
 coverage-enable-subprocess # see https://github.com/nedbat/coveragepy/issues/1341#issuecomment-1228942657
 coverage[toml] >= 6.4.4
 jmespath
-license-expression >= 30.1.1 # Apache 2.0
+license-expression >= 30.3.0 # Apache 2.0
 mypy # IDE support
 netaddr # needed by ipwrap filter
 psutil # soft-dep of pytest-xdist

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -157,7 +157,7 @@ repos:
           - cryptography>=39.0.1
           - filelock>=3.12.2
           - jinja2
-          - license-expression >= 30.1.1
+          - license-expression >= 30.3.0
           - pytest-mock
           - pytest>=7.2.2
           - rich>=13.2.0
@@ -187,7 +187,7 @@ repos:
           - docutils
           - filelock>=3.12.2
           - jsonschema>=4.20.0
-          - license-expression >= 30.1.1
+          - license-expression >= 30.3.0
           - pytest-mock
           - pytest>=7.2.2
           - pyyaml

diff --git a/src/ansiblelint/schemas/galaxy.json b/src/ansiblelint/schemas/galaxy.json
@@ -27,6 +27,7 @@
         "AGPL-3.0-or-later",
         "AMDPLPA",
         "AML",
+        "AML-glslang",
         "AMPAS",
         "ANTLR-PD",
         "ANTLR-PD-fallback",
@@ -41,6 +42,7 @@
         "Abstyles",
         "AdaCore-doc",
         "Adobe-2006",
+        "Adobe-Display-PostScript",
         "Adobe-Glyph",
         "Adobe-Utopia",
         "Afmparse",
@@ -62,6 +64,7 @@
         "Autoconf-exception-macro",
         "BSD-1-Clause",
         "BSD-2-Clause",
+        "BSD-2-Clause-Darwin",
         "BSD-2-Clause-Patent",
         "BSD-2-Clause-Views",
         "BSD-3-Clause",
@@ -76,6 +79,7 @@
         "BSD-3-Clause-No-Nuclear-Warranty",
         "BSD-3-Clause-Open-MPI",
         "BSD-3-Clause-Sun",
+        "BSD-3-Clause-acpica",
         "BSD-3-Clause-flex",
         "BSD-4-Clause",
         "BSD-4-Clause-Shortened",
@@ -87,13 +91,16 @@
         "BSD-Inferno-Nettverk",
         "BSD-Protection",
         "BSD-Source-Code",
+        "BSD-Source-beginning-file",
         "BSD-Systemics",
+        "BSD-Systemics-W3Works",
         "BSL-1.0",
         "BUSL-1.1",
         "Baekmuk",
         "Bahyph",
         "Barr",
         "Beerware",
+        "Bison-exception-1.24",
         "Bison-exception-2.2",
         "BitTorrent-1.0",
         "BitTorrent-1.1",
@@ -103,6 +110,7 @@
         "Boehm-GC",
         "Bootloader-exception",
         "Borceux",
+        "Brian-Gladman-2-Clause",
         "Brian-Gladman-3-Clause",
         "C-UDA-1.0",
         "CAL-1.0",
@@ -114,6 +122,7 @@
         "CC-BY-2.5-AU",
         "CC-BY-3.0",
         "CC-BY-3.0-AT",
+        "CC-BY-3.0-AU",
         "CC-BY-3.0-DE",
         "CC-BY-3.0-IGO",
         "CC-BY-3.0-NL",
@@ -180,6 +189,7 @@
         "CFITSIO",
         "CLISP-exception-2.0",
         "CMU-Mach",
+        "CMU-Mach-nodoc",
         "CNRI-Jython",
         "CNRI-Python",
         "CNRI-Python-GPL-Compatible",
@@ -189,6 +199,7 @@
         "CPOL-1.02",
         "CUA-OPL-1.0",
         "Caldera",
+        "Caldera-no-preamble",
         "ClArtistic",
         "Classpath-exception-2.0",
         "Clips",
@@ -200,10 +211,12 @@
         "CrystalStacker",
         "Cube",
         "D-FSL-1.0",
+        "DEC-3-Clause",
         "DL-DE-BY-2.0",
         "DL-DE-ZERO-2.0",
         "DOC",
         "DRL-1.0",
+        "DRL-1.1",
         "DSDP",
         "DigiRule-FOSS-exception",
         "Dotseqn",
@@ -226,6 +239,7 @@
         "FDK-AAC",
         "FLTK-exception",
         "FSFAP",
+        "FSFAP-no-warranty-disclaimer",
         "FSFUL",
         "FSFULLR",
         "FSFULLRWD",
@@ -241,6 +255,7 @@
         "GCC-exception-2.0",
         "GCC-exception-2.0-note",
         "GCC-exception-3.1",
+        "GCR-docs",
         "GD",
         "GFDL-1.1-invariants-only",
         "GFDL-1.1-invariants-or-later",
@@ -263,6 +278,7 @@
         "GL2PS",
         "GLWTPL",
         "GNAT-exception",
+        "GNOME-examples-exception",
         "GNU-compiler-exception",
         "GPL-1.0-only",
         "GPL-1.0-or-later",
@@ -279,18 +295,24 @@
         "Giftware",
         "Glide",
         "Glulxe",
+        "Gmsh-exception",
         "Graphics-Gems",
         "HP-1986",
         "HP-1989",
         "HPND",
         "HPND-DEC",
+        "HPND-Fenneberg-Livingston",
+        "HPND-INRIA-IMAG",
+        "HPND-Kevlin-Henney",
+        "HPND-MIT-disclaimer",
         "HPND-Markus-Kuhn",
         "HPND-Pbmplus",
         "HPND-UC",
         "HPND-doc",
         "HPND-doc-sell",
         "HPND-export-US",
         "HPND-export-US-modify",
+        "HPND-sell-MIT-disclaimer-xserver",
         "HPND-sell-regexpr",
         "HPND-sell-variant",
         "HPND-sell-variant-MIT-disclaimer",
@@ -305,6 +327,7 @@
         "IPA",
         "IPL-1.0",
         "ISC",
+        "ISC-Veillard",
         "ImageMagick",
         "Imlib2",
         "Info-ZIP",
@@ -334,6 +357,7 @@
         "LLGPL",
         "LLVM-exception",
         "LOOP",
+        "LPD-document",
         "LPL-1.0",
         "LPL-1.02",
         "LPPL-1.0",
@@ -381,6 +405,8 @@
         "MS-PL",
         "MS-RL",
         "MTLL",
+        "Mackerras-3-Clause",
+        "Mackerras-3-Clause-acknowledgment",
         "MakeIndex",
         "Martin-Birgmeier",
         "McPhee-slideshow",
@@ -468,6 +494,8 @@
         "OpenJDK-assembly-exception-1.0",
         "OpenPBS-2.3",
         "OpenSSL",
+        "OpenSSL-standalone",
+        "OpenVision",
         "PADL",
         "PDDL-1.0",
         "PHP-3.0",
@@ -476,6 +504,7 @@
         "PSF-2.0",
         "Parity-6.0.0",
         "Parity-7.0.0",
+        "Pixar",
         "Plexus",
         "PolyForm-Noncommercial-1.0.0",
         "PolyForm-Small-Business-1.0.0",
@@ -499,6 +528,7 @@
         "Ruby",
         "SANE-exception",
         "SAX-PD",
+        "SAX-PD-2.0",
         "SCEA",
         "SGI-B-1.0",
         "SGI-B-1.1",
@@ -518,6 +548,7 @@
         "SPL-1.0",
         "SSH-OpenSSH",
         "SSH-short",
+        "SSLeay-standalone",
         "SSPL-1.0",
         "SWI-exception",
         "SWL",
@@ -532,12 +563,14 @@
         "Spencer-94",
         "Spencer-99",
         "SugarCRM-1.1.3",
+        "Sun-PPP",
         "SunPro",
         "Swift-exception",
         "Symlinks",
         "TAPR-OHL-1.0",
         "TCL",
         "TCP-wrappers",
+        "TGPPL-1.0",
         "TMate",
         "TORQUE-1.1",
         "TOSL",
@@ -552,8 +585,10 @@
         "UBDL-exception",
         "UCAR",
         "UCL-1.0",
+        "UMich-Merit",
         "UPL-1.0",
         "URT-RLE",
+        "Unicode-3.0",
         "Unicode-DFS-2015",
         "Unicode-DFS-2016",
         "Unicode-TOU",
@@ -590,6 +625,7 @@
         "Zimbra-1.3",
         "Zimbra-1.4",
         "Zlib",
+        "bcrypt-Solar-Designer",
         "blessing",
         "bzip2-1.0.6",
         "check-cvs",
@@ -604,11 +640,14 @@
         "eCos-exception-2.0",
         "eGenix",
         "etalab-2.0",
+        "fmt-exception",
         "freertos-exception-2.0",
         "fwlw",
         "gSOAP-1.3b",
         "gnu-javamail-exception",
         "gnuplot",
+        "gtkbook",
+        "hdparm",
         "i2p-gpl-java-exception",
         "iMatix",
         "libpng-2.0",
@@ -618,17 +657,20 @@
         "libutil-David-Nugent",
         "lsof",
         "magaz",
+        "mailprio",
         "metamail",
         "mif-exception",
         "mpi-permissive",
         "mpich2",
         "mplus",
         "openvpn-openssl-exception",
-        "pnmstitc",
+        "pnmstitch",
         "psfrag",
         "psutils",
         "python-ldap",
+        "radvd",
         "snprintf",
+        "softSurfer",
         "ssh-keyscan",
         "stunnel-exception",
         "swrule",
@@ -638,6 +680,7 @@
         "w3m",
         "x11vnc-openssl-exception",
         "xinetd",
+        "xkeyboard-config-Zinoviev",
         "xlock",
         "xpp",
         "zlib-acknowledgement"

diff --git a/test/test_schemas.py b/test/test_schemas.py
@@ -93,7 +93,7 @@ def test_spdx() -> None:
         spx_enum = schema["$defs"]["SPDXLicenseEnum"]["enum"]
     if set(spx_enum) != license_ids:
         # In absence of a
-        if os.environ.get("PIP_CONSTRAINT", "/dev/null") != "/dev/null":
+        if os.environ.get("PIP_CONSTRAINT", "/dev/null") == "/dev/null":
             with galaxy_json.open("w", encoding="utf-8") as f:
                 schema["$defs"]["SPDXLicenseEnum"]["enum"] = sorted(license_ids)
                 json.dump(schema, f, indent=2)