Merge pull request #87 from tommilligan/redistribute-license

chore: include license text in crate artefact
rust-pretty-assertions · Dec 17, 2021 · 88cd1be · 88cd1be
2 parents d063c77 + 092702f
commit 88cd1be
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+## Fixed
+
+- Ensure license text is included in crate archive - thanks [@decathorpe](https://github.com/decathorpe) for reporting this ([#87](https://github.com/colin-kiegel/rust-pretty-assertions/pull/87), [@tommilligan](https://github.com/tommilligan))
+
 # v1.0.0
 
 ## Removed

diff --git a/pretty_assertions/Cargo.toml b/pretty_assertions/Cargo.toml
@@ -12,7 +12,7 @@ description = "Overwrite `assert_eq!` and `assert_ne!` with drop-in replacements
 repository = "https://github.com/colin-kiegel/rust-pretty-assertions"
 documentation = "https://docs.rs/pretty_assertions"
 
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 categories = ["development-tools"]
 keywords = ["assert", "diff", "pretty", "color"]
 readme = "README.md"

diff --git a/pretty_assertions/LICENSE-APACHE b/pretty_assertions/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
diff --git a/pretty_assertions/LICENSE-MIT b/pretty_assertions/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
diff --git a/pretty_assertions_bench/Cargo.toml b/pretty_assertions_bench/Cargo.toml
@@ -3,6 +3,7 @@ name = "pretty_assertions_bench"
 version = "0.1.0"
 authors = ["Tom Milligan <code@tommilligan.net>"]
 edition = "2018"
+publish = false
 
 [dependencies]
 criterion = { version = "0.3.5", features = ["html_reports"] }

diff --git a/scripts/check b/scripts/check
@@ -10,7 +10,8 @@ eprintln "Formatting sources"
 cargo fmt -- --check
 
 eprintln "Auditing dependencies"
-cargo audit --deny warnings
+cargo audit --deny warnings \
+  --ignore RUSTSEC-2021-0127 # unmaintained serde_cbor
 
 eprintln "Linting sources"
 cargo clippy --all-targets -- -D warnings