From 467110e188f9f2d1ad1b8b8a1f0415222cffaaa1 Mon Sep 17 00:00:00 2001 From: messense Date: Sun, 4 Sep 2022 20:52:41 +0800 Subject: [PATCH] Update minijinja to 0.19.1 --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- src/templates/Cargo.toml.j2 | 8 ++++---- src/templates/pyproject.toml.j2 | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 07f2e5743..97dcb6124 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] @@ -1279,7 +1279,7 @@ dependencies = [ "semver", "serde", "serde_json", - "sha2 0.10.3", + "sha2 0.10.5", "tar", "target-lexicon", "tempfile", @@ -1324,9 +1324,9 @@ dependencies = [ [[package]] name = "minijinja" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b118c4731e2ecab6e12019ca1b517eab16447e1ab0e1149faa60d259dd3d57" +checksum = "cadb1faac35ceee45137e5e0e041eb7f1437aa03b4a428ef59a2db879a14569b" dependencies = [ "serde", ] @@ -1518,9 +1518,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" [[package]] name = "opaque-debug" @@ -2162,9 +2162,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899bf02746a2c92bf1053d9327dadb252b01af1f81f90cdb902411f518bc7215" +checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" dependencies = [ "cfg-if", "cpufeatures", @@ -2825,7 +2825,7 @@ dependencies = [ "regex", "serde", "serde_json", - "sha2 0.10.3", + "sha2 0.10.5", "tempfile", "tracing", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index 32433ce31..6d75d96c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,7 +56,7 @@ textwrap = "0.15.0" ignore = "0.4.18" dialoguer = { version = "0.10.2", default-features = false } console = "0.15.0" -minijinja = "0.18.1" +minijinja = "0.19.1" lddtree = "0.2.9" cc = "1.0.72" clap = { version = "3.2.19", features = ["derive", "env", "wrap_help"] } diff --git a/src/templates/Cargo.toml.j2 b/src/templates/Cargo.toml.j2 index 702a8d35f..dcd7cb789 100644 --- a/src/templates/Cargo.toml.j2 +++ b/src/templates/Cargo.toml.j2 @@ -9,11 +9,11 @@ edition = "2021" [lib] name = "{{ crate_name }}" crate-type = ["cdylib"] -{%- endif -%} +{%- endif %} [dependencies] -{%- if bindings == "pyo3" -%} +{% if bindings == "pyo3" -%} pyo3 = { version = "0.16.5", features = ["extension-module"] } -{%- elif bindings == "rust-cpython" -%} +{% elif bindings == "rust-cpython" -%} cpython = { version = "0.7.0", features = ["extension-module"] } -{%- endif -%} +{% endif -%} diff --git a/src/templates/pyproject.toml.j2 b/src/templates/pyproject.toml.j2 index 4a8d76139..b36c77fda 100644 --- a/src/templates/pyproject.toml.j2 +++ b/src/templates/pyproject.toml.j2 @@ -12,14 +12,14 @@ classifiers = [ ] {% if bindings == "cffi" -%} dependencies = ["cffi"] -{%- endif -%} +{%- endif %} -{%- if bindings == "cffi" or bindings == "bin" or mixed -%} +{% if bindings == "cffi" or bindings == "bin" or mixed -%} [tool.maturin] -{%- if bindings == "cffi" or bindings == "bin" -%} +{% if bindings == "cffi" or bindings == "bin" -%} bindings = "{{ bindings }}" -{%- endif -%} -{%- if mixed -%} +{% endif -%} +{% if mixed -%} python-source = "python" -{%- endif -%} -{%- endif -%} +{% endif -%} +{% endif -%}