Skip to content

Commit 2941aab

Browse files
timholyKristofferC
authored andcommitted
Fix invalidations from LatexStrings and PyPlot (#2365)
(cherry picked from commit 76402b8)
1 parent 8d77007 commit 2941aab

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

ext/HistoricaStdlibGenerator/generate_historical_stdlibs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ open(output_fname, "w") do io
164164
165165
# Julia standard libraries with duplicate entries removed so as to store only the
166166
# first release in a set of releases that all contain the same set of stdlibs.
167-
STDLIBS_BY_VERSION = [
167+
const STDLIBS_BY_VERSION = [
168168
""")
169169
for v in sorted_versions
170170
print(io, " $(repr(v)) => ")
@@ -176,7 +176,7 @@ open(output_fname, "w") do io
176176
# Next, we also embed a list of stdlibs that must _always_ be treated as stdlibs,
177177
# because they cannot be resolved in the registry; they have only ever existed within
178178
# the Julia stdlib source tree, and because of that, trying to resolve them will fail.
179-
UNREGISTERED_STDLIBS = Dict(
179+
const UNREGISTERED_STDLIBS = Dict(
180180
""")
181181
for (uuid, name) in unregistered_stdlibs
182182
println(io, " $(repr(uuid)) => $(repr(name)),")

src/HistoricalStdlibs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using Base: UUID
44

55
# Julia standard libraries with duplicate entries removed so as to store only the
66
# first release in a set of releases that all contain the same set of stdlibs.
7-
STDLIBS_BY_VERSION = [
7+
const STDLIBS_BY_VERSION = [
88
v"1.0.0" => Dict(
99
UUID("2a0f44e3-6c83-55bd-87e4-b1978d98bd5f") => "Base64",
1010
UUID("8bf52ea8-c179-5cab-976a-9e18b702a9bc") => "CRC32c",
@@ -99,7 +99,7 @@ STDLIBS_BY_VERSION = [
9999
# Next, we also embed a list of stdlibs that must _always_ be treated as stdlibs,
100100
# because they cannot be resolved in the registry; they have only ever existed within
101101
# the Julia stdlib source tree, and because of that, trying to resolve them will fail.
102-
UNREGISTERED_STDLIBS = Dict(
102+
const UNREGISTERED_STDLIBS = Dict(
103103
UUID("9a3f8284-a2c9-5f02-9a11-845980a1fd5c") => "Random",
104104
UUID("10745b16-79ce-11e8-11f9-7d13ad32a3b2") => "Statistics",
105105
UUID("8bb1440f-4735-579b-a4ab-409b98df4dab") => "DelimitedFiles",

src/PlatformEngines.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function find7z()
2727
name = "7z"
2828
Sys.iswindows() && (name = "$name.exe")
2929
for dir in (joinpath("..", "libexec"), ".")
30-
path = normpath(Sys.BINDIR, dir, name)
30+
path = normpath(Sys.BINDIR::String, dir, name)
3131
isfile(path) && return path
3232
end
3333
path = Sys.which(name)

test/misc.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using Test
2+
using Pkg
3+
4+
@testset "inference" begin
5+
f() = Pkg.Types.STDLIBS_BY_VERSION
6+
@inferred f()
7+
f() = Pkg.Types.UNREGISTERED_STDLIBS
8+
@inferred f()
9+
end

test/runtests.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ include("binaryplatforms.jl")
2626
include("platformengines.jl")
2727
include("sandbox.jl")
2828
include("resolve.jl")
29+
include("misc.jl")
2930

3031
# clean up locally cached registry
3132
rm(joinpath(@__DIR__, "registries"); force = true, recursive = true)

0 commit comments

Comments
 (0)