Skip to content

Commit 6e0cf5f

Browse files
authored
Upgrade dependencies, add compatibility for Julia 1.4+ (#617)
1 parent 1eaad41 commit 6e0cf5f

File tree

2 files changed

+27
-15
lines changed

2 files changed

+27
-15
lines changed

Manifest.toml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ version = "1.1.0"
3333

3434
[[DataStructures]]
3535
deps = ["InteractiveUtils", "OrderedCollections"]
36-
git-tree-sha1 = "a1b652fb77ae8ca7ea328fa7ba5aa151036e5c10"
36+
git-tree-sha1 = "b7720de347734f4716d1815b00ce5664ed6bbfd4"
3737
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
38-
version = "0.17.6"
38+
version = "0.17.9"
3939

4040
[[DataValueInterfaces]]
4141
git-tree-sha1 = "bfc1187b79289637fa0ef6d4436ebdfe6905cbd6"
@@ -52,9 +52,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
5252

5353
[[FileIO]]
5454
deps = ["Pkg"]
55-
git-tree-sha1 = "80c17c711c41416eb0ac68347dc036be68b37682"
55+
git-tree-sha1 = "74585bf1f7ed7259e166011e89f49363d7fa89a6"
5656
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
57-
version = "1.2.0"
57+
version = "1.2.1"
5858

5959
[[FileWatching]]
6060
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -100,9 +100,9 @@ version = "1.0.0"
100100

101101
[[JLD2]]
102102
deps = ["CodecZlib", "DataStructures", "FileIO", "Mmap", "Pkg", "Printf", "UUIDs"]
103-
git-tree-sha1 = "2c1a6d672f2b85a520d59e63851bc67226b06ba8"
103+
git-tree-sha1 = "5deae9f0745ef505ed155a0029629cf08502ccab"
104104
uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
105-
version = "0.1.10"
105+
version = "0.1.11"
106106

107107
[[JSON]]
108108
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -123,6 +123,7 @@ uuid = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0"
123123
version = "0.14.0"
124124

125125
[[LibGit2]]
126+
deps = ["Printf"]
126127
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
127128

128129
[[Libdl]]
@@ -161,10 +162,10 @@ uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
161162
version = "0.5.13"
162163

163164
[[Mux]]
164-
deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "Test", "WebSockets"]
165-
git-tree-sha1 = "5b41f03d63400c290bab4e1a49fb9ac36de1084a"
165+
deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "WebSockets"]
166+
git-tree-sha1 = "3621676e7f711aca14d783d1bff9ac379d9df6b7"
166167
uuid = "a975b10e-0019-58db-a62f-e48ff68538c9"
167-
version = "0.7.0"
168+
version = "0.7.1"
168169

169170
[[ObjectFile]]
170171
deps = ["Reexport", "StructIO", "Test"]
@@ -232,9 +233,9 @@ version = "1.1.0"
232233

233234
[[RegistryTools]]
234235
deps = ["AutoHashEquals", "LibGit2", "Pkg", "UUIDs"]
235-
git-tree-sha1 = "f9333ef8731c656815f3cc52cf73e2d56c4de6f4"
236+
git-tree-sha1 = "bb8875c413cecf2418cc6472d0423d5bc6626569"
236237
uuid = "d1eb7eb1-105f-429d-abf5-b0f65cb9e2c4"
237-
version = "1.1.0"
238+
version = "1.2.0"
238239

239240
[[SHA]]
240241
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
@@ -293,10 +294,16 @@ uuid = "104b5d7c-a370-577a-8038-80a2059c5097"
293294
version = "1.5.2"
294295

295296
[[ZMQ]]
296-
deps = ["BinaryProvider", "FileWatching", "Libdl", "Sockets", "Test"]
297-
git-tree-sha1 = "34e7ac2d1d59d19d0e86bde99f1f02262bfa1613"
297+
deps = ["FileWatching", "Sockets", "ZeroMQ_jll"]
298+
git-tree-sha1 = "adb2d52aa12c8284da12714f35d2b21fc3d5b2bb"
298299
uuid = "c2297ded-f4af-51ae-bb23-16f91089e4e1"
299-
version = "1.0.0"
300+
version = "1.2.0"
301+
302+
[[ZeroMQ_jll]]
303+
deps = ["Libdl", "Pkg"]
304+
git-tree-sha1 = "a22171d073707dbcc99a1dfefc2c6e823beb9664"
305+
uuid = "8f1865be-045e-5c20-9c9f-bfbfb0764568"
306+
version = "4.3.1+0"
300307

301308
[[ghr_jll]]
302309
deps = ["Libdl", "Pkg"]

src/wizard/utils.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ function prepare_for_deletion(prefix::String)
270270
end
271271
end
272272

273+
# compatibility for Julia 1.3-
274+
if VERSION < v"1.4"
275+
Pkg.Types.registry_resolve!(ctx::Pkg.Types.Context, deps) = Pkg.Types.registry_resolve!(ctx.env, deps)
276+
end
277+
273278
function resolve_jlls(dependencies::Vector; ctx = Pkg.Types.Context(), outs=stdout)
274279
if isempty(dependencies)
275280
return true, Pkg.Types.PackageSpec[]
@@ -291,7 +296,7 @@ function resolve_jlls(dependencies::Vector; ctx = Pkg.Types.Context(), outs=stdo
291296

292297
# Resolve, returning the newly-resolved dependencies
293298
update_registry(ctx)
294-
dependencies = Pkg.Types.registry_resolve!(ctx.env, dependencies)
299+
dependencies = Pkg.Types.registry_resolve!(ctx, dependencies)
295300

296301
# But first, check to see if anything failed to resolve, and warn about it:
297302
all_resolved = true

0 commit comments

Comments
 (0)