vl-convert-python 2.0.0rc2__tar.gz → 2.0.0rc6__tar.gz

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/Cargo.lock

@@ -10753,9 +10753,16 @@ dependencies = [
  "serde_json",
  "url",
  "utoipa",
+ "utoipa-swagger-ui-vendored",
  "zip 3.0.0",
 ]
 
+[[package]]
+name = "utoipa-swagger-ui-vendored"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d"
+
 [[package]]
 name = "uuid"
 version = "1.26.0"
@@ -10846,7 +10853,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vl-convert"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "assert_cmd",
  "bytes",
@@ -10875,7 +10882,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-canvas2d"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "cosmic-text",
  "csscolorparser",
@@ -10894,7 +10901,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-canvas2d-deno"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "csscolorparser",
  "deno_core",
@@ -10910,7 +10917,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-google-fonts"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "backon",
  "dashmap 6.2.1",
@@ -10929,7 +10936,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-python"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "futures",
  "lazy_static",
@@ -10943,7 +10950,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-rs"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "arc-swap",
  "backon",
@@ -10997,7 +11004,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-server"
-version = "2.0.0-rc2"
+version = "2.0.0-rc6"
 dependencies = [
  "arc-swap",
  "axum",
@@ -11034,7 +11041,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-vendor"
-version = "2.0.0-rc2"
+version = "0.0.0"
 dependencies = [
  "anyhow",
  "dircpy",

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/Cargo.toml

@@ -3,6 +3,12 @@ resolver = "2"  # Needed for proper wgpu compilation
 
 members = ["vl-convert-rs", "vl-convert-python", "vl-convert-canvas2d", "vl-convert-canvas2d-deno", "vl-convert-google-fonts"]
 
+[workspace.package]
+version = "2.0.0-rc6"
+edition = "2021"
+license = "BSD-3-Clause"
+repository = "https://github.com/vega/vl-convert"
+
 [profile.release]
 strip = true  # Automatically strip symbols from the binary
 opt-level = "z"  # Optimize for size
@@ -16,6 +22,13 @@ assert_cmd = "2.0"
 backon = { version = "1", default-features = false, features = ["tokio-sleep", "std", "std-blocking-sleep"] }
 clap = { version = "4.5", features = ["derive", "env"] }
 
+# Internal packages are released in lockstep.
+vl-convert-canvas2d = { path = "vl-convert-canvas2d", version = "=2.0.0-rc6" }
+vl-convert-canvas2d-deno = { path = "vl-convert-canvas2d-deno", version = "=2.0.0-rc6" }
+vl-convert-google-fonts = { path = "vl-convert-google-fonts", version = "=2.0.0-rc6" }
+vl-convert-rs = { path = "vl-convert-rs", version = "=2.0.0-rc6" }
+vl-convert-server = { path = "vl-convert-server", version = "=2.0.0-rc6" }
+
 # Deno dependencies - versions correspond to Deno v2.9.6
 deno_runtime = "0.266.0"
 node_resolver = "0.96.0"

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vl-convert-python
-Version: 2.0.0rc2
+Version: 2.0.0rc6
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: pytest>=8.3,<9 ; extra == 'test'
@@ -11,7 +11,7 @@ Provides-Extra: test
 License-File: LICENSE
 Summary: Convert Vega-Lite chart specifications to SVG, PNG, or Vega
 Home-Page: https://github.com/jonmmease/vl-convert
-License: BSD-3-Clause
+License-Expression: BSD-3-Clause
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/pyproject.toml

@@ -1,10 +1,12 @@
 [build-system]
-requires = ["maturin>=1.1.0,<2"]
+requires = ["maturin>=1.9.3,<2"]
 build-backend = "maturin"
 
 [project]
 name = "vl-convert-python"
-dynamic = ["version", "readme", "license"]
+dynamic = ["version", "readme"]
+license = "BSD-3-Clause"
+license-files = ["LICENSE"]
 requires-python = ">=3.9"
 description = "Convert Vega-Lite chart specifications to SVG, PNG, or Vega"
 classifiers = [

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-canvas2d/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "vl-convert-canvas2d"
-version = "2.0.0-rc2"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "Pure Rust Canvas 2D API implementation using tiny-skia and cosmic-text"
-license = "BSD-3-Clause"
-repository = "https://github.com/vega/vl-convert"
+license.workspace = true
+repository.workspace = true
 readme = "README.md"
 keywords = ["canvas", "2d", "graphics", "tiny-skia"]
 

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-canvas2d-deno/Cargo.toml

@@ -1,10 +1,10 @@
 [package]
 name = "vl-convert-canvas2d-deno"
-version = "2.0.0-rc2"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "Deno extension for Canvas 2D API wrapping vl-convert-canvas2d"
-license = "BSD-3-Clause"
-repository = "https://github.com/vega/vl-convert"
+license.workspace = true
+repository.workspace = true
 readme = "README.md"
 keywords = ["canvas", "2d", "deno", "graphics"]
 
@@ -18,7 +18,7 @@ deno_core = { workspace = true }
 deno_error = { workspace = true }
 
 # Canvas 2D implementation
-vl-convert-canvas2d = { path = "../vl-convert-canvas2d", version = "2.0.0-rc1" }
+vl-convert-canvas2d = { workspace = true }
 
 # For gradient color parsing
 csscolorparser = "0.8.4"

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-google-fonts/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "vl-convert-google-fonts"
-version = "2.0.0-rc2"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 description = "Google Fonts downloading and caching"
-license = "BSD-3-Clause"
+license.workspace = true
 readme = "README.md"
 homepage = "https://github.com/vega/vl-convert"
-repository = "https://github.com/vega/vl-convert"
+repository.workspace = true
 keywords = ["Fonts", "Google-Fonts"]
 
 [features]

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-python/Cargo.toml

@@ -1,22 +1,19 @@
 [package]
 name = "vl-convert-python"
-version = "2.0.0-rc2"
-edition = "2021"
-license = "BSD-3-Clause"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
 readme = "README.md"
 homepage = "https://github.com/jonmmease/vl-convert"
-repository = "https://github.com/jonmmease/vl-convert"
+repository.workspace = true
 publish = false
 
-[package.metadata.release]
-release = false
-
 [lib]
 name = "vl_convert"
 crate-type = ["cdylib"]
 
 [dependencies]
-vl-convert-rs = { path = "../vl-convert-rs", version = "2.0.0-rc1" }
+vl-convert-rs = { workspace = true }
 pyo3 = { workspace = true }
 lazy_static = { workspace = true }
 futures = { workspace = true }

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-python/src/conversions.rs

@@ -16,6 +16,17 @@ use vl_convert_rs::converter::{
 };
 use vl_convert_rs::module_loader::import_map::VlVersion;
 
+fn validate_pdf_scale(scale: Option<f64>) -> PyResult<()> {
+    if let Some(scale) = scale {
+        if scale != 1.0 {
+            return Err(PyValueError::new_err(
+                "The scale argument must be 1 for PDF output.",
+            ));
+        }
+    }
+    Ok(())
+}
+
 /// Convert a Vega-Lite spec to a Vega spec using a particular
 /// version of the Vega-Lite JavaScript library.
 ///
@@ -830,6 +841,11 @@ pub fn vegalite_to_jpeg(
 ///
 /// Args:
 ///     vg_spec (str | dict): Vega JSON specification string or dict
+///     scale (float):
+///         .. deprecated:: 2.0.0
+///            Retained only for backward compatibility with vl-convert 1.x.
+///            The parameter has no effect on PDF output. The only non-None
+///            value accepted is 1.0. Any other numeric value raises ValueError.
 ///     format_locale (str | dict): d3-format locale name or dictionary
 ///     time_format_locale (str | dict): d3-time-format locale name or dictionary
 ///     vega_plugin (str): Per-request Vega plugin (inline ESM string or URL)
@@ -844,6 +860,7 @@ pub fn vegalite_to_jpeg(
 #[pyo3(signature = (
     vg_spec,
     *,
+    scale=None,
     format_locale=None,
     time_format_locale=None,
     vega_plugin=None,
@@ -855,6 +872,7 @@ pub fn vegalite_to_jpeg(
 ))]
 pub fn vega_to_pdf(
     vg_spec: Py<PyAny>,
+    scale: Option<f64>,
     format_locale: Option<Py<PyAny>>,
     time_format_locale: Option<Py<PyAny>>,
     vega_plugin: Option<String>,
@@ -864,6 +882,7 @@ pub fn vega_to_pdf(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Py<PyAny>> {
+    validate_pdf_scale(scale)?;
     let vg_spec = parse_json_spec(vg_spec)?;
     let format_locale = parse_option_format_locale(format_locale)?;
     let time_format_locale = parse_option_time_format_locale(time_format_locale)?;
@@ -903,6 +922,11 @@ pub fn vega_to_pdf(
 ///     vl_spec (str | dict): Vega-Lite JSON specification string or dict
 ///     vl_version (str): Vega-Lite library version string (e.g. 'v5.15')
 ///         (default to latest)
+///     scale (float):
+///         .. deprecated:: 2.0.0
+///            Retained only for backward compatibility with vl-convert 1.x.
+///            The parameter has no effect on PDF output. The only non-None
+///            value accepted is 1.0. Any other numeric value raises ValueError.
 ///     config (dict | None): Chart configuration object to apply during conversion
 ///     theme (str | None): Named theme (e.g. "dark") to apply during conversion
 ///     format_locale (str | dict): d3-format locale name or dictionary
@@ -919,6 +943,7 @@ pub fn vega_to_pdf(
     vl_spec,
     *,
     vl_version=None,
+    scale=None,
     config=None,
     theme=None,
     format_locale=None,
@@ -932,6 +957,7 @@ pub fn vega_to_pdf(
 pub fn vegalite_to_pdf(
     vl_spec: Py<PyAny>,
     vl_version: Option<&str>,
+    scale: Option<f64>,
     config: Option<Py<PyAny>>,
     theme: Option<String>,
     format_locale: Option<Py<PyAny>>,
@@ -942,6 +968,7 @@ pub fn vegalite_to_pdf(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Py<PyAny>> {
+    validate_pdf_scale(scale)?;
     let vl_version = if let Some(vl_version) = vl_version {
         VlVersion::from_str(vl_version)?
     } else {
@@ -1238,11 +1265,17 @@ pub fn svg_to_jpeg(svg: &str, scale: Option<f32>, quality: Option<u8>) -> PyResu
 ///
 /// Args:
 ///     svg (str): SVG image string
+///     scale (float):
+///         .. deprecated:: 2.0.0
+///            Retained only for backward compatibility with vl-convert 1.x.
+///            The parameter has no effect on PDF output. The only non-None
+///            value accepted is 1.0. Any other numeric value raises ValueError.
 /// Returns:
 ///     bytes: PDF document data
 #[pyfunction]
-#[pyo3(signature = (svg))]
-pub fn svg_to_pdf(svg: &str) -> PyResult<Py<PyAny>> {
+#[pyo3(signature = (svg, *, scale=None))]
+pub fn svg_to_pdf(svg: &str, scale: Option<f64>) -> PyResult<Py<PyAny>> {
+    validate_pdf_scale(scale)?;
     let svg = svg.to_string();
     let pdf_data = run_converter_future(move |converter| async move {
         converter
@@ -1908,6 +1941,7 @@ pub fn vegalite_to_jpeg_asyncio<'py>(
 #[pyo3(signature = (
     vg_spec,
     *,
+    scale=None,
     format_locale=None,
     time_format_locale=None,
     vega_plugin=None,
@@ -1920,6 +1954,7 @@ pub fn vegalite_to_jpeg_asyncio<'py>(
 pub fn vega_to_pdf_asyncio<'py>(
     py: Python<'py>,
     vg_spec: Py<PyAny>,
+    scale: Option<f64>,
     format_locale: Option<Py<PyAny>>,
     time_format_locale: Option<Py<PyAny>>,
     vega_plugin: Option<String>,
@@ -1929,6 +1964,7 @@ pub fn vega_to_pdf_asyncio<'py>(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Bound<'py, PyAny>> {
+    validate_pdf_scale(scale)?;
     let vg_spec = parse_json_spec(vg_spec)?;
     let format_locale = parse_option_format_locale(format_locale)?;
     let time_format_locale = parse_option_time_format_locale(time_format_locale)?;
@@ -1965,6 +2001,7 @@ pub fn vega_to_pdf_asyncio<'py>(
     vl_spec,
     *,
     vl_version=None,
+    scale=None,
     config=None,
     theme=None,
     format_locale=None,
@@ -1979,6 +2016,7 @@ pub fn vegalite_to_pdf_asyncio<'py>(
     py: Python<'py>,
     vl_spec: Py<PyAny>,
     vl_version: Option<&str>,
+    scale: Option<f64>,
     config: Option<Py<PyAny>>,
     theme: Option<String>,
     format_locale: Option<Py<PyAny>>,
@@ -1989,6 +2027,7 @@ pub fn vegalite_to_pdf_asyncio<'py>(
     width: Option<f32>,
     height: Option<f32>,
 ) -> PyResult<Bound<'py, PyAny>> {
+    validate_pdf_scale(scale)?;
     let vl_version = if let Some(vl_version) = vl_version {
         VlVersion::from_str(vl_version)?
     } else {
@@ -2281,8 +2320,13 @@ pub fn svg_to_jpeg_asyncio<'py>(
 
 #[doc = async_variant_doc!("svg_to_pdf")]
 #[pyfunction(name = "svg_to_pdf")]
-#[pyo3(signature = (svg))]
-pub fn svg_to_pdf_asyncio<'py>(py: Python<'py>, svg: &str) -> PyResult<Bound<'py, PyAny>> {
+#[pyo3(signature = (svg, *, scale=None))]
+pub fn svg_to_pdf_asyncio<'py>(
+    py: Python<'py>,
+    svg: &str,
+    scale: Option<f64>,
+) -> PyResult<Bound<'py, PyAny>> {
+    validate_pdf_scale(scale)?;
     let svg = svg.to_string();
     run_converter_future_async(
         py,

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-python/tests/test_asyncio.py

@@ -1,4 +1,5 @@
 import asyncio
+import sys
 
 import pytest
 import vl_convert as vlc
@@ -93,16 +94,35 @@ def test_asyncio_smoke_and_sync_parity_shapes():
     run(scenario())
 
 
-def test_asyncio_pdf_rejects_scale_keyword():
+@pytest.mark.skipif(
+    sys.platform.startswith("win"), reason="PDF tests not supported on windows"
+)
+def test_asyncio_pdf_accepts_scale_one():
     async def scenario():
         vega = await vlca.vegalite_to_vega(SIMPLE_VL_SPEC, vl_version="v5_16")
         svg = await vlca.vegalite_to_svg(SIMPLE_VL_SPEC, vl_version="v5_16")
 
-        with pytest.raises(TypeError):
+        assert (await vlca.vega_to_pdf(vega, scale=1)).startswith(b"%PDF")
+        assert (
+            await vlca.vegalite_to_pdf(
+                SIMPLE_VL_SPEC, vl_version="v5_16", scale=1
+            )
+        ).startswith(b"%PDF")
+        assert (await vlca.svg_to_pdf(svg, scale=1)).startswith(b"%PDF")
+
+    run(scenario())
+
+
+def test_asyncio_pdf_rejects_scale_other_than_one():
+    async def scenario():
+        vega = await vlca.vegalite_to_vega(SIMPLE_VL_SPEC, vl_version="v5_16")
+        svg = await vlca.vegalite_to_svg(SIMPLE_VL_SPEC, vl_version="v5_16")
+
+        with pytest.raises(ValueError, match="scale argument must be 1"):
             await vlca.vega_to_pdf(vega, scale=2)
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError, match="scale argument must be 1"):
             await vlca.vegalite_to_pdf(SIMPLE_VL_SPEC, vl_version="v5_16", scale=2)
-        with pytest.raises(TypeError):
+        with pytest.raises(ValueError, match="scale argument must be 1"):
             await vlca.svg_to_pdf(svg, scale=2)
 
     run(scenario())

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-python/tests/test_specs.py

@@ -262,8 +262,11 @@ def test_png(name, scale, as_dict):
     check_png(png, expected_png, tol=tol, name=f"png_vegalite_{name}")
 
 
-def test_png_google_fonts():
-    vlc.configure(google_fonts=[{"family": "Bangers"}, {"family": "Lugrasimo"}])
+def test_configured_google_fonts():
+    vlc.configure(
+        google_fonts=[{"family": "Bangers"}, {"family": "Lugrasimo"}],
+        missing_fonts="error",
+    )
 
     vl_version = "v5_8"
     vl_spec = load_vl_spec("google_fonts")
@@ -276,6 +279,13 @@ def test_png_google_fonts():
     png = vlc.vegalite_to_png(vl_spec, vl_version=vl_version, scale=2)
     check_png(png, expected_png, name="png_vegalite_google_fonts")
 
+    html = vlc.vegalite_to_html(vl_spec, vl_version=vl_version, bundle=False)
+
+    assert (
+        '<link rel="stylesheet" '
+        'href="https://fonts.googleapis.com/css2?family=Bangers:' in html
+    )
+
 
 @pytest.mark.parametrize(
     "name,scale,theme", [("circle_binned", 1.0, "dark"), ("stacked_bar_h", 2.0, "vox")]
@@ -365,18 +375,46 @@ def test_pdf(name, tol, as_dict):
     check_png(png, expected_png, tol=tol, name=f"pdf_vegalite_{name}")
 
 
-def test_pdf_rejects_scale_keyword():
+@pytest.mark.skipif(
+    sys.platform.startswith("win"), reason="PDF tests not supported on windows"
+)
+def test_pdf_accepts_scale_one():
     vl_version = "v5_8"
     vl_spec = load_vl_spec("circle_binned")
     vg_spec = vlc.vegalite_to_vega(vl_spec, vl_version=vl_version)
     svg = vlc.vegalite_to_svg(vl_spec, vl_version=vl_version)
 
-    with pytest.raises(TypeError):
-        vlc.vega_to_pdf(vg_spec, scale=2)
-    with pytest.raises(TypeError):
-        vlc.vegalite_to_pdf(vl_spec, vl_version=vl_version, scale=2)
-    with pytest.raises(TypeError):
-        vlc.svg_to_pdf(svg, scale=2)
+    assert vlc.vega_to_pdf(vg_spec, scale=1).startswith(b"%PDF")
+    assert vlc.vegalite_to_pdf(
+        vl_spec, vl_version=vl_version, scale=1
+    ).startswith(b"%PDF")
+    assert vlc.svg_to_pdf(svg, scale=1).startswith(b"%PDF")
+
+
+@pytest.mark.parametrize("scale", [0, 2, 1.0000000000000002, float("nan")])
+def test_pdf_rejects_scale_other_than_one(scale):
+    vl_version = "v5_8"
+    vl_spec = load_vl_spec("circle_binned")
+    vg_spec = vlc.vegalite_to_vega(vl_spec, vl_version=vl_version)
+    svg = vlc.vegalite_to_svg(vl_spec, vl_version=vl_version)
+
+    with pytest.raises(ValueError, match="scale argument must be 1"):
+        vlc.vega_to_pdf(vg_spec, scale=scale)
+    with pytest.raises(ValueError, match="scale argument must be 1"):
+        vlc.vegalite_to_pdf(vl_spec, vl_version=vl_version, scale=scale)
+    with pytest.raises(ValueError, match="scale argument must be 1"):
+        vlc.svg_to_pdf(svg, scale=scale)
+
+
+@pytest.mark.parametrize(
+    "function_name", ["vega_to_pdf", "vegalite_to_pdf", "svg_to_pdf"]
+)
+def test_pdf_scale_deprecation_in_docstring(function_name):
+    docstring = getattr(vlc, function_name).__doc__
+    normalized_docstring = " ".join(docstring.split())
+    assert ".. deprecated:: 2.0.0" in docstring
+    assert "Retained only for backward compatibility with vl-convert 1.x" in docstring
+    assert "The only non-None value accepted is 1.0" in normalized_docstring
 
 
 @pytest.mark.skipif(sys.platform.startswith("win"), reason="Font mismatch on windows")

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-python/vl_convert.pyi

@@ -637,7 +637,7 @@ def svg_to_jpeg(
     """
     ...
 
-def svg_to_pdf(svg: str) -> bytes:
+def svg_to_pdf(svg: str, *, scale: float | None = None) -> bytes:
     """
     Convert an SVG image string to PDF document data.
 
@@ -645,6 +645,11 @@ def svg_to_pdf(svg: str) -> bytes:
     ----------
     svg
         SVG image string
+    scale
+        .. deprecated:: 2.0.0
+           Retained only for backward compatibility with vl-convert 1.x.
+           The parameter has no effect on PDF output. The only non-None value
+           accepted is 1.0. Any other numeric value raises ``ValueError``.
 
     Returns
     -------
@@ -775,6 +780,7 @@ def vega_to_jpeg(
 def vega_to_pdf(
     vg_spec: VlSpec,
     *,
+    scale: float | None = None,
     format_locale: FormatLocale | None = None,
     time_format_locale: TimeFormatLocale | None = None,
     vega_plugin: str | None = None,
@@ -791,6 +797,11 @@ def vega_to_pdf(
     ----------
     vg_spec
         Vega JSON specification string or dict
+    scale
+        .. deprecated:: 2.0.0
+           Retained only for backward compatibility with vl-convert 1.x.
+           The parameter has no effect on PDF output. The only non-None value
+           accepted is 1.0. Any other numeric value raises ``ValueError``.
     format_locale
         d3-format locale name or dictionary
     time_format_locale
@@ -1173,6 +1184,7 @@ def vegalite_to_pdf(
     vl_spec: VlSpec,
     *,
     vl_version: str | None = None,
+    scale: float | None = None,
     config: dict[str, Any] | None = None,
     theme: VegaThemes | None = None,
     format_locale: FormatLocale | None = None,
@@ -1193,6 +1205,11 @@ def vegalite_to_pdf(
     vl_version
         Vega-Lite library version string (e.g. 'v5.15')
         (default to latest)
+    scale
+        .. deprecated:: 2.0.0
+           Retained only for backward compatibility with vl-convert 1.x.
+           The parameter has no effect on PDF output. The only non-None value
+           accepted is 1.0. Any other numeric value raises ``ValueError``.
     config
         Chart configuration object to apply during conversion
     theme
@@ -1558,7 +1575,7 @@ if TYPE_CHECKING:
         ) -> bytes:
             """Async version of ``svg_to_jpeg``. See sync function for full documentation."""
             ...
-        async def svg_to_pdf(self, svg: str) -> bytes:
+        async def svg_to_pdf(self, svg: str, *, scale: float | None = None) -> bytes:
             """Async version of ``svg_to_pdf``. See sync function for full documentation."""
             ...
         async def svg_to_png(
@@ -1604,6 +1621,7 @@ if TYPE_CHECKING:
             self,
             vg_spec: VlSpec,
             *,
+            scale: float | None = None,
             format_locale: FormatLocale | None = None,
             time_format_locale: TimeFormatLocale | None = None,
             vega_plugin: str | None = None,
@@ -1738,6 +1756,7 @@ if TYPE_CHECKING:
             vl_spec: VlSpec,
             *,
             vl_version: str | None = None,
+            scale: float | None = None,
             config: dict[str, Any] | None = None,
             theme: VegaThemes | None = None,
             format_locale: FormatLocale | None = None,

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc6}/vl-convert-rs/Cargo.toml

@@ -1,18 +1,25 @@
 [package]
 name = "vl-convert-rs"
-version = "2.0.0-rc2"
-edition = "2021"
-license = "BSD-3-Clause"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
 readme = "README.md"
 homepage = "https://github.com/jonmmease/vl-convert"
-repository = "https://github.com/jonmmease/vl-convert"
+repository.workspace = true
 description = "Library for converting Vega-Lite visualization specifications to Vega specifications"
 keywords = ["Visualization", "Vega", "Vega-Lite"]
 
+[package.metadata.docs.rs]
+# Compile the host build script with this cfg so it can avoid linking V8.
+rustc-args = ["--cfg", "vl_convert_docsrs"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(vl_convert_docsrs)"] }
+
 [dependencies]
-vl-convert-canvas2d = { path = "../vl-convert-canvas2d", version = "2.0.0-rc1" }
-vl-convert-canvas2d-deno = { path = "../vl-convert-canvas2d-deno", version = "2.0.0-rc1", features = ["svg"] }
-vl-convert-google-fonts = { path = "../vl-convert-google-fonts", version = "2.0.0-rc1", features = ["fontdb"] }
+vl-convert-canvas2d = { workspace = true }
+vl-convert-canvas2d-deno = { workspace = true, features = ["svg"] }
+vl-convert-google-fonts = { workspace = true, features = ["fontdb"] }
 
 arc-swap = "1.9"
 deno_runtime = { workspace = true }
@@ -81,4 +88,4 @@ deno_error = { workspace = true }
 # Need "snapshot" feature to access deno_runtime::snapshot::create_runtime_snapshot
 deno_runtime = { workspace = true, features = ["snapshot"] }
 # Canvas 2D Deno extension - used in snapshot creation
-vl-convert-canvas2d-deno = { path = "../vl-convert-canvas2d-deno", version = "2.0.0-rc1" }
+vl-convert-canvas2d-deno = { workspace = true }

vl_convert_python-2.0.0rc6/vl-convert-rs/LICENSE

@@ -0,0 +1,11 @@
+Copyright 2023 Jon Mease
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.