Merge remote-tracking branch 'origin/main' into sjackman/sj/serde_with

Signed-off-by: Andrei Gherghescu <[email protected]>

Author: andrei-ng

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/ci.yml

@@ -3,9 +3,9 @@ name: CI
 on:
   workflow_dispatch:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 # Cancel any in-flight jobs for the same PR/branch so there's only one active
 # at a time
@@ -27,7 +27,7 @@ jobs:
           components: rustfmt
       - run: cargo fmt --all -- --check
       - run: cd ${{ github.workspace }}/examples && cargo fmt --all -- --check
-    
+
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
@@ -57,7 +57,9 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - run: cargo test --features plotly_ndarray,plotly_image,kaleido
-  
+      - if: ${{ matrix.os == 'windows-latest' }}
+        run: gci -recurse -filter "*example*"
+
   code-coverage:
     name: Code Coverage
     runs-on: ubuntu-latest
@@ -70,7 +72,7 @@ jobs:
       # we are skipping anything to do with wasm here
       - run: cargo llvm-cov --workspace --features plotly_ndarray,plotly_image,kaleido --lcov --output-path lcov.info
       - uses: codecov/codecov-action@v3
-      
+
   build_examples:
     name: Build Examples
     strategy:
@@ -94,7 +96,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
       - run: cd ${{ github.workspace }}/examples/${{ matrix.example }} && cargo build
-  
+
   build_wasm_examples:
     name: Build Wasm Examples
     strategy:

examples/statistical_charts/src/main.rs

@@ -345,7 +345,7 @@ fn fully_styled_box_plot() {
         v
     };
 
-    let x_data = vec![
+    let x_data = [
         "Carmelo<br>Anthony",
         "Dwyane<br>Wade",
         "Deron<br>Williams",

plotly/Cargo.toml

@@ -41,7 +41,7 @@ wasm-bindgen-futures = { version = "0.4", optional = true }
 [dev-dependencies]
 csv = "1.1.6"
 image = "0.24.4"
-itertools = "0.10.3"
+itertools = ">=0.10, <0.13"
 itertools-num = "0.1.3"
 ndarray = "0.15.4"
 plotly_kaleido = { version = "0.8.4", path = "../plotly_kaleido" }

plotly/src/plot.rs

@@ -162,7 +162,7 @@ impl Traces {
 ///
 ///     let layout = Layout::new().title("<b>Line and Scatter Plot</b>".into());
 ///     plot.set_layout(layout);
-///     
+///
 ///     # if false {  // We don't actually want to try and display the plot in a browser when running a doctest.
 ///     plot.show();
 ///     # }
@@ -650,6 +650,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_png() {
@@ -661,6 +662,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_jpeg() {
@@ -672,6 +674,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_svg() {
@@ -683,6 +686,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[ignore] // This seems to fail unpredictably on MacOs.
     #[cfg(feature = "kaleido")]
@@ -695,6 +699,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_pdf() {
@@ -706,6 +711,7 @@ mod tests {
         assert!(!dst.exists());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[cfg(feature = "kaleido")]
     fn test_save_to_webp() {

plotly_kaleido/Cargo.toml

@@ -19,12 +19,8 @@ serde = { version = "1.0.132", features = ["derive"] }
 serde_json = "1.0.73"
 base64 = "0.13.0"
 dunce = "1.0.2"
-directories = "4.0.1"
-
-[dev-dependencies]
-zip = "0.5.13"
+directories = ">=4, <6"
 
 [build-dependencies]
-zip = "0.5.13"
-directories = "4.0.1"
-
+zip = "1.1"
+directories = ">=4, <6"

plotly_kaleido/build.rs

@@ -10,10 +10,14 @@ use std::process::Command;
 
 use directories::ProjectDirs;
 
-#[cfg(target_os = "linux")]
+#[cfg(all(target_arch = "x86_64", target_os = "linux"))]
 const KALEIDO_URL: &str =
     "https://github.com/plotly/Kaleido/releases/download/v0.2.1/kaleido_linux_x64.zip";
 
+#[cfg(all(target_arch = "aarch64", target_os = "linux"))]
+const KALEIDO_URL: &str =
+    "https://github.com/plotly/Kaleido/releases/download/v0.2.1/kaleido_linux_arm64.zip";
+
 #[cfg(target_os = "windows")]
 const KALEIDO_URL: &str =
     "https://github.com/plotly/Kaleido/releases/download/v0.2.1/kaleido_win_x64.zip";

plotly_kaleido/src/lib.rs

@@ -163,7 +163,7 @@ impl Kaleido {
         }
 
         let output_lines = BufReader::new(process.stdout.unwrap()).lines();
-        for line in output_lines.flatten() {
+        for line in output_lines.map_while(Result::ok) {
             let res = KaleidoResult::from(line.as_str());
             if let Some(image_data) = res.result {
                 let data: Vec<u8> = match format {
@@ -237,6 +237,7 @@ mod tests {
         assert_eq!(to_value(kaleido_data).unwrap(), expected);
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     fn test_save_png() {
         let test_plot = create_test_plot();
@@ -247,6 +248,7 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     fn test_save_jpeg() {
         let test_plot = create_test_plot();
@@ -257,6 +259,7 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     fn test_save_webp() {
         let test_plot = create_test_plot();
@@ -267,6 +270,7 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     fn test_save_svg() {
         let test_plot = create_test_plot();
@@ -277,6 +281,7 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     fn test_save_pdf() {
         let test_plot = create_test_plot();
@@ -287,6 +292,7 @@ mod tests {
         assert!(std::fs::remove_file(dst.as_path()).is_ok());
     }
 
+    #[cfg(not(target_os = "windows"))]
     #[test]
     #[ignore]
     fn test_save_eps() {