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

Add "with-axum" feature to allow compilation when other dependencies use axum #181

Merged
merged 4 commits into from
May 10, 2024
Merged

Add "with-axum" feature to allow compilation when other dependencies use axum #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4670a78
Add "with_axum" feature that brings the required dependencies
dureuill Feb 15, 2024
2340e36
Update CHANGELOG
dureuill Feb 15, 2024
8953f52
Merge remote-tracking branch 'origin/main' into dureuill/feature_with…
andrei-ng May 10, 2024
3ea3d31
Merge remote-tracking branch 'origin/main' into dureuill/feature_with…
andrei-ng May 10, 2024
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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

## [0.8.5] - 2024-xx-xx
### Added
- [[#181](https://github.com/igiagkiozis/plotly/pull/181)] Fix compilation error when mixing the crate with `askama/with-axum` by adding `with-axum` feature.
- [[#163](https://github.com/plotly/plotly.rs/pull/163)] Added `DensityMapbox`.
- [[#153](https://github.com/igiagkiozis/plotly/pull/153)] Added `LayoutScene`.

Expand Down Expand Up @@ -47,8 +48,7 @@ Version 0.8.0 represents a significant release which refactors a lot of the code
- Support for `Sankey` diagrams
- Support for `Plot3D` - 3D plots for scatter, line and surface data
### Changed
- Improve implementation of `private::NumOrString` to support more primitive types ([Issue
#47](https://github.com/igiagkiozis/plotly/issues/47))
- Improve implementation of `private::NumOrString` to support more primitive types ([Issue #47](https://github.com/igiagkiozis/plotly/issues/47))
- Remove `private::TruthyEnum` in favour of a more robust way of serializing to `String` or `bool`
- Refactor `Color` module
- Refactored HTML templates with cleaner Javascript code
Expand Down
2 changes: 2 additions & 0 deletions plotly/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ kaleido = ["plotly_kaleido"]
plotly_ndarray = ["ndarray"]
plotly_image = ["image"]
wasm = ["getrandom", "js-sys", "wasm-bindgen", "wasm-bindgen-futures"]
with-axum = ["askama/with-axum", "askama_axum"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Maybe the feature name could be a bit better, but naming is always hard 😁
Will merge it like this for now.


[dependencies]
askama = { version = ">=0.11.0, <0.13.0", features = ["serde-json"] }
askama_axum = { version = "0.4.0", optional = true }
dyn-clone = "1"
erased-serde = "0.4"
getrandom = { version = "0.2", features = ["js"], optional = true }
Expand Down
Loading