Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(don't merge) Prepare to publish as axominjinja #1

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 64 additions & 64 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ version = "0.1.0"
edition = "2018"

[features]
speedups = ["minijinja/speedups"]
speedups = ["axominijinja/speedups"]

[dependencies]
handlebars = "5.1.2"
liquid = "0.26.1"
minijinja = { path = "../minijinja", default-features = false, features = [
axominijinja = { path = "../minijinja", default-features = false, features = [
"unstable_machinery",
"multi_template",
"builtins",
Expand Down
2 changes: 1 addition & 1 deletion examples/actix-web-demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ publish = false

[dependencies]
actix-web = "4.6.0"
minijinja = { path = "../../minijinja", features = ["loader"] }
axominijinja = { path = "../../minijinja", features = ["loader"] }
2 changes: 1 addition & 1 deletion examples/autoreload/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["loader"] }
axominijinja = { path = "../../minijinja", features = ["loader"] }
minijinja-autoreload = { path = "../../minijinja-autoreload" }
2 changes: 1 addition & 1 deletion examples/build-script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ edition = "2021"
publish = false

[build-dependencies]
minijinja = { path = "../../minijinja", default-features = false, features = ["serde", "builtins"] }
axominijinja = { path = "../../minijinja", default-features = false, features = ["serde", "builtins"] }
2 changes: 1 addition & 1 deletion examples/call-block-function/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/custom-loader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["loader"] }
axominijinja = { path = "../../minijinja", features = ["loader"] }
2 changes: 1 addition & 1 deletion examples/debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/deserialize/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde = { version = "1.0.159", features = ["derive"] }
2 changes: 1 addition & 1 deletion examples/dsl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { version = "2.4.0", path = "../../minijinja" }
axominijinja = { version = "2.4.0", path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/dynamic-context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/dynamic-objects/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/embedding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
bundled = []

[dependencies]
minijinja = { path = "../../minijinja", features = ["loader"] }
axominijinja = { path = "../../minijinja", features = ["loader"] }
minijinja-embed = { path = "../../minijinja-embed" }

[build-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/error/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/eval-to-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { version = "2.4.0", path = "../../minijinja" }
axominijinja = { version = "2.4.0", path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde_json = "1.0.68"
2 changes: 1 addition & 1 deletion examples/filters/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/function-using-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"
publish = false

[dependencies]
minijinja = { version = "2.4.0", path = "../../minijinja" }
axominijinja = { version = "2.4.0", path = "../../minijinja" }
tokio = { version = "1.30.0", features = ["macros", "rt", "rt-multi-thread"] }
2 changes: 1 addition & 1 deletion examples/generate-yaml/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["json", "custom_syntax"] }
axominijinja = { path = "../../minijinja", features = ["json", "custom_syntax"] }
2 changes: 1 addition & 1 deletion examples/hello/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/inheritance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde = { version = "1.0.130", features = ["derive"] }
serde_json = "1.0.68"
2 changes: 1 addition & 1 deletion examples/invalid-value/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde = { version = "1.0.159", features = ["derive"] }
2 changes: 1 addition & 1 deletion examples/line-statements/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["custom_syntax"] }
axominijinja = { path = "../../minijinja", features = ["custom_syntax"] }
2 changes: 1 addition & 1 deletion examples/load-lazy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde_json = "1.0.87"
2 changes: 1 addition & 1 deletion examples/load-resource/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde_json = "1.0.87"
2 changes: 1 addition & 1 deletion examples/macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/merge-context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
minijinja-contrib = { path = "../../minijinja-contrib", features = ["datetime"] }
2 changes: 1 addition & 1 deletion examples/minimal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["serde"], default-features = false }
axominijinja = { path = "../../minijinja", features = ["serde"], default-features = false }
2 changes: 1 addition & 1 deletion examples/none-as-undefined/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde = { version = "1.0.130", features = ["derive"] }
2 changes: 1 addition & 1 deletion examples/object-ref/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/object-using-async/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ edition = "2021"
publish = false

[dependencies]
minijinja = { version = "2.4.0", path = "../../minijinja" }
axominijinja = { version = "2.4.0", path = "../../minijinja" }
tokio = { version = "1.37.0", features = ["macros", "rt", "rt-multi-thread"] }
2 changes: 1 addition & 1 deletion examples/path-loader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["loader"] }
axominijinja = { path = "../../minijinja", features = ["loader"] }
once_cell = "1.13.1"
2 changes: 1 addition & 1 deletion examples/recursive-for/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja", features = ["debug", "internal_debug"] }
axominijinja = { path = "../../minijinja", features = ["debug", "internal_debug"] }
serde = { version = "1.0.130", features = ["derive"] }
2 changes: 1 addition & 1 deletion examples/render-macro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/render-template/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ publish = false

[dependencies]
argh = "0.1.6"
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
serde_json = "1.0.68"
2 changes: 1 addition & 1 deletion examples/render-value/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/self-referential-context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/streaming/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/syntax-highlighting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
syntect = { version = "5.2.0", default-features = false, features = ["default-fancy", "default-syntaxes"] }
2 changes: 1 addition & 1 deletion examples/undefined-tracking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion examples/value-tracking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
minijinja = { path = "../../minijinja" }
axominijinja = { path = "../../minijinja" }
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cargo-fuzz = true
arbitrary = { version = "1.1.6", features = ["derive"] }
libfuzzer-sys = "0.4"
serde = { version = "1.0.145", features = ["derive"] }
minijinja = { path = "../minijinja", features = ["json", "urlencode", "fuel"] }
axominijinja = { path = "../minijinja", features = ["json", "urlencode", "fuel"] }

# Prevent this from interfering with workspaces
[workspace]
Expand Down
4 changes: 2 additions & 2 deletions minijinja-autoreload/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ default = ["watch-fs"]
watch-fs = ["notify"]

[dependencies]
minijinja = { version = "2.4.0", path = "../minijinja", default-features = false }
axominijinja = { version = "2.4.0", path = "../minijinja", default-features = false }
notify = { version = "5.0.0", optional = true, default-features = false, features = ["macos_fsevent"] }

[dev-dependencies]
minijinja = { version = "2.4.0", path = "../minijinja", features = ["loader"] }
axominijinja = { version = "2.4.0", path = "../minijinja", features = ["loader"] }
2 changes: 1 addition & 1 deletion minijinja-cabi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2021"
crate-type = ["cdylib"]

[dependencies]
minijinja = { version = "2.4.0", path = "../minijinja", features = ["loader", "custom_syntax"] }
axominijinja = { version = "2.4.0", path = "../minijinja", features = ["loader", "custom_syntax"] }
6 changes: 3 additions & 3 deletions minijinja-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ datetime = ["minijinja-contrib/datetime", "minijinja-contrib/timezone"]
json5 = ["serde_json5"]
repl = ["rustyline"]
completions = ["clap_complete", "clap_complete_nushell", "clap_complete_fig"]
unicode = ["minijinja/unicode"]
unicode = ["axominijinja/unicode"]
ini = ["configparser"]
contrib = ["minijinja-contrib"]
toml = ["dep:toml", "home"]
preserve_order = ["minijinja/preserve_order"]
preserve_order = ["axominijinja/preserve_order"]

[dependencies]
anyhow = "1.0.74"
Expand All @@ -38,7 +38,7 @@ clap = { version = "4.3.21", default-features = false, features = [
"error-context",
] }
dunce = "1.0.4"
minijinja = { version = "=2.4.0", path = "../minijinja", features = [
axominijinja = { version = "=2.4.0", path = "../minijinja", features = [
"loader",
"json",
"urlencode",
Expand Down
6 changes: 3 additions & 3 deletions minijinja-contrib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ all-features = true

[features]
default = []
pycompat = ["minijinja/builtins"]
pycompat = ["axominijinja/builtins"]
datetime = ["time"]
timezone = ["time-tz"]
rand = ["dep:rand"]

[dependencies]
minijinja = { version = "2.4.0", path = "../minijinja", default-features = false }
axominijinja = { version = "2.4.0", path = "../minijinja", default-features = false }
rand = { version = "0.8.5", optional = true, default-features = false, features = ["std", "std_rng", "small_rng"] }
serde = "1.0.164"
time = { version = "0.3.35", optional = true, features = ["serde", "formatting", "parsing"] }
Expand All @@ -32,5 +32,5 @@ time-tz = { version = "1.0.3", features = ["db"], optional = true }
[dev-dependencies]
insta = { version = "1.38.0", features = ["glob", "serde"] }
chrono = { version = "0.4.26", features = ["serde"] }
minijinja = { version = "2.4.0", path = "../minijinja", features = ["loader"] }
axominijinja = { version = "2.4.0", path = "../minijinja", features = ["loader"] }
similar-asserts = "1.4.2"
2 changes: 1 addition & 1 deletion minijinja-py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ name = "minijinja_py"
crate-type = ["cdylib"]

[dependencies]
minijinja = { version = "2.4.0", path = "../minijinja", features = ["loader", "json", "urlencode", "fuel", "preserve_order", "speedups", "custom_syntax"] }
axominijinja = { version = "2.4.0", path = "../minijinja", features = ["loader", "json", "urlencode", "fuel", "preserve_order", "speedups", "custom_syntax"] }
once_cell = "1.17.0"
pyo3 = { version = "0.21.1", features = ["extension-module", "serde", "abi3-py38"] }
5 changes: 4 additions & 1 deletion minijinja/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "minijinja"
name = "axominijinja"
version = "2.4.0"
edition = "2021"
license = "Apache-2.0"
Expand All @@ -16,6 +16,9 @@ exclude = ["tests"]
features = ["loader", "json", "urlencode", "custom_syntax", "fuel"]
rustdoc-args = ["--cfg", "docsrs", "--html-in-header", "doc-header.html"]

[lib]
name = "minijinja"

[features]
default = [
"builtins",
Expand Down