Feat: bump plotly

Author: jkelleyrtp

plotly/Cargo.toml

@@ -12,9 +12,7 @@ repository = "https://github.com/igiagkiozis/plotly"
 edition = "2018"
 keywords = ["plot", "chart", "plotly"]
 
-exclude = [
-    "target/*"
-]
+exclude = ["target/*"]
 
 [features]
 # Adds plot save functionality to the following formats: png, jpeg, webp, svg, pdf and eps.
@@ -23,17 +21,17 @@ plotly_ndarray = ["ndarray"]
 
 [dependencies]
 plotly_kaleido = { version = "0.2.0", path = "../plotly_kaleido", optional = true }
-ndarray = { version = ">=0.13.1", optional = true }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-askama = "0.9.0"
-rand = "0.7.3"
-rand_distr = "0.2.2"
+ndarray = { version = "0.15.1", optional = true }
+serde = { version = "1.0.125", features = ["derive"] }
+serde_json = "1.0.64"
+askama = "0.10.5"
+rand = "0.8.3"
+rand_distr = "0.4.0"
 
 
 [dev-dependencies]
 plotly_kaleido = { version = "0.2.0", path = "../plotly_kaleido" }
-itertools = "0.9.0"
+itertools = "0.10.0"
 itertools-num = "0.1.3"
-csv = "1.1.3"
-ndarray = "0.13.1"
+csv = "1.1.6"
+ndarray = "0.15.1"

plotly/src/plot.rs

@@ -54,7 +54,6 @@ pub enum ImageFormat {
     EPS,
 }
 
-
 /// A struct that implements `Trace` can be serialized to json format that is understood by Plotly.js.
 pub trait Trace {
     fn serialize(&self) -> String;
@@ -120,7 +119,6 @@ plot.save("filename", ImageFormat::PNG, width, height, scale);
 See https://igiagkiozis.github.io/plotly/content/getting_started.html for further details.
 "#;
 
-
 impl Plot {
     /// Create a new `Plot`.
     pub fn new() -> Plot {
@@ -164,10 +162,13 @@ impl Plot {
         let rendered = rendered.as_bytes();
         let mut temp = env::temp_dir();
 
-        let mut plot_name = rand::thread_rng()
-            .sample_iter(&rand::distributions::Alphanumeric)
-            .take(22)
-            .collect::<String>();
+        let mut plot_name = String::from_utf8(
+            thread_rng()
+                .sample_iter(&Alphanumeric)
+                .take(22)
+                .collect::<Vec<u8>>(),
+        )
+        .unwrap();
         plot_name.push_str(".html");
         plot_name = format!("plotly_{}", plot_name);
 
@@ -191,10 +192,13 @@ impl Plot {
         let rendered = rendered.as_bytes();
         let mut temp = env::temp_dir();
 
-        let mut plot_name = rand::thread_rng()
-            .sample_iter(&rand::distributions::Alphanumeric)
-            .take(22)
-            .collect::<String>();
+        let mut plot_name = String::from_utf8(
+            thread_rng()
+                .sample_iter(&Alphanumeric)
+                .take(22)
+                .collect::<Vec<u8>>(),
+        )
+        .unwrap();
         plot_name.push_str(".html");
 
         temp.push(plot_name);
@@ -217,10 +221,13 @@ impl Plot {
         let rendered = rendered.as_bytes();
         let mut temp = env::temp_dir();
 
-        let mut plot_name = rand::thread_rng()
-            .sample_iter(&rand::distributions::Alphanumeric)
-            .take(22)
-            .collect::<String>();
+        let mut plot_name: String = String::from_utf8(
+            thread_rng()
+                .sample_iter(&Alphanumeric)
+                .take(22)
+                .collect::<Vec<u8>>(),
+        )
+        .unwrap();
         plot_name.push_str(".html");
 
         temp.push(plot_name);
@@ -260,14 +267,26 @@ impl Plot {
         match plot_div_id {
             Some(id) => self.render_inline(id.as_ref()),
             None => {
-                let rand_id: String = thread_rng().sample_iter(&Alphanumeric).take(20).collect();
+                let rand_id = String::from_utf8(
+                    thread_rng()
+                        .sample_iter(&Alphanumeric)
+                        .take(20)
+                        .collect::<Vec<u8>>(),
+                )
+                .unwrap();
                 self.render_inline(rand_id.as_str())
             }
         }
     }
 
     fn to_jupyter_notebook_html(&self) -> String {
-        let plot_div_id: String = thread_rng().sample_iter(&Alphanumeric).take(20).collect();
+        let plot_div_id = String::from_utf8(
+            thread_rng()
+                .sample_iter(&Alphanumeric)
+                .take(20)
+                .collect::<Vec<u8>>(),
+        )
+        .unwrap();
         let plot_data = self.render_plot_data();
 
         let tmpl = JupyterNotebookPlotTemplate {
@@ -280,7 +299,10 @@ impl Plot {
     /// Display plot in Jupyter Notebook.
     pub fn notebook_display(&self) {
         let plot_data = self.to_jupyter_notebook_html();
-        println!("EVCXR_BEGIN_CONTENT text/html\n{}\nEVCXR_END_CONTENT", plot_data);
+        println!(
+            "EVCXR_BEGIN_CONTENT text/html\n{}\nEVCXR_END_CONTENT",
+            plot_data
+        );
     }
 
     /// Display plot in Jupyter Lab.

plotly_kaleido/Cargo.toml

@@ -12,19 +12,15 @@ repository = "https://github.com/igiagkiozis/plotly"
 edition = "2018"
 keywords = ["plot", "chart", "plotly", "ndarray"]
 
-exclude = [
-    "target/*",
-    "kaleido/*",
-    "examples/*"
-]
+exclude = ["target/*", "kaleido/*", "examples/*"]
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-base64 = "0.12.3"
+base64 = "0.13.0"
 
 [dev-dependencies]
 zip = "0.5.6"
 
 [build-dependencies]
-zip = "0.5.6"
+zip = "0.5.6"