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

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc5}/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-rc5"
 dependencies = [
  "assert_cmd",
  "bytes",
@@ -10875,7 +10882,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-canvas2d"
-version = "2.0.0-rc2"
+version = "2.0.0-rc5"
 dependencies = [
  "cosmic-text",
  "csscolorparser",
@@ -10894,7 +10901,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-canvas2d-deno"
-version = "2.0.0-rc2"
+version = "2.0.0-rc5"
 dependencies = [
  "csscolorparser",
  "deno_core",
@@ -10910,7 +10917,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-google-fonts"
-version = "2.0.0-rc2"
+version = "2.0.0-rc5"
 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-rc5"
 dependencies = [
  "futures",
  "lazy_static",
@@ -10943,7 +10950,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-rs"
-version = "2.0.0-rc2"
+version = "2.0.0-rc5"
 dependencies = [
  "arc-swap",
  "backon",
@@ -10997,7 +11004,7 @@ dependencies = [
 
 [[package]]
 name = "vl-convert-server"
-version = "2.0.0-rc2"
+version = "2.0.0-rc5"
 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.0rc5}/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-rc5"
+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-rc5" }
+vl-convert-canvas2d-deno = { path = "vl-convert-canvas2d-deno", version = "=2.0.0-rc5" }
+vl-convert-google-fonts = { path = "vl-convert-google-fonts", version = "=2.0.0-rc5" }
+vl-convert-rs = { path = "vl-convert-rs", version = "=2.0.0-rc5" }
+vl-convert-server = { path = "vl-convert-server", version = "=2.0.0-rc5" }
+
 # 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.0rc5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vl-convert-python
-Version: 2.0.0rc2
+Version: 2.0.0rc5
 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.0rc5}/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.0rc5}/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.0rc5}/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.0rc5}/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.0rc5}/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.0rc5}/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.0rc5/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.

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc5}/vl-convert-rs/build.rs

@@ -3,20 +3,26 @@
 //! Generates a V8 snapshot at build time that embeds the deno_runtime extensions
 //! PLUS our vl_convert_runtime extension. This is required for container compatibility
 //! (manylinux, slim images) and improves startup performance.
-use deno_core::extension;
-use deno_core::op2;
-use deno_error::JsErrorBox;
-use deno_runtime::ops::bootstrap::SnapshotOptions;
-use deno_runtime::snapshot::create_runtime_snapshot;
-use deno_runtime::snapshot::LazyExtensionFileKind;
-use std::collections::HashSet;
-use std::io::Write;
-use std::path::Path;
-use std::path::PathBuf;
+
+#[cfg(not(vl_convert_docsrs))]
+use {
+    deno_core::{extension, op2},
+    deno_error::JsErrorBox,
+    deno_runtime::{
+        ops::bootstrap::SnapshotOptions,
+        snapshot::{create_runtime_snapshot, LazyExtensionFileKind},
+    },
+    std::{
+        collections::HashSet,
+        io::Write,
+        path::{Path, PathBuf},
+    },
+};
 
 // Stub ops for vl-convert-specific ops (not canvas-related)
 // These match the signatures of the real ops but will never be called during snapshot creation.
 
+#[cfg(not(vl_convert_docsrs))]
 #[op2]
 #[string]
 fn op_get_json_arg(_arg_id: i32) -> Result<String, JsErrorBox> {
@@ -25,6 +31,7 @@ fn op_get_json_arg(_arg_id: i32) -> Result<String, JsErrorBox> {
     ))
 }
 
