Skip to content

Commit 2ca16ce

Browse files
authored
feat: upgrade to Vega-Lite v6 and Vega-Embed v7 (#81)
1 parent 1338105 commit 2ca16ce

5 files changed

Lines changed: 12 additions & 12 deletions

File tree

CLAUDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ impl Writer for VegaLiteWriter {
512512

513513
// 2. Build Vega-Lite spec
514514
let mut vl_spec = json!({
515-
"$schema": "https://vega.github.io/schema/vega-lite/v5.json",
515+
"$schema": "https://vega.github.io/schema/vega-lite/v6.json",
516516
"data": {"values": data_values},
517517
"width": 600,
518518
"autosize": {"type": "fit", "contains": "padding"}
@@ -1256,7 +1256,7 @@ Plot {
12561256

12571257
```json
12581258
{
1259-
"$schema": "https://vega.github.io/schema/vega-lite/v5.json",
1259+
"$schema": "https://vega.github.io/schema/vega-lite/v6.json",
12601260
"data": {
12611261
"values": [
12621262
{"sale_date": "2024-01-01", "region": "North", "total": 150},

ggsql-jupyter/src/display.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ fn format_vegalite(spec: String) -> Value {
6969
paths: {{
7070
'dom-ready': 'https://cdn.jsdelivr.net/npm/domready@1/ready.min',
7171
'vega': 'https://cdn.jsdelivr.net/npm/vega@5/build/vega.min',
72-
'vega-lite': 'https://cdn.jsdelivr.net/npm/vega-lite@5/build/vega-lite.min',
73-
'vega-embed': 'https://cdn.jsdelivr.net/npm/vega-embed@6/build/vega-embed.min'
72+
'vega-lite': 'https://cdn.jsdelivr.net/npm/vega-lite@6/build/vega-lite.min',
73+
'vega-embed': 'https://cdn.jsdelivr.net/npm/vega-embed@7/build/vega-embed.min'
7474
}}
7575
}});
7676
@@ -101,8 +101,8 @@ fn format_vegalite(spec: String) -> Value {
101101
102102
Promise.all([
103103
loadScript('https://cdn.jsdelivr.net/npm/vega@5'),
104-
loadScript('https://cdn.jsdelivr.net/npm/vega-lite@5'),
105-
loadScript('https://cdn.jsdelivr.net/npm/vega-embed@6')
104+
loadScript('https://cdn.jsdelivr.net/npm/vega-lite@6'),
105+
loadScript('https://cdn.jsdelivr.net/npm/vega-embed@7')
106106
])
107107
.then(() => {{
108108
vegaEmbed('#' + visId, spec, options)

ggsql-jupyter/tests/test_compliance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@ def test_execute_visualization(self):
111111

112112
# Check MIME types
113113
data = execute_result["content"]["data"]
114-
self.assertIn("application/vnd.vegalite.v5+json", data)
114+
self.assertIn("application/vnd.vegalite.v6+json", data)
115115

116116
# Verify Vega-Lite spec structure
117-
vega_spec = data["application/vnd.vegalite.v5+json"]
117+
vega_spec = data["application/vnd.vegalite.v6+json"]
118118
self.assertIn("$schema", vega_spec)
119119
self.assertIn("data", vega_spec)
120120

ggsql-jupyter/tests/test_integration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,10 +185,10 @@ def test_visualization_execution(self, client):
185185

186186
# Should have Vega-Lite MIME type
187187
data = content["data"]
188-
assert "application/vnd.vegalite.v5+json" in data
188+
assert "application/vnd.vegalite.v6+json" in data
189189

190190
# Check Vega-Lite spec structure
191-
vega_spec = data["application/vnd.vegalite.v5+json"]
191+
vega_spec = data["application/vnd.vegalite.v6+json"]
192192
assert "$schema" in vega_spec
193193
assert "data" in vega_spec
194194
assert "mark" in vega_spec or "layer" in vega_spec

src/writer/vegalite.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use std::collections::HashMap;
3131

3232
/// Vega-Lite JSON writer
3333
///
34-
/// Generates Vega-Lite v5 specifications from ggsql specs and data.
34+
/// Generates Vega-Lite v6 specifications from ggsql specs and data.
3535
pub struct VegaLiteWriter {
3636
/// Vega-Lite schema version
3737
schema: String,
@@ -41,7 +41,7 @@ impl VegaLiteWriter {
4141
/// Create a new Vega-Lite writer with default settings
4242
pub fn new() -> Self {
4343
Self {
44-
schema: "https://vega.github.io/schema/vega-lite/v5.json".to_string(),
44+
schema: "https://vega.github.io/schema/vega-lite/v6.json".to_string(),
4545
}
4646
}
4747

0 commit comments

Comments
 (0)