summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers+gitlab@digital-scurf.org>2021-11-16 16:38:34 +0000
committerDaniel Silverstone <dsilvers+gitlab@digital-scurf.org>2021-11-16 16:38:34 +0000
commit046644e6e22c46b1972e367f9106834572f3ae48 (patch)
tree00055dbffd2262d4317a2f2dcea823fe41500964
parent18b297fdc7b5db59db59bdbcf943506370057ab6 (diff)
parenteed18a593d75796b79a858268b9e54c69b164a47 (diff)
downloadsubplot-0.3.1.tar.gz
Merge branch 'release' into 'main'0.3.1
prepare release 0.3.1 Closes #247 See merge request subplot/subplot!232
-rw-r--r--Cargo.lock34
-rw-r--r--Cargo.toml2
-rw-r--r--NEWS.md23
-rw-r--r--RELEASE.md6
-rw-r--r--debian/changelog7
-rw-r--r--deny.toml31
-rw-r--r--subplot-build/Cargo.toml2
7 files changed, 86 insertions, 19 deletions
diff --git a/Cargo.lock b/Cargo.lock
index b6beef4..58a1a86 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,9 +31,9 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.44"
+version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1"
+checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7"
[[package]]
name = "atty"
@@ -108,9 +108,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "cc"
-version = "1.0.71"
+version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
[[package]]
name = "cfg-if"
@@ -469,9 +469,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.104"
+version = "0.2.107"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce"
+checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
[[package]]
name = "linked-hash-map"
@@ -726,9 +726,9 @@ checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
[[package]]
name = "ppv-lite86"
-version = "0.2.14"
+version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741"
+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
[[package]]
name = "proc-macro-error"
@@ -756,9 +756,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.30"
+version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70"
+checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
dependencies = [
"unicode-xid",
]
@@ -985,9 +985,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.68"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3"
dependencies = [
"itoa",
"ryu",
@@ -1095,7 +1095,7 @@ dependencies = [
[[package]]
name = "subplot"
-version = "0.3.0"
+version = "0.3.1"
dependencies = [
"anyhow",
"base64",
@@ -1165,9 +1165,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.80"
+version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194"
+checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
dependencies = [
"proc-macro2",
"quote",
@@ -1201,9 +1201,9 @@ dependencies = [
[[package]]
name = "tera"
-version = "1.13.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0c0eee8fbbbaab449287574b292f21ca53224b92a07b4a23266b77376f0ce7"
+checksum = "d3cac831b615c25bcef632d1cabf864fa05813baad3d526829db18eb70e8b58d"
dependencies = [
"chrono",
"chrono-tz",
diff --git a/Cargo.toml b/Cargo.toml
index 6f90c62..1a40e00 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "subplot"
-version = "0.3.0"
+version = "0.3.1"
authors = [
"Lars Wirzenius <liw@liw.fi>",
"Daniel Silverstone <dsilvers@digital-scurf.org>",
diff --git a/NEWS.md b/NEWS.md
index 6335624..2ddba74 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,6 +4,29 @@ This file summarises the changes between released versions of Subplot and its
associated libraries, especially with regards to changes visible to
the user of the Subplot software.
+# Version 0.3.1, released 2021-11-16
+
+* The primary purpose of this release is to make the `PATH` bug fix
+ available via crates.io, to fix use of Subplot in the Sequoia-PGP
+ project. There are no breaking changes, so only the patch level of
+ the version number is incremented.
+
+* The licence of Subplot has been changed to
+ [MIT-0](https://mit-license.org/), to make it as simple as possible
+ to use Subplot on other projects, without having to worry about
+ license compatibility. Previously, this was technically possible,
+ but the Subplot licence situation was complex enough that it caused
+ people ask questions.
+
+ The Subplot developers prefer, for Subplot, to maximize adoption and
+ though they would favor a copyleft licence otherwise, they're
+ willing to compromise this time.
+
+* A bug has been fixed in the Rust `lib/runcmd` function
+ implementation to prepend a directory to the `PATH`, in the
+ `subplotlib::steplibrary::runcmd::try_to_run_in` function. The bug
+ meant that the directories in `PATH` ended up in the wrong order.
+
# Version 0.3.0, released 2021-10-20
This is still an ALPHA quality release, and includes breaking changes.
diff --git a/RELEASE.md b/RELEASE.md
index fc72718..652b9bf 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -17,6 +17,12 @@ To find all crates, run the following at the root of the source tree:
git ls-files | grep Cargo.toml
~~~
+Run these at the root of the source tree, and either fix anything
+that's found, or at least report it on the issue tracker:
+
+1. `cargo audit`
+2. `cargo deny --workspace check`
+
Do these for each crate, with leaf crates in the dependency tree
first:
diff --git a/debian/changelog b/debian/changelog
index 40e778f..9f162d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+subplot (0.3.1) unstable; urgency=medium
+
+ * New upstream release.
+ * Licence changed to MIT-0.
+
+ -- Lars Wirzenius <liw@liw.fi> Tue, 16 Nov 2021 14:31:32 +0200
+
subplot (0.3.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/deny.toml b/deny.toml
new file mode 100644
index 0000000..060738d
--- /dev/null
+++ b/deny.toml
@@ -0,0 +1,31 @@
+[advisories]
+vulnerability = "allow"
+unmaintained = "warn"
+unsound = "warn"
+yanked = "allow"
+notice = "warn"
+severity-threshold = "medium"
+
+[licenses]
+unlicensed = "deny"
+allow = [
+ "Apache-2.0",
+ "BSD-3-Clause",
+ "MIT",
+ "MIT-0",
+]
+copyleft = "warn"
+allow-osi-fsf-free = "neither"
+default = "deny"
+confidence-threshold = 0.8
+exceptions = [
+ { allow = ["GPL-3.0"], name = "roadmap" },
+]
+
+[licenses.private]
+ignore = false
+
+[bans]
+multiple-versions = "allow"
+wildcards = "allow"
+highlight = "all"
diff --git a/subplot-build/Cargo.toml b/subplot-build/Cargo.toml
index ef1ca54..6faca35 100644
--- a/subplot-build/Cargo.toml
+++ b/subplot-build/Cargo.toml
@@ -14,6 +14,6 @@ repository = "https://gitlab.com/subplot/subplot"
[dependencies]
-subplot = { version="0.3.0", path = ".." }
+subplot = { version="0.3.1", path = ".." }
tracing = "0.1"
tempfile = "3.1.0"