Skip to content

Commit 661e3d2

Browse files
authored
Update to v3.7 of the SPDX license list (#13)
* Update to v3.7 of the SPDX license list * Prep 0.2.3
1 parent eacab8c commit 661e3d2

File tree

4 files changed

+26
-7
lines changed

4 files changed

+26
-7
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [0.2.3] - 2019-11-07
10+
### Changed
11+
- Updated the list of licenses to version 3.7 of the SPDX license list
12+
913
## [0.2.2] - 2019-11-06
1014
### Added
1115
- Added `LicenseId::full_name` which is the full name for the license, eg "MIT License" for the "MIT" short identifier
@@ -30,7 +34,8 @@ a user provided callback
3034
### Added
3135
- Initial add of spdx crate, based primarly on [`license-exprs`](https://github.com/rust-lang-nursery/license-exprs)
3236

33-
[Unreleased]: https://github.com/EmbarkStudios/spdx/compare/0.2.2...HEAD
37+
[Unreleased]: https://github.com/EmbarkStudios/spdx/compare/0.2.3...HEAD
38+
[0.2.3]: https://github.com/EmbarkStudios/spdx/compare/0.2.2...0.2.3
3439
[0.2.2]: https://github.com/EmbarkStudios/spdx/compare/0.2.1...0.2.2
3540
[0.2.1]: https://github.com/EmbarkStudios/spdx/compare/0.2.0...0.2.1
3641
[0.2.0]: https://github.com/EmbarkStudios/spdx/compare/0.1.0...0.2.0

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "spdx"
3-
version = "0.2.2"
3+
version = "0.2.3"
44
authors = ["Embark <[email protected]>", "Jake Shadle <[email protected]>"]
55
description = "Helper crate for SDPX expressions"
66
edition = "2018"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Build Status](https://github.com/EmbarkStudios/spdx/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/spdx/actions?workflow=CI)
44
[![Crates.io](https://img.shields.io/crates/v/spdx.svg)](https://crates.io/crates/spdx)
55
[![Docs](https://docs.rs/spdx/badge.svg)](https://docs.rs/spdx)
6-
[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.6-blue.svg)](https://shields.io/)
6+
[![SPDX Version](https://img.shields.io/badge/SPDX%20Version-3.7-blue.svg)](https://shields.io/)
77
[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md)
88
[![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](http://embark.rs)
99

src/identifiers.rs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* list fetched from https://github.com/spdx/license-list-data @ v3.6
2+
* list fetched from https://github.com/spdx/license-list-data @ v3.7
33
*
44
* AUTO-GENERATED BY ./update
55
* DO NOT MODIFY
@@ -12,7 +12,7 @@ pub const IS_OSI_APPROVED: u8 = 0x2;
1212
pub const IS_DEPRECATED: u8 = 0x4;
1313
pub const IS_COPYLEFT: u8 = 0x8;
1414

15-
pub const VERSION: &str = "3.6";
15+
pub const VERSION: &str = "3.7";
1616

1717
pub const LICENSES: &[(&str, &str, u8)] = &[
1818
("0BSD", r#"BSD Zero Clause License"#, IS_OSI_APPROVED),
@@ -439,7 +439,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
439439
r#"CeCILL-C Free Software License Agreement"#,
440440
IS_FSF_LIBRE | IS_COPYLEFT,
441441
),
442-
("CERN-OHL-1.1", r#"CERN Open Hardware License v1.1"#, 0x0),
442+
("CERN-OHL-1.1", r#"CERN Open Hardware Licence v1.1"#, 0x0),
443443
("CERN-OHL-1.2", r#"CERN Open Hardware Licence v1.2"#, 0x0),
444444
("CNRI-Jython", r#"CNRI Jython License"#, 0x0),
445445
("CNRI-Python", r#"CNRI Python License"#, IS_OSI_APPROVED),
@@ -880,8 +880,13 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
880880
),
881881
("MTLL", r#"Matrix Template Library License"#, 0x0),
882882
("MakeIndex", r#"MakeIndex License"#, 0x0),
883-
("MirOS", r#"MirOS License"#, IS_OSI_APPROVED),
883+
("MirOS", r#"The MirOS Licence"#, IS_OSI_APPROVED),
884884
("Motosoto", r#"Motosoto License"#, IS_OSI_APPROVED),
885+
(
886+
"MulanPSL-1.0",
887+
r#"Mulan Permissive Software License, Version 1"#,
888+
0x0,
889+
),
885890
("Multics", r#"Multics License"#, IS_OSI_APPROVED),
886891
("Mup", r#"Mup License"#, 0x0),
887892
(
@@ -953,6 +958,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
953958
r#"SIL Open Font License 1.1"#,
954959
IS_OSI_APPROVED | IS_FSF_LIBRE,
955960
),
961+
("OGL-Canada-2.0", r#"Open Government Licence - Canada"#, 0x0),
956962
("OGL-UK-1.0", r#"Open Government Licence v1.0"#, 0x0),
957963
("OGL-UK-2.0", r#"Open Government Licence v2.0"#, 0x0),
958964
("OGL-UK-3.0", r#"Open Government Licence v3.0"#, 0x0),
@@ -1104,6 +1110,8 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
11041110
r#"Sun Public License v1.0"#,
11051111
IS_OSI_APPROVED | IS_FSF_LIBRE,
11061112
),
1113+
("SSH-OpenSSH", r#"SSH OpenSSH license"#, 0x0),
1114+
("SSH-short", r#"SSH short notice"#, 0x0),
11071115
("SSPL-1.0", r#"Server Side Public License, v 1"#, 0x0),
11081116
(
11091117
"SWL",
@@ -1144,6 +1152,11 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
11441152
r#"Technische Universitaet Berlin License 2.0"#,
11451153
0x0,
11461154
),
1155+
(
1156+
"UCL-1.0",
1157+
r#"Upstream Compatibility License v1.0"#,
1158+
IS_OSI_APPROVED,
1159+
),
11471160
(
11481161
"UPL-1.0",
11491162
r#"Universal Permissive License v1.0"#,
@@ -1231,6 +1244,7 @@ pub const LICENSES: &[(&str, &str, u8)] = &[
12311244
IS_DEPRECATED | IS_FSF_LIBRE,
12321245
),
12331246
("eGenix", r#"eGenix.com Public License 1.1.0"#, 0x0),
1247+
("etalab-2.0", r#"Etalab Open License 2.0"#, 0x0),
12341248
("gSOAP-1.3b", r#"gSOAP Public License v1.3b"#, 0x0),
12351249
("gnuplot", r#"gnuplot License"#, IS_FSF_LIBRE),
12361250
(

0 commit comments

Comments
 (0)