slipenkomk/sequoia-sq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update subplot to fix tera issue

Browse Source 
- See https://gitlab.com/subplot/subplot/-/merge_requests/317 .

  - Fixes #2
This commit is contained in:
Gabriel de Perthuis 2023-04-15 12:29:19 +02:00 committed by Neal H. Walfield
parent 2c57cd77d7
commit 75b5360a38
No known key found for this signature in database
GPG Key ID: 6863C9AD5B4D22D3
2 changed files with 179 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
Cargo.lock generated
View File

@ -68,6 +68,15 @@ dependencies = [
"memchr",
]
[[package]]
name = "aligned"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80a21b9440a626c7fc8573a9e3d3a06b75c7c97754c2949bc7857b90353ca655"
dependencies = [
"as-slice",
]
[[package]]
name = "android_system_properties"
version = "0.1.5"
@ -83,6 +92,15 @@ version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "as-slice"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516"
dependencies = [
"stable_deref_trait",
]
[[package]]
name = "ascii-canvas"
version = "3.0.0"
@ -149,6 +167,12 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bindgen"
version = "0.63.0"
@ -680,6 +704,15 @@ dependencies = [
"zeroize",
]
[[package]]
name = "cvt"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2ae9bf77fbf2d39ef573205d554d87e86c12f1994e9ea335b0651b9b278bcf1"
dependencies = [
"cfg-if",
]
[[package]]
name = "cxx"
version = "1.0.94"
@ -984,12 +1017,12 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.9.3"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
"atty",
"humantime",
"is-terminal",
"log",
"regex",
"termcolor",
@ -1162,6 +1195,21 @@ dependencies = [
"winapi",
]
[[package]]
name = "fs_at"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70d4dbfdbb6c5ae7206c4ce9bd10da5f621719873517591b531e237393a3c3d1"
dependencies = [
"aligned",
"cfg-if",
"cvt",
"libc",
"nix",
"smart-default",
"windows-sys 0.45.0",
]
[[package]]
name = "funty"
version = "1.1.0"
@ -1436,6 +1484,15 @@ dependencies = [
"winapi",
]
[[package]]
name = "html-escape"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
dependencies = [
"utf8-width",
]
[[package]]
name = "http"
version = "0.2.9"
@ -1472,9 +1529,12 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "humansize"
version = "1.1.1"
version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
dependencies = [
"libm",
]
[[package]]
name = "humantime"
@ -1651,15 +1711,6 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "itertools"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.10.5"
@ -1695,7 +1746,7 @@ dependencies = [
"diff",
"ena",
"is-terminal",
"itertools 0.10.5",
"itertools",
"lalrpop-util",
"petgraph",
"regex",
@ -1759,6 +1810,12 @@ dependencies = [
"vcpkg",
]
[[package]]
name = "line-col"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e69cdf6b85b5c8dce514f694089a2cf8b1a702f6cd28607bcb3cf296c9778db"
[[package]]
name = "link-cplusplus"
version = "1.0.8"
@ -1962,6 +2019,18 @@ dependencies = [
"smallvec",
]
[[package]]
name = "nix"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
dependencies = [
"bitflags 1.3.2",
"cfg-if",
"libc",
"static_assertions",
]
[[package]]
name = "no-std-compat"
version = "0.4.1"
@ -1984,6 +2053,15 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
[[package]]
name = "normpath"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec60c60a693226186f5d6edf073232bfb6464ed97eb22cf3b01c1e8198fd97f5"
dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
@ -2157,26 +2235,6 @@ dependencies = [
"sha2 0.9.9",
]
[[package]]
name = "pandoc"
version = "0.8.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb8469d27ed9fd7925629076a3675fea964c3f44c49662bdf549a8b7ddf0820"
dependencies = [
"itertools 0.8.2",
]
[[package]]
name = "pandoc_ast"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b960d9b78f94feb2a43ace4dda1d2b924a0d5a0639f399620fb54fe2943a9e7"
dependencies = [
"serde",
"serde_derive",
"serde_json",
]
[[package]]
name = "parking_lot"
version = "0.12.1"
@ -2212,7 +2270,7 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb"
dependencies = [
"base64",
"base64 0.13.1",
"once_cell",
"regex",
]
@ -2344,7 +2402,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
dependencies = [
"difflib",
"float-cmp",
"itertools 0.10.5",
"itertools",
"normalize-line-endings",
"predicates-core",
"regex",
@ -2592,15 +2650,18 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "remove_dir_all"
version = "0.7.0"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "882f368737489ea543bc5c340e6f3d34a28c39980bd9a979e47322b26f60ac40"
checksum = "23895cfadc1917fed9c6ed76a8c2903615fa3704f7493ff82b364c6540acc02b"
dependencies = [
"aligned",
"cfg-if",
"cvt",
"fs_at",
"lazy_static",
"libc",
"log",
"num_cpus",
"rayon",
"winapi",
"normpath",
"windows-sys 0.45.0",
]
[[package]]
@ -2633,7 +2694,7 @@ dependencies = [
"anyhow",
"clap 3.2.23",
"serde",
"serde_yaml",
"serde_yaml 0.8.26",
"textwrap 0.15.2",
"thiserror",
]
@ -2789,7 +2850,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2276253cdf2bcecc651209756524e0e2e52a8cf79e47fa3162ee663e91ad261d"
dependencies = [
"base64",
"base64 0.13.1",
"sequoia-openpgp",
]
@ -2821,7 +2882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "960f1ea77bf8b6f455285424257574d66fa29223e4286268017a4458cc29d33f"
dependencies = [
"anyhow",
"base64",
"base64 0.13.1",
"futures-util",
"http",
"hyper",
@ -2847,7 +2908,7 @@ checksum = "e5f5aa2f8ea2ab9690c2839a16f7bf335f404fa97fad627c8e828b302b1a5c18"
dependencies = [
"aes",
"anyhow",
"base64",
"base64 0.13.1",
"block-modes",
"block-padding",
"blowfish",
@ -2928,7 +2989,7 @@ dependencies = [
"dirs 4.0.0",
"dot-writer",
"fehler",
"itertools 0.10.5",
"itertools",
"once_cell",
"predicates",
"roff",
@ -3024,6 +3085,19 @@ dependencies = [
"yaml-rust",
]
[[package]]
name = "serde_yaml"
version = "0.9.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
dependencies = [
"indexmap",
"itoa",
"ryu",
"serde",
"unsafe-libyaml",
]
[[package]]
name = "sha-1"
version = "0.9.8"
@ -3143,6 +3217,17 @@ version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "smart-default"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "smawk"
version = "0.3.1"
@ -3174,6 +3259,12 @@ dependencies = [
"der",
]
[[package]]
name = "stable_deref_trait"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "state"
version = "0.5.3"
@ -3183,6 +3274,12 @@ dependencies = [
"loom",
]
[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "string_cache"
version = "0.8.7"
@ -3204,20 +3301,20 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "subplot"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95cfa682b7da7d48f97d2042c5e21f025cf68035544876c2de7bd007779424d9"
checksum = "62063b3d0836def673fdefb6e8fd92f14feef8d8604c55179f148dd61d078f6e"
dependencies = [
"anyhow",
"base64",
"clap 3.2.23",
"base64 0.21.0",
"clap 4.0.32",
"env_logger",
"file_diff",
"git-testament",
"html-escape",
"lazy_static",
"line-col",
"log",
"pandoc",
"pandoc_ast",
"pikchr",
"pulldown-cmark",
"regex",
@ -3225,7 +3322,7 @@ dependencies = [
"serde",
"serde-aux",
"serde_json",
"serde_yaml",
"serde_yaml 0.9.21",
"tempfile",
"tempfile-fast",
"tera",
@ -3236,9 +3333,9 @@ dependencies = [
[[package]]
name = "subplot-build"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "14c3c09032b72b9229c6d48f3b842ec439de982915295a6854289bc66e8c274a"
checksum = "ad5f495955661520d33ca5726a47146b3235bb231b93234cbc0a7b8956f99806"
dependencies = [
"subplot",
"tempfile",
@ -3247,11 +3344,11 @@ dependencies = [
[[package]]
name = "subplotlib"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56e32651107dcf191149190cfe54f41751bb8c4c93021f39435b95aecff6739b"
checksum = "68fde3363d1d4d9b8ee93870593890705897943d6c7bbb9ff01339343985e6ed"
dependencies = [
"base64",
"base64 0.21.0",
"fehler",
"filetime",
"fs2",
@ -3270,14 +3367,14 @@ dependencies = [
[[package]]
name = "subplotlib-derive"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c12aaed6f70026bf2c60985e145c8a8309413d8fd34751eacd6b018e272901d"
checksum = "3067db28f6952a9d73816b6e0d048e9b68fb1edc99c0bf255ff40f818db0e643"
dependencies = [
"fehler",
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.13",
]
[[package]]
@ -3340,9 +3437,9 @@ dependencies = [
[[package]]
name = "tera"
version = "1.17.1"
version = "1.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3df578c295f9ec044ff1c829daf31bb7581d5b3c2a7a3d87419afe1f2531438c"
checksum = "95a665751302f22a03c56721e23094e4dc22b04a80f381e6737a07bf7a7c70c0"
dependencies = [
"globwalk",
"humansize",
@ -3355,6 +3452,7 @@ dependencies = [
"serde",
"serde_json",
"slug",
"thread_local",
"unic-segment",
]
@ -3443,11 +3541,10 @@ dependencies = [
[[package]]
name = "thread_local"
version = "1.1.7"
version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
dependencies = [
"cfg-if",
"once_cell",
]
@ -3845,6 +3942,12 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unsafe-libyaml"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
[[package]]
name = "url"
version = "2.3.1"
@ -3856,6 +3959,12 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "utf8-width"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1"
[[package]]
name = "valuable"
version = "0.1.0"

4
Cargo.toml
View File

@ -61,11 +61,11 @@ clap_mangen = "0.2"
chrono = "0.4.10"
sequoia-openpgp = { version = "1.13", default-features = false }
sequoia-net = { version = "0.27", default-features = false }
subplot-build = { version = "0.6.0", optional = true }
subplot-build = { version = "0.7.0", optional = true }
cfg-if = "1"
[dev-dependencies]
subplotlib = "0.6.0"
subplotlib = "0.7.0"
fehler = "1.0.0"
# For an MSVR of 1.63: 2.0.8.
assert_cmd = "2"