Skip to content

Commit

Permalink
Update to v3.7 of the SPDX license list (#13)
Browse files Browse the repository at this point in the history
* Update to v3.7 of the SPDX license list
* Prep 0.2.3
  • Loading branch information
Jake-Shadle authored Nov 7, 2019
1 parent eacab8c commit 661e3d2
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 7 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.2.3] - 2019-11-07
### Changed
- Updated the list of licenses to version 3.7 of the SPDX license list

## [0.2.2] - 2019-11-06
### Added
- Added `LicenseId::full_name` which is the full name for the license, eg "MIT License" for the "MIT" short identifier
Expand All @@ -30,7 +34,8 @@ a user provided callback
### Added
- Initial add of spdx crate, based primarly on [`license-exprs`](https://github.com/rust-lang-nursery/license-exprs)

[Unreleased]: https://github.com/EmbarkStudios/spdx/compare/0.2.2...HEAD
[Unreleased]: https://github.com/EmbarkStudios/spdx/compare/0.2.3...HEAD
[0.2.3]: https://github.com/EmbarkStudios/spdx/compare/0.2.2...0.2.3
[0.2.2]: https://github.com/EmbarkStudios/spdx/compare/0.2.1...0.2.2
[0.2.1]: https://github.com/EmbarkStudios/spdx/compare/0.2.0...0.2.1
[0.2.0]: https://github.com/EmbarkStudios/spdx/compare/0.1.0...0.2.0
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spdx"
version = "0.2.2"
version = "0.2.3"
authors = ["Embark <[email protected]>", "Jake Shadle <[email protected]>"]
description = "Helper crate for SDPX expressions"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status](https://github.com/EmbarkStudios/spdx/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/spdx/actions?workflow=CI)
[![Crates.io](https://img.shields.io/crates/v/spdx.svg)](https://crates.io/crates/spdx)
[![Docs](https://docs.rs/spdx/badge.svg)](https://docs.rs/spdx)
[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.6-blue.svg)](https://shields.io/)
[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.7-blue.svg)](https://shields.io/)
[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
[![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](http://embark.rs)

Expand Down
22 changes: 18 additions & 4 deletions src/identifiers.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* list fetched from https://github.com/spdx/license-list-data @ v3.6
* list fetched from https://github.com/spdx/license-list-data @ v3.7
*
* AUTO-GENERATED BY ./update
* DO NOT MODIFY
Expand All @@ -12,7 +12,7 @@ pub const IS_OSI_APPROVED: u8 = 0x2;
pub const IS_DEPRECATED: u8 = 0x4;
pub const IS_COPYLEFT: u8 = 0x8;

pub const VERSION: &str = "3.6";
pub const VERSION: &str = "3.7";

pub const LICENSES: &[(&str, &str, u8)] = &[
("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
Expand Down Expand Up @@ -439,7 +439,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"CeCILL-C Free Software License Agreement"#,
IS_FSF_LIBRE | IS_COPYLEFT,
),
("CERN-OHL-1.1", r#"CERN Open Hardware License v1.1"#, 0x0),
("CERN-OHL-1.1", r#"CERN Open Hardware Licence v1.1"#, 0x0),
("CERN-OHL-1.2", r#"CERN Open Hardware Licence v1.2"#, 0x0),
("CNRI-Jython", r#"CNRI Jython License"#, 0x0),
("CNRI-Python", r#"CNRI Python License"#, IS_OSI_APPROVED),
Expand Down Expand Up @@ -880,8 +880,13 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
),
("MTLL", r#"Matrix Template Library License"#, 0x0),
("MakeIndex", r#"MakeIndex License"#, 0x0),
("MirOS", r#"MirOS License"#, IS_OSI_APPROVED),
("MirOS", r#"The MirOS Licence"#, IS_OSI_APPROVED),
("Motosoto", r#"Motosoto License"#, IS_OSI_APPROVED),
(
"MulanPSL-1.0",
r#"Mulan Permissive Software License, Version 1"#,
0x0,
),
("Multics", r#"Multics License"#, IS_OSI_APPROVED),
("Mup", r#"Mup License"#, 0x0),
(
Expand Down Expand Up @@ -953,6 +958,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"SIL Open Font License 1.1"#,
IS_OSI_APPROVED | IS_FSF_LIBRE,
),
("OGL-Canada-2.0", r#"Open Government Licence - Canada"#, 0x0),
("OGL-UK-1.0", r#"Open Government Licence v1.0"#, 0x0),
("OGL-UK-2.0", r#"Open Government Licence v2.0"#, 0x0),
("OGL-UK-3.0", r#"Open Government Licence v3.0"#, 0x0),
Expand Down Expand Up @@ -1104,6 +1110,8 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"Sun Public License v1.0"#,
IS_OSI_APPROVED | IS_FSF_LIBRE,
),
("SSH-OpenSSH", r#"SSH OpenSSH license"#, 0x0),
("SSH-short", r#"SSH short notice"#, 0x0),
("SSPL-1.0", r#"Server Side Public License, v 1"#, 0x0),
(
"SWL",
Expand Down Expand Up @@ -1144,6 +1152,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
r#"Technische Universitaet Berlin License 2.0"#,
0x0,
),
(
"UCL-1.0",
r#"Upstream Compatibility License v1.0"#,
IS_OSI_APPROVED,
),
(
"UPL-1.0",
r#"Universal Permissive License v1.0"#,
Expand Down Expand Up @@ -1231,6 +1244,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
IS_DEPRECATED | IS_FSF_LIBRE,
),
("eGenix", r#"eGenix.com Public License 1.1.0"#, 0x0),
("etalab-2.0", r#"Etalab Open License 2.0"#, 0x0),
("gSOAP-1.3b", r#"gSOAP Public License v1.3b"#, 0x0),
("gnuplot", r#"gnuplot License"#, IS_FSF_LIBRE),
(
Expand Down

0 comments on commit 661e3d2

Please sign in to comment.