Skip to content

Commit 47713b2

Browse files
davidanthoffdavidanthoff
committed
Merge branch 'master' into simplify-show
2 parents 411fa77 + cd68496 commit 47713b2

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎Artifacts.toml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,123 @@
11
[[vegalite_app]]
22
arch = "i686"
3-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
3+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
44
libc = "glibc"
55
os = "linux"
66

77
[[vegalite_app.download]]
8-
sha256 = "60de9c1347dec98f86e4e71146bbde3531f2e5701139d55e8aea71d2f458511c"
9-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-i686-linux-gnu.tar.gz"
8+
sha256 = "676162937667640018c7e2da97594b0d5c717185a125aa06facd80888ef8dc8f"
9+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-i686-linux-gnu.tar.gz"
1010
[[vegalite_app]]
1111
arch = "x86_64"
12-
git-tree-sha1 = "eaa582f6a48db41c0abc61ae917552e5fd7e3e5f"
12+
git-tree-sha1 = "5e501c2671949a289ba0f086f23f09ec69035bbd"
1313
libc = "glibc"
1414
os = "linux"
1515

1616
[[vegalite_app.download]]
17-
sha256 = "4b4710c67076168bb0800d91e26bd523118f6b29da7fe925ddc578caabe541a2"
18-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-x86_64-linux-gnu.tar.gz"
17+
sha256 = "84984b71b4ce372af765b4559b8c88a8f7504eddc093517817ecbdd73f4c667c"
18+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-x86_64-linux-gnu.tar.gz"
1919
[[vegalite_app]]
2020
arch = "aarch64"
21-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
21+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
2222
libc = "glibc"
2323
os = "linux"
2424

2525
[[vegalite_app.download]]
26-
sha256 = "eede38eef2d34029a80d3d2706c74c8dfdeefa813f5f7d2b6bd505088f48b0e8"
27-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-aarch64-linux-gnu.tar.gz"
26+
sha256 = "dbab1d12f3bee3fe36597df55c5e172435a7d33d0ebc23cc64ddaace0dec553d"
27+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-aarch64-linux-gnu.tar.gz"
2828
[[vegalite_app]]
2929
arch = "armv7l"
3030
call_abi = "eabihf"
31-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
31+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
3232
libc = "glibc"
3333
os = "linux"
3434

3535
[[vegalite_app.download]]
36-
sha256 = "f93b7dd312fb70504cc00d6dc0168f2ee2c9dd14cd6f1632db1dd387a78516a5"
37-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-armv7l-linux-gnueabihf.tar.gz"
36+
sha256 = "bb7e32ea1bf3847b38af6376793350e6a5474fbf992bed633eb28edd1c4ed583"
37+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-armv7l-linux-gnueabihf.tar.gz"
3838
[[vegalite_app]]
3939
arch = "powerpc64le"
40-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
40+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
4141
libc = "glibc"
4242
os = "linux"
4343

4444
[[vegalite_app.download]]
45-
sha256 = "273636b860c9fa9ebeafdc175426e6a15b731e1bdfefbf70de67ae065bcb4aec"
46-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-powerpc64le-linux-gnu.tar.gz"
45+
sha256 = "4769ccbbd9f89677276eb3cb3d9a4045c841d6e3663f06a82b68f6839fe574c8"
46+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-powerpc64le-linux-gnu.tar.gz"
4747
[[vegalite_app]]
4848
arch = "i686"
49-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
49+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
5050
libc = "musl"
5151
os = "linux"
5252

5353
[[vegalite_app.download]]
54-
sha256 = "14d9dc84bf7dbeaffd9efc7ef3c4e8854c03678cd53b1a5fd8bb6f58652a6b64"
55-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-i686-linux-musl.tar.gz"
54+
sha256 = "37088c9c8959733f9648c31e4b5f9ed69be1b5f79b670166ffd6fecba1f2ae65"
55+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-i686-linux-musl.tar.gz"
5656
[[vegalite_app]]
5757
arch = "x86_64"
58-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
58+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
5959
libc = "musl"
6060
os = "linux"
6161

