Update base64 requirement from 0.13.0 to 0.22.1 (#198)

* Update base64 requirement from 0.13.0 to 0.22.1 Updates the requirements on [base64](https://github.com/marshallpierce/rust-base64) to permit the latest version. - [Changelog](https://github.com/marshallpierce/rust-base64/blob/master/RELEASE-NOTES.md) - [Commits](marshallpierce/rust-base64@v0.13.0...v0.22.1) --- updated-dependencies: - dependency-name: base64 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Andrei Gherghescu <[email protected]> * update implementation to work with new base64 crate version Signed-off-by: Andrei Gherghescu <[email protected]> * don't pin down patch version for base64 crate Signed-off-by: Andrei Gherghescu <[email protected]> * remove conditional compilation for already ignored test Signed-off-by: Andrei Gherghescu <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Andrei Gherghescu <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrei Gherghescu <[email protected]>
plotly · May 1, 2024 · 1ce30f0 · 1ce30f0
1 parent 14dc885
commit 1ce30f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/plotly/src/plot.rs b/plotly/src/plot.rs
@@ -686,7 +686,6 @@ mod tests {
         assert!(!dst.exists());
     }
 
-    #[cfg(not(target_os = "windows"))]
     #[test]
     #[ignore] // This seems to fail unpredictably on MacOs.
     #[cfg(feature = "kaleido")]

diff --git a/plotly_kaleido/Cargo.toml b/plotly_kaleido/Cargo.toml
@@ -17,7 +17,7 @@ exclude = ["target/*", "kaleido/*", "examples/*"]
 [dependencies]
 serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
-base64 = "0.13.0"
+base64 = "0.22"
 dunce = "1.0.2"
 directories = ">=4, <6"
 

diff --git a/plotly_kaleido/src/lib.rs b/plotly_kaleido/src/lib.rs
@@ -16,6 +16,7 @@ use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
 
+use base64::{engine::general_purpose, Engine as _};
 use directories::ProjectDirs;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -168,7 +169,7 @@ impl Kaleido {
             if let Some(image_data) = res.result {
                 let data: Vec<u8> = match format {
                     "svg" | "eps" => image_data.as_bytes().to_vec(),
-                    _ => base64::decode(image_data).unwrap(),
+                    _ => general_purpose::STANDARD.decode(image_data).unwrap(),
                 };
                 let mut file = File::create(dst.as_path())?;
                 file.write_all(&data)?;
@@ -292,7 +293,6 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
-    #[cfg(not(target_os = "windows"))]
     #[test]
     #[ignore]
     fn test_save_eps() {