+#[cfg(not(vl_convert_docsrs))]
 #[op2(fast)]
 fn op_set_msgpack_result(_result_id: i32, #[buffer] _data: &[u8]) -> Result<(), JsErrorBox> {
     Err(JsErrorBox::generic(
@@ -32,30 +39,35 @@ fn op_set_msgpack_result(_result_id: i32, #[buffer] _data: &[u8]) -> Result<(),
     ))
 }
 
+#[cfg(not(vl_convert_docsrs))]
 #[op2]
 #[string]
 async fn op_vega_data_fetch(#[string] _url: String) -> Result<String, JsErrorBox> {
     Err(JsErrorBox::generic("op_vega_data_fetch stub"))
 }
 
+#[cfg(not(vl_convert_docsrs))]
 #[op2]
 #[buffer]
 async fn op_vega_data_fetch_bytes(#[string] _url: String) -> Result<Vec<u8>, JsErrorBox> {
     Err(JsErrorBox::generic("op_vega_data_fetch_bytes stub"))
 }
 
+#[cfg(not(vl_convert_docsrs))]
 #[op2]
 #[string]
 async fn op_vega_file_read(#[string] _path: String) -> Result<String, JsErrorBox> {
     Err(JsErrorBox::generic("op_vega_file_read stub"))
 }
 
+#[cfg(not(vl_convert_docsrs))]
 #[op2]
 #[buffer]
 async fn op_vega_file_read_bytes(#[string] _path: String) -> Result<Vec<u8>, JsErrorBox> {
     Err(JsErrorBox::generic("op_vega_file_read_bytes stub"))
 }
 
+#[cfg(not(vl_convert_docsrs))]
 extension!(
     vl_convert_runtime,
     ops = [
@@ -73,6 +85,7 @@ extension!(
     ],
 );
 
+#[cfg(not(vl_convert_docsrs))]
 fn transpile_residual_source(
     out_dir: &Path,
     specifier: &str,
@@ -108,12 +121,14 @@ fn transpile_residual_source(
     out_path
 }
 
+#[cfg(not(vl_convert_docsrs))]
 fn wrap_residual_js_source(path: &Path) {
     let source = std::fs::read_to_string(path).unwrap();
     let wrapped = deno_runtime::deno_core::wrap_lazy_ext_script(&source);
     std::fs::write(path, wrapped.as_bytes()).unwrap();
 }
 
+#[cfg(not(vl_convert_docsrs))]
 fn assert_residual_entry_ascii(path: &Path, specifier: &str) {
     assert!(
         specifier.is_ascii(),
@@ -127,6 +142,7 @@ fn assert_residual_entry_ascii(path: &Path, specifier: &str) {
     );
 }
 
+#[cfg(not(vl_convert_docsrs))]
 fn write_residual_table(
     file: &mut std::fs::File,
     out_dir: &Path,
@@ -148,6 +164,7 @@ fn write_residual_table(
     writeln!(file, "];").unwrap();
 }
 
+#[cfg(not(vl_convert_docsrs))]
 fn main() {
     let out_dir = PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
     let snapshot_path = out_dir.join("VL_CONVERT_SNAPSHOT.bin");
@@ -229,3 +246,20 @@ fn main() {
         &residual_esm,
     );
 }
+
+#[cfg(vl_convert_docsrs)]
+fn main() {
+    let out_dir = std::path::PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
+
+    println!("cargo:rerun-if-changed=build.rs");
+    std::fs::write(out_dir.join("VL_CONVERT_SNAPSHOT.bin"), []).unwrap();
+    std::fs::write(
+        out_dir.join("VL_CONVERT_RESIDUAL_SOURCES.rs"),
+        concat!(
+            "// @generated by vl-convert-rs/build.rs for docs.rs; do not edit.\n",
+            "pub(crate) static VL_CONVERT_RESIDUAL_LAZY_JS: &[(&str, &str)] = &[];\n",
+            "pub(crate) static VL_CONVERT_RESIDUAL_LAZY_ESM: &[(&str, &str)] = &[];\n",
+        ),
+    )
+    .unwrap();
+}

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc5}/vl-convert-rs/src/converter/config.rs

@@ -134,7 +134,7 @@ pub struct VlcConfig {
     /// Base URL for resolving relative data paths in Vega specs.
     pub base_url: BaseUrlSetting,
     /// Allowlist for data access (HTTP URLs, filesystem paths).
-    /// Uses CSP-style patterns: "https:" (scheme), "https://example.com/" (prefix),
+    /// Uses CSP-style patterns: "https:" (scheme), "<https://example.com/>" (prefix),
     /// "/data/" (filesystem). Default is `["http:", "https:"]`: any
     /// HTTP/HTTPS URL is allowed; no filesystem access. Pass `Vec::new()`
     /// to block all network data; `["*"]` to allow everything.

{vl_convert_python-2.0.0rc2 → vl_convert_python-2.0.0rc5}/vl-convert-rs/src/html.rs

@@ -667,7 +667,7 @@ impl VlConverter {
 
     /// Return font information for a Vega-Lite spec.
     ///
-    /// Compiles the spec to Vega first, then delegates to [`vega_fonts`].
+    /// Compiles the spec to Vega first, then delegates to [`Self::vega_fonts`].
     pub async fn vegalite_fonts(
         &self,
         vl_spec: impl Into<ValueOrString>,