6262
[[vegalite_app.download]]
63-
sha256 = "4c5ab329c35c0db0ae931a23f4b81ff8230687962eb39295fd32ca3f71e4ca03"
64-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-x86_64-linux-musl.tar.gz"
63+
sha256 = "4abd871486ecebf053d16dc7e23a1f5b84baf764163914a023582d4415d410a7"
64+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-x86_64-linux-musl.tar.gz"
6565
[[vegalite_app]]
6666
arch = "aarch64"
67-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
67+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
6868
libc = "musl"
6969
os = "linux"
7070

7171
[[vegalite_app.download]]
72-
sha256 = "89bb00b9748948edaee7a234d7491d6028bc1f06c54e0962aa17dd69c1216d1d"
73-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-aarch64-linux-musl.tar.gz"
72+
sha256 = "b053a6ba76a217449ead8aa2222fd80eee663ef5f737c0ecf0f0acbc7331fd1d"
73+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-aarch64-linux-musl.tar.gz"
7474
[[vegalite_app]]
7575
arch = "armv7l"
7676
call_abi = "eabihf"
77-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
77+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
7878
libc = "musl"
7979
os = "linux"
8080

8181
[[vegalite_app.download]]
82-
sha256 = "8b7c823beb938dca80d703aece00b8757f914423463a482967708f53eb7f52ac"
83-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-armv7l-linux-musleabihf.tar.gz"
82+
sha256 = "9db9771a770f3c60d000ab656cfd4f1491822b06a89c68858360d156eafed30a"
83+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-armv7l-linux-musleabihf.tar.gz"
8484
[[vegalite_app]]
8585
arch = "x86_64"
86-
git-tree-sha1 = "318e9d25d983aa68bfd8e0c2fb18fb389fbc86bb"
86+
git-tree-sha1 = "203c668d73758a923ae6d97087db83ab1938bea8"
8787
os = "macos"
8888

8989
[[vegalite_app.download]]
90-
sha256 = "82897385d8261d7b7af879e962bd05267ea57e3c77326ef75fa57fb957387727"
91-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-x86_64-apple-darwin14.tar.gz"
90+
sha256 = "f6ca942d14398172b7037e3aa052b11e3d3effc36e5c11eba661bc149007864b"
91+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-x86_64-apple-darwin14.tar.gz"
9292
[[vegalite_app]]
9393
arch = "aarch64"
94-
git-tree-sha1 = "318e9d25d983aa68bfd8e0c2fb18fb389fbc86bb"
94+
git-tree-sha1 = "203c668d73758a923ae6d97087db83ab1938bea8"
9595
os = "macos"
9696

9797
[[vegalite_app.download]]
98-
sha256 = "a24851272c5381332696a4ca56b13aef805baf1ef0b89049bffc6bbc922aab73"
99-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-aarch64-apple-darwin14.tar.gz"
98+
sha256 = "b2e4e0a29ff10cb41d8cd0dd20ddd37f739744f33d7d9c0040364b5d18642a51"
99+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-aarch64-apple-darwin14.tar.gz"
100100
[[vegalite_app]]
101101
arch = "x86_64"
102-
git-tree-sha1 = "c3408469f19da771fab822de04a74efc740e0b83"
102+
git-tree-sha1 = "60e02ec2313cbf5cb27321d79ee9684894a5d985"
103103
os = "freebsd"
104104

105105
[[vegalite_app.download]]
106-
sha256 = "6cd06236b542771ef3c8793763b290ccb7e36da45d1d599f7c2cd4282013dd04"
107-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-x86_64-unknown-freebsd11.1.tar.gz"
106+
sha256 = "a9b191825d577baa3e7d6e05222500412482c469ff7771ab3c0c3e327d66dbb9"
107+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-x86_64-unknown-freebsd11.1.tar.gz"
108108
[[vegalite_app]]
109109
arch = "i686"
110-
git-tree-sha1 = "ebdc57807c9ce1f307a6faefcbc2d7846e74e4ba"
110+
git-tree-sha1 = "46d2dc4e09c94cd57713c48b539bca230be123b3"
111111
os = "windows"
112112

