Greg Wilson commited on
Commit
574bd56
·
1 Parent(s): 7d87b36

fix: use URLs instead of altair.datasets to support WASM

Browse files
altair/01_introduction.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
@@ -9,7 +9,7 @@
9
 
10
  import marimo
11
 
12
- __generated_with = "0.20.4"
13
  app = marimo.App()
14
 
15
 
@@ -81,11 +81,11 @@ def _(mo):
81
 
82
 
83
  @app.cell
84
- def _():
85
- from altair.datasets import data # import vega_datasets
86
- cars = data.cars() # load cars data as a Pandas data frame
87
  cars.head() # display the first five rows
88
- return cars, data
89
 
90
 
91
  @app.cell(hide_code=True)
@@ -97,8 +97,8 @@ def _(mo):
97
 
98
 
99
  @app.cell
100
- def _(data):
101
- data.cars.url
102
  return
103
 
104
 
@@ -111,8 +111,8 @@ def _(mo):
111
 
112
 
113
  @app.cell
114
- def _(data, pd):
115
- pd.read_json(data.cars.url).head() # load JSON data into a data frame
116
  return
117
 
118
 
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
9
 
10
  import marimo
11
 
12
+ __generated_with = "0.23.2"
13
  app = marimo.App()
14
 
15
 
 
81
 
82
 
83
  @app.cell
84
+ def _(pd):
85
+ cars_url = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/cars.json"
86
+ cars = pd.read_json(cars_url) # load cars data as a Pandas data frame
87
  cars.head() # display the first five rows
88
+ return cars, cars_url
89
 
90
 
91
  @app.cell(hide_code=True)
 
97
 
98
 
99
  @app.cell
100
+ def _(cars_url):
101
+ cars_url
102
  return
103
 
104
 
 
111
 
112
 
113
  @app.cell
114
+ def _(cars_url, pd):
115
+ pd.read_json(cars_url).head() # load JSON data into a data frame
116
  return
117
 
118
 
altair/02_marks_encoding.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
@@ -45,7 +45,7 @@ def _():
45
  import pandas as pd
46
  import altair as alt
47
 
48
- return (alt,)
49
 
50
 
51
  @app.cell(hide_code=True)
@@ -67,9 +67,8 @@ def _(mo):
67
 
68
 
69
  @app.cell
70
- def _():
71
- from altair.datasets import data as altair_data
72
- data = altair_data.gapminder()
73
  return (data,)
74
 
75
 
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
45
  import pandas as pd
46
  import altair as alt
47
 
48
+ return alt, pd
49
 
50
 
51
  @app.cell(hide_code=True)
 
67
 
68
 
69
  @app.cell
70
+ def _(pd):
71
+ data = pd.read_json("https://cdn.jsdelivr.net/npm/vega-datasets@2/data/gapminder.json")
 
72
  return (data,)
73
 
74
 
altair/03_data_transformation.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
altair/04_scales_axes_legends.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
altair/05_view_composition.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
altair/06_interaction.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
altair/07_cartographic.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
@@ -50,11 +50,10 @@ def _(mo):
50
  def _():
51
  import pandas as pd
52
  import altair as alt
53
- from altair.datasets import data
54
  import json
55
  import urllib.request
56
 
57
- return alt, data
58
 
59
 
60
  @app.cell(hide_code=True)
@@ -124,8 +123,8 @@ def _(mo):
124
 
125
 
126
  @app.cell
127
- def _(data):
128
- world = data.world_110m.url
129
  world
130
  return (world,)
131
 
@@ -312,8 +311,8 @@ def _(mo):
312
 
313
 
314
  @app.cell
315
- def _(data):
316
- zipcodes = data.zipcodes.url
317
  zipcodes
318
  return (zipcodes,)
319
 
@@ -445,8 +444,8 @@ def _(mo):
445
 
446
 
447
  @app.cell
448
- def _(data):
449
- usa = data.us_10m.url
450
  usa
451
  return (usa,)
452
 
@@ -460,8 +459,8 @@ def _(mo):
460
 
461
 
462
  @app.cell
463
- def _(data):
464
- airports = data.airports.url
465
  airports
466
  return (airports,)
467
 
@@ -475,8 +474,8 @@ def _(mo):
475
 
476
 
477
  @app.cell
478
- def _(data):
479
- flights = data.flights_airport.url
480
  flights
481
  return (flights,)
482
 
@@ -665,8 +664,8 @@ def _(mo):
665
 
666
 
667
  @app.cell
668
- def _(data):
669
- unemp = data.unemployment.url
670
  unemp
671
  return (unemp,)
672
 
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
50
  def _():
51
  import pandas as pd
52
  import altair as alt
 
53
  import json
54
  import urllib.request
55
 
56
+ return (alt,)
57
 
58
 
59
  @app.cell(hide_code=True)
 
123
 
124
 
125
  @app.cell
126
+ def _():
127
+ world = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/world-110m.json"
128
  world
129
  return (world,)
130
 
 
311
 
312
 
313
  @app.cell
314
+ def _():
315
+ zipcodes = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/zipcodes.csv"
316
  zipcodes
317
  return (zipcodes,)
318
 
 
444
 
445
 
446
  @app.cell
447
+ def _():
448
+ usa = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/us-10m.json"
449
  usa
450
  return (usa,)
451
 
 
459
 
460
 
461
  @app.cell
462
+ def _():
463
+ airports = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/airports.csv"
464
  airports
465
  return (airports,)
466
 
 
474
 
475
 
476
  @app.cell
477
+ def _():
478
+ flights = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/flights-airport.csv"
479
  flights
480
  return (flights,)
481
 
 
664
 
665
 
666
  @app.cell
667
+ def _():
668
+ unemp = "https://cdn.jsdelivr.net/npm/vega-datasets@2/data/unemployment.tsv"
669
  unemp
670
  return (unemp,)
671
 
altair/08_debugging.py CHANGED
@@ -1,7 +1,7 @@
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
- # "altair==6.0.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
@@ -84,9 +84,9 @@ def _():
84
  @app.cell
85
  def _():
86
  import altair as alt
87
- from altair.datasets import data
88
 
89
- return alt, data
90
 
91
 
92
  @app.cell(hide_code=True)
@@ -156,8 +156,8 @@ def _(mo):
156
 
157
 
158
  @app.cell
159
- def _(alt, data):
160
- cars = data.cars()
161
 
162
  alt.Chart(cars).mark_point().encode(
163
  x='Horsepower',
 
1
  # /// script
2
  # requires-python = ">=3.11"
3
  # dependencies = [
4
+ # "altair==6.1.0",
5
  # "marimo",
6
  # "pandas==3.0.1",
7
  # ]
 
84
  @app.cell
85
  def _():
86
  import altair as alt
87
+ import pandas as pd
88
 
89
+ return alt, pd
90
 
91
 
92
  @app.cell(hide_code=True)
 
156
 
157
 
158
  @app.cell
159
+ def _(alt, pd):
160
+ cars = pd.read_json("https://cdn.jsdelivr.net/npm/vega-datasets@2/data/cars.json")
161
 
162
  alt.Chart(cars).mark_point().encode(
163
  x='Horsepower',