Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SPDX license list #3814

Merged
merged 1 commit into from
Oct 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .config/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ levelname
libbzip
libera
libyaml
licensedb
lineinfile
linenums
linkcheck
Expand Down Expand Up @@ -313,6 +314,7 @@ ruleset
runas
sarif
scalarint
scancode
schemafile
sdist
sdists
Expand Down
2 changes: 1 addition & 1 deletion .config/requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +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
mypy # IDE support
netaddr # needed by ipwrap filter
psutil # soft-dep of pytest-xdist
Expand All @@ -12,6 +13,5 @@ pytest-plus >= 0.2 # for PYTEST_REQPASS
pytest-xdist >= 2.1.0
ruamel.yaml>=0.17.31,<0.18 # only the latest is expected to pass our tests
ruamel-yaml-clib # needed for mypy
spdx-tools >= 0.7.1,<0.8.0 # Apache
types-jsonschema # IDE support
types-pyyaml # IDE support
9 changes: 2 additions & 7 deletions .config/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ attrs==23.1.0
babel==2.12.1
beautifulsoup4==4.12.2
black==23.9.1
boolean-py==4.0
bracex==2.4
cairocffi==1.6.1
cairosvg==2.7.1
Expand All @@ -36,14 +37,14 @@ idna==3.4
importlib-metadata==6.8.0
importlib-resources==5.0.7
iniconfig==2.0.0
isodate==0.6.1
isort==5.12.0
jinja2==3.1.2
jmespath==1.0.1
jsmin==3.0.1
jsonschema==4.19.1
jsonschema-specifications==2023.7.1
lazy-object-proxy==1.9.0
license-expression==30.1.1
markdown==3.4.4
markdown-exec==1.6.0
markdown-include==0.8.1
Expand Down Expand Up @@ -73,13 +74,11 @@ pillow==10.0.1
pipdeptree==2.13.0
platformdirs==3.10.0
pluggy==1.3.0
ply==3.11
psutil==5.9.5
pycparser==2.21
pygments==2.16.1
pylint==2.17.6
pymdown-extensions==10.3
pyparsing==3.1.1
pytest==7.4.2
pytest-mock==3.11.1
pytest-plus==0.4.0
Expand All @@ -88,7 +87,6 @@ python-dateutil==2.8.2
python-slugify==8.0.1
pyyaml==6.0.1
pyyaml-env-tag==0.1
rdflib==7.0.0
referencing==0.30.2
regex==2023.8.8
requests==2.31.0
Expand All @@ -97,7 +95,6 @@ rpds-py==0.10.3
ruamel-yaml==0.17.33
six==1.16.0
soupsieve==2.5
spdx-tools==0.7.1
subprocess-tee==0.4.1
text-unidecode==1.3
tinycss2==1.2.1
Expand All @@ -106,13 +103,11 @@ tomlkit==0.12.1
types-jsonschema==4.19.0.3
types-pyyaml==6.0.12.12
typing-extensions==4.8.0
uritools==4.0.2
urllib3==2.0.5
watchdog==3.0.0
wcmatch==8.5
webencodings==0.5.1
wrapt==1.15.0
xmltodict==0.13.0
yamllint==1.32.0
zipp==3.17.0

Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,12 +151,12 @@ repos:
- cryptography>=39.0.1
- filelock>=3.12.2
- jinja2
- license-expression >= 30.1.1
- pytest-mock
- pytest>=7.2.2
- rich>=13.2.0
- ruamel-yaml>=0.17.31
- ruamel-yaml-clib>=0.2.7
- spdx-tools>=0.7.1,<0.8.0
- ruamel-yaml>=0.17.31
- subprocess-tee
- types-PyYAML
- types-jsonschema>=4.4.2
Expand All @@ -181,13 +181,13 @@ repos:
- docutils
- filelock>=3.12.2
- jsonschema>=4.9.0
- license-expression >= 30.1.1
- pytest-mock
- pytest>=7.2.2
- pyyaml
- rich>=13.2.0
- ruamel-yaml>=0.17.31
- ruamel-yaml-clib>=0.2.7
- spdx-tools>=0.7.1,<0.8.0
- ruamel-yaml>=0.17.31
- typing_extensions
- wcmatch
- yamllint
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ no_incremental = true
[[tool.mypy.overrides]]
module = [
"ansible.*",
"yamllint.*",
"ansiblelint._version", # generated
"license_expression",
"ruamel.yaml",
"spdx.*",
"yamllint.*",
]
ignore_missing_imports = true
ignore_errors = true
Expand Down
2 changes: 1 addition & 1 deletion src/ansiblelint/schemas/__store__.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json"
},
"meta": {
"etag": "d1f66f20b45ecb814d9be900f01451d8035059b312de4a19edc64e29811a7f39",
"etag": "80d83d5c61044aa67496ea22c74aef08b0216c20e318400d3c939927a2761d51",
"url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/meta.json"
},
"meta-runtime": {
Expand Down
48 changes: 48 additions & 0 deletions src/ansiblelint/schemas/galaxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"description": "An enumeration.",
"enum": [
"0BSD",
"389-exception",
"AAL",
"ADSL",
"AFL-1.1",
Expand Down Expand Up @@ -50,6 +51,9 @@
"Artistic-1.0-Perl",
"Artistic-1.0-cl8",
"Artistic-2.0",
"Autoconf-exception-2.0",
"Autoconf-exception-3.0",
"Autoconf-exception-generic",
"BSD-1-Clause",
"BSD-2-Clause",
"BSD-2-Clause-Patent",
Expand Down Expand Up @@ -79,11 +83,13 @@
"Bahyph",
"Barr",
"Beerware",
"Bison-exception-2.2",
"BitTorrent-1.0",
"BitTorrent-1.1",
"Bitstream-Charter",
"Bitstream-Vera",
"BlueOak-1.0.0",
"Bootloader-exception",
"Borceux",
"Brian-Gladman-3-Clause",
"C-UDA-1.0",
Expand Down Expand Up @@ -159,6 +165,7 @@
"CERN-OHL-S-2.0",
"CERN-OHL-W-2.0",
"CFITSIO",
"CLISP-exception-2.0",
"CMU-Mach",
"CNRI-Jython",
"CNRI-Python",
Expand All @@ -170,6 +177,7 @@
"CUA-OPL-1.0",
"Caldera",
"ClArtistic",
"Classpath-exception-2.0",
"Clips",
"Community-Spec-1.0",
"Condor-1.1",
Expand All @@ -182,6 +190,7 @@
"DOC",
"DRL-1.0",
"DSDP",
"DigiRule-FOSS-exception",
"Dotseqn",
"ECL-1.0",
"ECL-2.0",
Expand All @@ -199,15 +208,20 @@
"ErlPL-1.1",
"Eurosym",
"FDK-AAC",
"FLTK-exception",
"FSFAP",
"FSFUL",
"FSFULLR",
"FSFULLRWD",
"FTL",
"Fair",
"Fawkes-Runtime-exception",
"Font-exception-2.0",
"Frameworx-1.0",
"FreeBSD-DOC",
"FreeImage",
"GCC-exception-2.0",
"GCC-exception-3.1",
"GD",
"GFDL-1.1-invariants-only",
"GFDL-1.1-invariants-or-later",
Expand All @@ -229,12 +243,18 @@
"GFDL-1.3-or-later",
"GL2PS",
"GLWTPL",
"GNAT-exception",
"GPL-1.0-only",
"GPL-1.0-or-later",
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-linking-exception",
"GPL-3.0-linking-source-exception",
"GPL-3.0-only",
"GPL-3.0-or-later",
"GPL-CC-1.0",
"GStreamer-exception-2005",
"GStreamer-exception-2008",
"Giftware",
"Glide",
"Glulxe",
Expand Down Expand Up @@ -268,16 +288,19 @@
"Jam",
"JasPer-2.0",
"Kazlib",
"KiCad-libraries-exception",
"Knuth-CTAN",
"LAL-1.2",
"LAL-1.3",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-linking-exception",
"LGPL-3.0-only",
"LGPL-3.0-or-later",
"LGPLLR",
"LLVM-exception",
"LOOP",
"LPL-1.0",
"LPL-1.02",
Expand All @@ -288,14 +311,17 @@
"LPPL-1.3c",
"LZMA-SDK-9.11-to-9.20",
"LZMA-SDK-9.22",
"LZMA-exception",
"Latex2e",
"Leptonica",
"LiLiQ-P-1.1",
"LiLiQ-R-1.1",
"LiLiQ-Rplus-1.1",
"Libpng",
"Libtool-exception",
"Linux-OpenIB",
"Linux-man-pages-copyleft",
"Linux-syscall-note",
"MIT",
"MIT-0",
"MIT-CMU",
Expand Down Expand Up @@ -350,7 +376,9 @@
"Noweb",
"O-UDA-1.0",
"OCCT-PL",
"OCCT-exception-1.0",
"OCLC-2.0",
"OCaml-LGPL-linking-exception",
"ODC-By-1.0",
"ODbL-1.0",
"OFFIS",
Expand Down Expand Up @@ -392,11 +420,13 @@
"OSL-2.0",
"OSL-2.1",
"OSL-3.0",
"OpenJDK-assembly-exception-1.0",
"OpenPBS-2.3",
"OpenSSL",
"PDDL-1.0",
"PHP-3.0",
"PHP-3.01",
"PS-or-PDF-font-exception-20170817",
"PSF-2.0",
"Parity-6.0.0",
"Parity-7.0.0",
Expand All @@ -408,7 +438,11 @@
"Python-2.0.1",
"QPL-1.0",
"QPL-1.0-INRIA-2004",
"QPL-1.0-INRIA-2004-exception",
"Qhull",
"Qt-GPL-exception-1.0",
"Qt-LGPL-exception-1.1",
"Qwt-exception-1.0",
"RHeCos-1.1",
"RPL-1.1",
"RPL-1.5",
Expand All @@ -424,6 +458,8 @@
"SGI-B-2.0",
"SHL-0.5",
"SHL-0.51",
"SHL-2.0",
"SHL-2.1",
"SISSL",
"SISSL-1.2",
"SMLNJ",
Expand All @@ -433,6 +469,7 @@
"SSH-OpenSSH",
"SSH-short",
"SSPL-1.0",
"SWI-exception",
"SWL",
"Saxpath",
"SchemeReport",
Expand All @@ -445,6 +482,7 @@
"Spencer-99",
"SugarCRM-1.1.3",
"SunPro",
"Swift-exception",
"Symlinks",
"TAPR-OHL-1.0",
"TCL",
Expand All @@ -463,6 +501,7 @@
"Unicode-DFS-2015",
"Unicode-DFS-2016",
"Unicode-TOU",
"Universal-FOSS-exception-1.0",
"Unlicense",
"VOSTROM",
"VSL-1.0",
Expand All @@ -473,6 +512,7 @@
"WTFPL",
"Watcom-1.0",
"Wsuipa",
"WxWindows-exception-3.1",
"X11",
"X11-distribute-modifications-variant",
"XFree86-1.1",
Expand All @@ -497,22 +537,30 @@
"curl",
"diffmark",
"dvipdfm",
"eCos-exception-2.0",
"eGenix",
"etalab-2.0",
"freertos-exception-2.0",
"gSOAP-1.3b",
"gnu-javamail-exception",
"gnuplot",
"i2p-gpl-java-exception",
"iMatix",
"libpng-2.0",
"libselinux-1.0",
"libtiff",
"libutil-David-Nugent",
"mif-exception",
"mpi-permissive",
"mpich2",
"mplus",
"openvpn-openssl-exception",
"psfrag",
"psutils",
"snprintf",
"u-boot-exception-2.0",
"w3m",
"x11vnc-openssl-exception",
"xinetd",
"xlock",
"xpp",
Expand Down
Loading