Skip to content

Commit fb4bc26

Browse files
authored
Fixes for nightly (#71)
Updates for: - TOMLCache - Elimination of __PackagePrecompilationStatementModule
1 parent d89c149 commit fb4bc26

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/CodeTracking.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ pkgfiles(name::AbstractString, uuid::UUID) = pkgfiles(PkgId(uuid, name))
299299
function pkgfiles(name::AbstractString)
300300
project = Base.active_project()
301301
# The value returned by Base.project_deps_get depends on the Julia version
302-
id = isdefined(Base, :TOMLCache) ? Base.project_deps_get(project, name, Base.TOMLCache()) :
303-
Base.project_deps_get(project, name)
302+
id = isdefined(Base, :TOMLCache) && Base.VERSION < v"1.6.0-DEV.1180" ? Base.project_deps_get(project, name, Base.TOMLCache()) :
303+
Base.project_deps_get(project, name)
304304
(id == false || id === nothing) && error("no package ", name, " recognized")
305305
return isa(id, PkgId) ? pkgfiles(id) : pkgfiles(name, id)
306306
end

test/runtests.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,12 @@ isdefined(Main, :Revise) ? Main.Revise.includet("script.jl") : include("script.j
134134
@test d === nothing || isa(d[1], String)
135135

136136
# Check for existence of file
137-
id = Base.PkgId("__PackagePrecompilationStatementModule")
138-
mod = Base.root_module(id)
139-
m = first(methods(getfield(mod, :eval)))
140-
@test definition(String, m) === nothing
137+
id = Base.PkgId("__PackagePrecompilationStatementModule") # not all Julia versions have this
138+
mod = try Base.root_module(id) catch nothing end
139+
if isa(mod, Module)
140+
m = first(methods(getfield(mod, :eval)))
141+
@test definition(String, m) === nothing
142+
end
141143
end
142144

143145
@testset "With Revise" begin

0 commit comments

Comments
 (0)