113113
[[vegalite_app.download]]
114-
sha256 = "3ab94046259c6dead78c171f50ebdebe6e88b4f067954c5ab3e1afcd8c6d0bb5"
115-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-i686-w64-mingw32.tar.gz"
114+
sha256 = "36140e405e9b221e8bb923b9e358950a50c95efeacd71d92ab4467cd5db67720"
115+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-i686-w64-mingw32.tar.gz"
116116
[[vegalite_app]]
117117
arch = "x86_64"
118-
git-tree-sha1 = "ff46a953d718775790c5669fba1c11d7d9246a6e"
118+
git-tree-sha1 = "d7fca0b09d65277e70c511130fc455fb36247dd3"
119119
os = "windows"
120120

121121
[[vegalite_app.download]]
122-
sha256 = "acd0baff9851b875d318c62ce7dfce1eb373192ec82cf5c73e42ef9796667326"
123-
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.1.3/vegaliteassets-3.1.3-x86_64-w64-mingw32.tar.gz"
122+
sha256 = "ac04ed70bd55fceb59a1494c8b587ea339c461c45397544651e21a3a5cbf78f0"
123+
url = "https://github.com/queryverse/VegaLiteBuilder/releases/download/v3.3.0/vegaliteassets-3.3.0-x86_64-w64-mingw32.tar.gz"

‎Project.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
name = "VegaLite"
22
uuid = "112f6efa-9a02-5b7d-90c0-432ed331239a"
3-
version = "3.0.1-DEV"
3+
version = "3.1.1-DEV"
44

55
[deps]
66
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
77
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
88
TableTraits = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
99
REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
1010
IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d"
11-
NodeJS_16_jll = "a4b94fbf-73f5-58ff-888d-48a8396e17f6"
1211
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
1312
Vega = "239c3e63-733f-47ad-beb7-a12fde22c578"
1413
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -17,6 +16,7 @@ MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
1716
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
1817
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1918
TableTraitsUtils = "382cd787-c1b6-5bf2-a167-d5b971a19bda"
19+
NodeJS_18_jll = "c1e1d063-8311-5f52-a749-c7b05e91ae37"
2020
DataValues = "e7dc6d0d-1eca-5fa6-8ad6-5aecde8b7ea5"
2121
FilePaths = "8fc22ac5-c921-52a6-82fd-178b2807b824"
2222
URIParser = "30578b45-9adc-5946-b283-645ec420af67"
@@ -32,14 +32,14 @@ Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
3232
[compat]
3333
TableTraits = "0.3.1, 0.4, 1"
3434
IteratorInterfaceExtensions = "0.1.1, 1"
35-
NodeJS_16_jll = "16"
3635
JSON = "0.19, 0.20, 0.21"
37-
Vega = "2.4"
36+
Vega = "2.5"
3837
DataStructures = "0.17, 0.18"
3938
MacroTools = "0.4.4, 0.5"
4039
FileIO = "1.0.1"
4140
TableTraitsUtils = "1"
4241
julia = "1.6"
42+
NodeJS_18_jll = "18"
4343
DataValues = "0.4.4"
4444
FilePaths = "0.7, 0.8"
4545
URIParser = "0.4"

‎src/VegaLite.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optle
55
end
66

77
using JSON
8-
import NodeJS_16_jll
8+
import NodeJS_18_jll
99
import IteratorInterfaceExtensions # 1s
1010
import TableTraits # 0
1111
using FileIO # 17s !!!

‎src/rendering/show.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function convert_vl_to_x(v::VLSpec, fileformat)
22
script_path = vegalite_app_path("node_modules", "vega-lite", "bin", "vl2$fileformat")
33

4-
p = open(Cmd(`$(NodeJS_16_jll.node()) $script_path`, dir=vegalite_app_path()),"r+")
4+
p = open(Cmd(`$(NodeJS_18_jll.node()) $script_path`, dir=vegalite_app_path()),"r+")
55
writer = @async begin
66
our_json_print(p, v)
77
close(p.in)

0 commit comments

Comments
 (0)