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.

Sign up for GitHub

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

Move all of the template creation into askama_shared #647

Merged
merged 6 commits into from
Mar 23, 2022
Merged

Move all of the template creation into askama_shared #647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1db7e8c
Fix clippy warning
Kijewski Mar 10, 2022
f8eef40
Move handling of integrations into askama_shared
Kijewski Mar 10, 2022
f874614
Reduce askama_derive to a single re-export
Kijewski Mar 10, 2022
3baec95
Un-"pub" most of askama_shared's internals
Kijewski Mar 10, 2022
774c651
Update version numbers
Kijewski Mar 10, 2022
c8a7ab5
Merge derive.rs into generator.rs
Kijewski Mar 23, 2022
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
8 changes: 4 additions & 4 deletions askama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "askama"
version = "0.11.1"
version = "0.11.2"
description = "Type-safe, compiled Jinja-like templates for Rust"
documentation = "https://docs.rs/askama"
keywords = ["markup", "template", "jinja2", "html"]
Expand Down Expand Up @@ -37,9 +37,9 @@ mime = []
mime_guess = []

[dependencies]
askama_derive = { version = "0.11.2", path = "../askama_derive" }
askama_escape = { version = "0.10", path = "../askama_escape" }
askama_shared = { version = "0.12.1", path = "../askama_shared", default-features = false }
askama_derive = { version = "0.12.0", path = "../askama_derive" }
askama_escape = { version = "0.10.3", path = "../askama_escape" }
askama_shared = { version = "0.13.0", path = "../askama_shared", default-features = false }

[package.metadata.docs.rs]
features = ["config", "humansize", "num-traits", "serde-json", "serde-yaml"]
5 changes: 2 additions & 3 deletions askama_actix/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "askama_actix"
version = "0.13.0"
version = "0.13.1"
description = "Actix-Web integration for Askama templates"
documentation = "https://docs.rs/askama"
keywords = ["markup", "template", "jinja2", "html"]
Expand All @@ -14,8 +14,7 @@ edition = "2018"

[dependencies]
actix-web = { version = "4", default-features = false }
askama = { version = "0.11.1", path = "../askama", default-features = false, features = ["with-actix-web"] }
askama_shared = { version = "0.12.2", path = "../askama_shared" }
askama = { version = "0.11.2", path = "../askama", default-features = false, features = ["with-actix-web"] }

[dev-dependencies]
actix-rt = { version = "2", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions askama_derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "askama_derive"
version = "0.11.2"
version = "0.12.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this bump?

Copy link
Collaborator Author

@Kijewski Kijewski Mar 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I un-exported a bunch of symbols. Older askama_shared versions would break with this update. Every item in https://github.com/djc/askama/blob/main/askama_derive/src/lib.rs#L8-L10 is gone after the PR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the features section, because they are now handles in askama_shared.

I am not 100% sure, but I guess if I re-added the features, incrementing the patch version only should be fine.

description = "Procedural macro package for Askama"
homepage = "https://github.com/djc/askama"
repository = "https://github.com/djc/askama"
Expand All @@ -13,4 +13,4 @@ edition = "2018"
proc-macro = true

[dependencies]
askama_shared = { version = "0.12.1", path = "../askama_shared", default-features = false }
askama_shared = { version = "0.13.0", path = "../askama_shared", default-features = false }
2 changes: 1 addition & 1 deletion askama_shared/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "askama_shared"
version = "0.12.2"
version = "0.13.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this bump?

Copy link
Collaborator Author

@Kijewski Kijewski Mar 23, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I un-exported a bunch of symbols. Older askama_derive versions would break with this update. Every item in https://github.com/djc/askama/blob/main/askama_derive/src/lib.rs#L8-L10 is gone after the PR.

description = "Shared code for Askama"
homepage = "https://github.com/djc/askama"
repository = "https://github.com/djc/askama"
Expand Down