add some backwards compatibility for 1.6.1

Author: KristofferC

src/API.jl

@@ -1147,8 +1147,12 @@ function precompile(ctx::Context; internal_call::Bool=false, strict::Bool=false,
                     end
                     try
                         ret = Logging.with_logger(Logging.NullLogger()) do
-                            # capture stderr, send stdout to devnull, don't skip loaded modules
-                            Base.compilecache(pkg, sourcepath, iob, devnull, false)
+                            @static if hasmethod(Base.compilecache, Tuple{Base.PkgId, String, IO, IO, Bool})
+                                # capture stderr, send stdout to devnull, don't skip loaded modules
+                                Base.compilecache(pkg, sourcepath, iob, devnull, false)
+                            else
+                                Base.compilecache(pkg, sourcepath, iob, devnull)
+                            end
                         end
                         if ret isa Base.PrecompilableError
                             push!(precomperr_deps, pkg)

src/manifest.jl

@@ -176,6 +176,23 @@ function Manifest(raw::Dict, f_or_io::Union{String, IO})::Manifest
     return validate_manifest(julia_version, manifest_format, stage1, other)
 end
 
+if isdefined(Base, :is_v1_format_manifest)
+    const is_v1_format_manifest = Base.is_v1_format_manifest
+else
+    function is_v1_format_manifest(raw_manifest::Dict)
+        if haskey(raw_manifest, "manifest_format")
+            if raw_manifest["manifest_format"] isa Dict && haskey(raw_manifest["manifest_format"], "uuid")
+                # the off-chance where an old format manifest has a dep called "manifest_format"
+                return true
+            end
+            return false
+        else
+            return true
+        end
+    end
+end
+
+
 function read_manifest(f_or_io::Union{String,IO})
     raw = if f_or_io isa IO
         TOML.tryparse(read(f_or_io, String))
@@ -185,7 +202,7 @@ function read_manifest(f_or_io::Union{String,IO})
     if raw isa TOML.ParserError
         pkgerror("Could not parse manifest: ", sprint(showerror, raw))
     end
-    if Base.is_v1_format_manifest(raw)
+    if is_v1_format_manifest(raw)
         raw = convert_flat_format_manifest(raw)
     end
     return Manifest(raw, f_or_io)

test/manifests.jl

@@ -13,51 +13,51 @@ using  ..Utils
             @test occursin(r"Activating.*environment at.*", output)
             Pkg.add("Profile")
             env_manifest = Pkg.Types.Context().env.manifest_file
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest))
         end
     end
 
     @testset "v1.0: activate, change, maintain manifest format" begin
         env_dir = joinpath(@__DIR__, "manifest", "formats", "v1.0")
         env_manifest = joinpath(env_dir, "Manifest.toml")
         isfile(env_manifest) || error("Reference manifest is missing")
-        if Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
+        if Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
             error("Reference manifest file at $(env_manifest) is invalid")
         end
         isolate(loaded_depot=true) do
             io = IOBuffer()
             Pkg.activate(env_dir; io=io)
             output = String(take!(io))
             @test occursin(r"Activating.*environment at.*`.*v1.0.*`", output)
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest))
 
             Pkg.add("Profile")
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest))
 
             Pkg.rm("Profile")
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest))
         end
     end
 
     @testset "v2.0: activate, change, maintain manifest format" begin
         env_dir = joinpath(@__DIR__, "manifest", "formats", "v2.0")
         env_manifest = joinpath(env_dir, "Manifest.toml")
         isfile(env_manifest) || error("Reference manifest is missing")
-        if Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
+        if Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest))
             error("Reference manifest file at $(env_manifest) is invalid")
         end
         isolate(loaded_depot=true) do
             io = IOBuffer()
             Pkg.activate(env_dir; io=io)
             output = String(take!(io))
             @test occursin(r"Activating.*environment at.*`.*v2.0.*`", output)
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
 
             Pkg.add("Profile")
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
 
             Pkg.rm("Profile")
-            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
+            @test Pkg.Types.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
 
             m = Pkg.Types.read_manifest(env_manifest)
             @test m.other["some_other_field"] == "other"

test/new.jl

@@ -2544,6 +2544,17 @@ end
     @test test_result
 end
 
+# returns a deps list for both old and new manifest formats
+function get_deps(raw_manifest::Dict)
+    if Pkg.Types.is_v1_format_manifest(raw_manifest)
+        return raw_manifest
+    else
+        # if the manifest has no deps, there won't be a `deps` field
+        return get(Dict{String, Any}, raw_manifest, "deps")
+    end
+end
+
+
 @testset "Pkg.add() with julia_version" begin
     # A package with artifacts that went from normal package -> stdlib
     gmp_jll_uuid = "781609d7-10c4-51f6-84f2-b8444358ff6d"
@@ -2556,7 +2567,7 @@ end
         manifest_path = joinpath(dirname(Base.active_project()), "Manifest.toml")
         @test isfile(manifest_path)
         manifest = Pkg.Types.read_manifest
-        deps = Base.get_deps(TOML.parsefile(manifest_path))
+        deps = get_deps(TOML.parsefile(manifest_path))
         @test haskey(deps, name)
         return only(deps[name])
     end

test/test_packages/BuildProjectFixedDeps/deps/build.jl

@@ -3,7 +3,30 @@ build_artifact = joinpath(@__DIR__, "artifact")
 isfile(build_artifact) && rm(build_artifact)
 project = TOML.parsefile(Base.active_project())
 @assert get(project["deps"], "JSON", nothing) === nothing
-manifest = Base.get_deps(TOML.parsefile(joinpath(dirname(Base.active_project()), "Manifest.toml")))
+
+# Backwards compat with 1.6.1
+function is_v1_format_manifest(raw_manifest::Dict)
+    if haskey(raw_manifest, "manifest_format")
+        if raw_manifest["manifest_format"] isa Dict && haskey(raw_manifest["manifest_format"], "uuid")
+            # the off-chance where an old format manifest has a dep called "manifest_format"
+            return true
+        end
+        return false
+    else
+        return true
+    end
+end
+# returns a deps list for both old and new manifest formats
+function get_deps(raw_manifest::Dict)
+    if is_v1_format_manifest(raw_manifest)
+        return raw_manifest
+    else
+        # if the manifest has no deps, there won't be a `deps` field
+        return get(Dict{String, Any}, raw_manifest, "deps")
+    end
+end
+
+manifest = get_deps(TOML.parsefile(joinpath(dirname(Base.active_project()), "Manifest.toml")))
 json = manifest["JSON"][1]
 @assert json["uuid"] == "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 @assert json["version"] == "0.19.0"