diff options
author | Lars Wirzenius <liw@liw.fi> | 2023-04-30 09:28:40 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2023-04-30 09:28:40 +0000 |
commit | ac54fb5fd6588f4bbfe3a8a4c960fdf8f7512eaf (patch) | |
tree | 78f6a675e86071d0175e0b5be3f6df51cf3cf78a | |
parent | 265b69a84bfd3ade02c13b57f6ad0353765e040a (diff) | |
parent | 9112ec42820dd67a4cedd7e007e5ebb0f8e2bb7f (diff) | |
download | subplot-0.7.1.tar.gz |
Merge branch 'release' into 'main'0.7.1
release 0.7.1
See merge request subplot/subplot!326
-rw-r--r-- | Cargo.lock | 127 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | NEWS.md | 9 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | subplot-build/Cargo.toml | 4 | ||||
-rw-r--r-- | subplotlib-derive/Cargo.toml | 2 | ||||
-rw-r--r-- | subplotlib/Cargo.toml | 6 |
7 files changed, 93 insertions, 63 deletions
@@ -23,6 +23,15 @@ dependencies = [ ] [[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + +[[package]] name = "aligned" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -33,9 +42,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "as-slice" @@ -134,9 +143,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -275,9 +284,9 @@ dependencies = [ [[package]] name = "fs_at" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37047c0d530b3aefc64e4c4d7c6b1e23030c65973661b70e12c826f426f3f675" +checksum = "0504bab20f4487fdf1c20ed48e3e32c7951827a778cd3dfded1768f90b6abb0a" dependencies = [ "aligned", "cfg-if", @@ -285,14 +294,14 @@ dependencies = [ "libc", "nix", "smart-default", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "generator" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" +checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" dependencies = [ "cc", "libc", @@ -366,7 +375,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -502,9 +511,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libm" @@ -526,9 +535,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" [[package]] name = "log" @@ -632,9 +641,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -642,9 +651,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -652,22 +661,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] name = "pest_meta" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -800,13 +809,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -815,7 +824,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] @@ -825,6 +834,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + +[[package]] name = "remove_dir_all" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -855,9 +870,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" dependencies = [ "bitflags", "errno", @@ -896,9 +911,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -915,20 +930,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -1003,13 +1018,13 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "smart-default" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1047,7 +1062,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subplot" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "base64", @@ -1077,7 +1092,7 @@ dependencies = [ [[package]] name = "subplot-build" -version = "0.7.0" +version = "0.7.1" dependencies = [ "subplot", "tempfile", @@ -1095,7 +1110,7 @@ dependencies = [ [[package]] name = "subplotlib" -version = "0.7.0" +version = "0.7.1" dependencies = [ "base64", "fehler", @@ -1117,12 +1132,12 @@ dependencies = [ [[package]] name = "subplotlib-derive" -version = "0.7.0" +version = "0.7.1" dependencies = [ "fehler", "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -1138,9 +1153,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", @@ -1229,7 +1244,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -1282,13 +1297,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -1314,9 +1329,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -1502,11 +1517,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.0", ] [[package]] @@ -1,6 +1,6 @@ [package] name = "subplot" -version = "0.7.0" +version = "0.7.1" authors = [ "Lars Wirzenius <liw@liw.fi>", "Daniel Silverstone <dsilvers@digital-scurf.org>", @@ -4,6 +4,15 @@ 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.7.1, released 2023-04-30 + +- Subplot now handles scenario titles with markup (such as bold face). + This was broken in the changes to drop use of Pandoc for parsing. +- CI job using the MSRV version doesn't check source code formatting + anymore. +- The dependency on the roadmap crate now depends on a version that + doesn't require the `clap` crate at all anymore. + # Version 0.7.0, released 2023-04-10 - Subplot no longer uses `pandoc` at all. This means that diff --git a/debian/changelog b/debian/changelog index 54e2874..54d1857 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +subplot (0.7.1-1) unstable; urgency=medium + + * New release. + + -- Lars Wirzenius <liw@liw.fi> Sun, 30 Apr 2023 11:51:05 +0300 + subplot (0.7.0-1) unstable; urgency=medium * New release. diff --git a/subplot-build/Cargo.toml b/subplot-build/Cargo.toml index af84e8e..bade3f8 100644 --- a/subplot-build/Cargo.toml +++ b/subplot-build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subplot-build" -version = "0.7.0" +version = "0.7.1" authors = [ "Lars Wirzenius <liw@liw.fi>", "Daniel Silverstone <dsilvers@digital-scurf.org>", @@ -15,6 +15,6 @@ rust-version = "1.63" [dependencies] -subplot = { version = "0.7.0", path = ".." } +subplot = { version = "0.7.1", path = ".." } tracing = "0.1" tempfile = "3.1.0" diff --git a/subplotlib-derive/Cargo.toml b/subplotlib-derive/Cargo.toml index d0abce4..675c67b 100644 --- a/subplotlib-derive/Cargo.toml +++ b/subplotlib-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subplotlib-derive" -version = "0.7.0" +version = "0.7.1" authors = [ "Lars Wirzenius <liw@liw.fi>", "Daniel Silverstone <dsilvers@digital-scurf.org>", diff --git a/subplotlib/Cargo.toml b/subplotlib/Cargo.toml index c5b5ccc..75ea076 100644 --- a/subplotlib/Cargo.toml +++ b/subplotlib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subplotlib" -version = "0.7.0" +version = "0.7.1" authors = [ "Lars Wirzenius <liw@liw.fi>", "Daniel Silverstone <dsilvers@digital-scurf.org>", @@ -17,7 +17,7 @@ rust-version = "1.63" [dependencies] fehler = "1" -subplotlib-derive = { version = "0.7.0", path = "../subplotlib-derive" } +subplotlib-derive = { version = "0.7.1", path = "../subplotlib-derive" } lazy_static = "1" base64 = "0.21.0" state = "0.5" @@ -33,7 +33,7 @@ remove_dir_all = "0.8" [build-dependencies] glob = "0.3" -subplot-build = { version = "0.7.0", path = "../subplot-build" } +subplot-build = { version = "0.7.1", path = "../subplot-build" } [dev-dependencies] serde_json = "1.0" |