vl-convert-python 1.2.1__tar.gz → 1.2.2__tar.gz

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/Cargo.lock

@@ -6144,7 +6144,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vl-convert"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -6161,7 +6161,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-pdf"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "anyhow",
  "itertools 0.12.0",
@@ -6177,7 +6177,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-python"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "futures",
  "lazy_static",
@@ -6189,7 +6189,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-rs"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "deno_core",
  "deno_emit",
@@ -6221,7 +6221,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-vendor"
-version = "1.2.1"
+version = "1.2.2"
 dependencies = [
  "anyhow",
  "dircpy",

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vl-convert-python
-Version: 1.2.1
+Version: 1.2.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 License-File: LICENSE

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/vl-convert-pdf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-pdf"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/vl-convert-python/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-python"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/vl-convert-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vl-convert-rs"
-version = "1.2.1"
+version = "1.2.2"
 edition = "2021"
 license = "BSD-3-Clause"
 readme = "README.md"

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/vl-convert-rs/src/converter.rs

@@ -399,8 +399,9 @@ function cloneScenegraph(obj) {
       'marktype', 'name', 'role', 'interactive', 'clip', 'items', 'zindex',
       'x', 'y', 'width', 'height', 'align', 'baseline',             // layout
       'fill', 'fillOpacity', 'opacity', 'blend',                    // fill
-      'stroke', 'strokeOpacity', 'strokeWidth', 'strokeCap',
-      'strokeJoin',                                                 // stroke
+      'x1', 'y1', 'stops', 'offset', 'color',                       // gradient
+      'stroke', 'strokeOpacity', 'strokeWidth', 'strokeCap',        // stroke
+      'strokeJoin',
       'strokeDash', 'strokeDashOffset',                             // stroke dash
       'strokeForeground', 'strokeOffset',                           // group
       'startAngle', 'endAngle', 'innerRadius', 'outerRadius',       // arc

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/vl-convert-rs/tests/test_specs.rs

@@ -154,12 +154,12 @@ fn load_expected_scenegraph(
     name: &str,
     vl_version: VlVersion,
     theme: Option<&str>,
-) -> Option<Value> {
+) -> Option<String> {
     let spec_path = make_expected_scenegraph_path(name, vl_version, theme);
     let Some(p) = fs::read_to_string(&spec_path).ok() else {
         return None;
     };
-    serde_json::from_str(&p).ok()
+    Some(p)
 }
 
 fn write_failed_svg(name: &str, vl_version: VlVersion, theme: Option<&str>, img: &str) -> PathBuf {
@@ -223,12 +223,16 @@ fn check_svg(name: &str, vl_version: VlVersion, theme: Option<&str>, img: &str)
 
 fn check_scenegraph(name: &str, vl_version: VlVersion, theme: Option<&str>, sg: &Value) {
     let expected = load_expected_scenegraph(name, vl_version, theme);
-    if Some(sg) != expected.as_ref() {
-        let path = write_failed_scenegraph(name, vl_version, theme, sg);
-        panic!(
-            "Specs don't match for {}.sg.json. Failed image written to {:?}",
-            name, path
-        )
+    if let Some(expected) = &expected {
+        let result_pretty = serde_json::to_string_pretty(sg).unwrap();
+        if expected != &result_pretty {
+            let path = write_failed_scenegraph(name, vl_version, theme, sg);
+            println!(
+                "Scenegraphs don't match for {}.sg.json. Failed image written to {:?}",
+                name, path
+            );
+            assert_eq!(&result_pretty, expected)
+        }
     }
 }
 
@@ -590,9 +594,9 @@ mod test_scenegraph {
     #[rstest]
     fn test(
         #[values(
-            // This one has round-trip stable numeric values
             "no_text_in_font_metrics",
             "geoScale",
+            "table_heatmap",
         )]
         name: &str,
     ) {
@@ -643,6 +647,7 @@ mod test_png_no_theme {
         case("long_legend_label", 1.0),
         case("quakes_initial_selection", 1.0),
         case("geoScale", 1.0),
+        case("table_heatmap", 1.0),
     )]
     fn test(
         name: &str,

{vl_convert_python-1.2.1 → vl_convert_python-1.2.2}/vl-convert-rs/tests/vl-specs/expected/v5_8/no_text_in_font_metrics.sg.json

@@ -84,6 +84,7 @@
                   }
                 ],
                 "orient": "left",
+                "offset": 0,
                 "x": 0.5,
                 "y": 0.5
               }
@@ -199,6 +200,7 @@
                   }
                 ],
                 "orient": "bottom",
+                "offset": 0,
                 "x": 0.5,
                 "y": 200.5
               }
@@ -419,6 +421,7 @@
                   }
                 ],
                 "orient": "left",
+                "offset": 0,
                 "x": 0.5,
                 "y": 0.5
               }