warn when loading a manifest from a different julia version

(cherry picked from commit 6b301fc)

Author: IanButterworth

src/API.jl

@@ -1415,6 +1415,7 @@ function instantiate(ctx::Context; manifest::Union{Bool, Nothing}=nothing,
     end
     if !isfile(ctx.env.project_file) && isfile(ctx.env.manifest_file)
         _manifest = Pkg.Types.read_manifest(ctx.env.manifest_file)
+        Types.check_warn_manifest_julia_version_compat(_manifest, ctx.env.manifest_file)
         deps = Dict{String,String}()
         for (uuid, pkg) in _manifest
             if pkg.name in keys(deps)
@@ -1433,6 +1434,7 @@ function instantiate(ctx::Context; manifest::Union{Bool, Nothing}=nothing,
     if !isfile(ctx.env.manifest_file) && manifest == true
         pkgerror("expected manifest file at `$(ctx.env.manifest_file)` but it does not exist")
     end
+    Types.check_warn_manifest_julia_version_compat(ctx.env.manifest, ctx.env.manifest_file)
     Operations.prune_manifest(ctx.env)
     for (name, uuid) in ctx.env.project.deps
         get(ctx.env.manifest, uuid, nothing) === nothing || continue

src/manifest.jl

@@ -135,9 +135,9 @@ function Manifest(raw::Dict, f_or_io::Union{String, IO})::Manifest
     manifest_format = VersionNumber(raw["manifest_format"])
     if !in(manifest_format.major, 1:2)
         if f_or_io isa IO
-            @warn "Unknown Manifest.toml format version detected in streamed manifest. Unexpected behavior may occur" manifest_format maxlog = 1
+            @warn "Unknown Manifest.toml format version detected in streamed manifest. Unexpected behavior may occur" manifest_format
         else
-            @warn "Unknown Manifest.toml format version detected in file `$(f_or_io)`. Unexpected behavior may occur" manifest_format maxlog = 1
+            @warn "Unknown Manifest.toml format version detected in file `$(f_or_io)`. Unexpected behavior may occur" manifest_format maxlog = 1 _id = Symbol(f_or_io)
         end
     end
     stage1 = Dict{String,Vector{Stage1}}()
@@ -285,7 +285,7 @@ end
 function write_manifest(manifest::Manifest, manifest_file::AbstractString)
     if manifest.manifest_format.major == 1
         @warn """The active manifest file at `$(manifest_file)` has an old format that is being maintained.
-            To update to the new format run `Pkg.upgrade_manifest()` which will upgrade the format without re-resolving.""" maxlog = 1
+            To update to the new format run `Pkg.upgrade_manifest()` which will upgrade the format without re-resolving.""" maxlog = 1 _id = Symbol(manifest_file)
     end
     return write_manifest(destructure(manifest), manifest_file)
 end
@@ -304,3 +304,27 @@ function write_manifest(raw_manifest::Dict, manifest_file::AbstractString)
     str = sprint(write_manifest, raw_manifest)
     write(manifest_file, str)
 end
+
+############
+# METADATA #
+############
+
+function check_warn_manifest_julia_version_compat(manifest::Manifest, manifest_file::String)
+    isempty(manifest.deps) && return
+    if manifest.manifest_format < v"2"
+        @warn """The active manifest file is an older format with no julia version entry. Dependencies may have \
+        been resolved with a different julia version.""" maxlog = 1 _file = manifest_file _line = 0 _module = nothing
+        return
+    end
+    v = manifest.julia_version
+    if v === nothing
+        @warn """The active manifest file is missing a julia version entry. Dependencies may have \
+        been resolved with a different julia version.""" maxlog = 1 _file = manifest_file _line = 0 _module = nothing
+        return
+    end
+    if v.major != VERSION.major && v.minor != VERSION.minor
+        ver_str = something(manifest.julia_version, "pre-1.7")
+        @warn """The active manifest file has dependencies that were resolved with a different julia \
+        version ($(manifest.julia_version)). Unexpected behavior may occur.""" maxlog = 1 _file = manifest_file _line = 0 _module = nothing
+    end
+end

test/manifests.jl

@@ -4,6 +4,32 @@ using  Test, UUIDs, Dates, TOML
 import ..Pkg, LibGit2
 using  ..Utils
 
+# used with the reference manifests in `test/manifest/formats`
+# ensures the manifests are valid and restored after test
+function reference_manifest_isolated_test(f, dir::String; v1::Bool=false)
+    env_dir = joinpath(@__DIR__, "manifest", "formats", dir)
+    env_manifest = joinpath(env_dir, "Manifest.toml")
+    env_project = joinpath(env_dir, "Project.toml")
+    cp(env_manifest, string(env_manifest, "_backup"))
+    cp(env_project, string(env_project, "_backup"))
+    try
+        isfile(env_manifest) || error("Reference manifest is missing")
+        if Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == !v1
+            error("Reference manifest file at $(env_manifest) is invalid")
+        end
+        isolate(loaded_depot=true) do
+            f(env_dir, env_manifest)
+        end
+    finally
+        cp(string(env_manifest, "_backup"), env_manifest, force = true)
+        rm(string(env_manifest, "_backup"))
+        cp(string(env_project, "_backup"), env_project, force = true)
+        rm(string(env_project, "_backup"))
+    end
+end
+
+##
+
 @testset "Manifest.toml formats" begin
     @testset "Default manifest format is v2" begin
         isolate(loaded_depot=true) do
@@ -19,13 +45,7 @@ using  ..Utils
     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
-            error("Reference manifest file at $(env_manifest) is invalid")
-        end
-        isolate(loaded_depot=true) do
+        reference_manifest_isolated_test("v1.0", v1 = true) do env_dir, env_manifest
             io = IOBuffer()
             Pkg.activate(env_dir; io=io)
             output = String(take!(io))
@@ -41,13 +61,7 @@ using  ..Utils
     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))
-            error("Reference manifest file at $(env_manifest) is invalid")
-        end
-        isolate(loaded_depot=true) do
+        reference_manifest_isolated_test("v2.0") do env_dir, env_manifest
             io = IOBuffer()
             Pkg.activate(env_dir; io=io)
             output = String(take!(io))
@@ -72,50 +86,69 @@ using  ..Utils
                 @test m.manifest_format == m2.manifest_format
                 @test m.other == m2.other
             end
-
         end
     end
 
     @testset "v3.0: unknown format, warn" begin
         # the reference file here is not actually v3.0. It just represents an unknown manifest format
-        env_dir = joinpath(@__DIR__, "manifest", "formats", "v3.0_unknown")
-        env_manifest = joinpath(env_dir, "Manifest.toml")
-        isfile(env_manifest) || error("Reference manifest is missing")
-        isolate(loaded_depot=true) do
+        reference_manifest_isolated_test("v3.0_unknown") do env_dir, env_manifest
             io = IOBuffer()
             @test_logs (:warn,) Pkg.activate(env_dir; io=io)
         end
     end
 
     @testset "Pkg.upgrade_manifest()" begin
-        env_dir = joinpath(@__DIR__, "manifest", "formats", "v1.0")
-        env_manifest = joinpath(env_dir, "Manifest.toml")
-        cp(env_manifest, string(env_manifest, "_backup"))
-        try
-            isfile(env_manifest) || error("Reference manifest is missing")
-            if Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
-                error("Reference manifest file at $(env_manifest) is invalid")
-            end
+        reference_manifest_isolated_test("v1.0", v1 = true) do env_dir, env_manifest
+            io = IOBuffer()
+            Pkg.activate(env_dir; io=io)
+            output = String(take!(io))
+            @test occursin(r"Activating.*project at.*`.*v1.0`", output)
+            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
+
+            Pkg.upgrade_manifest()
+            @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
+            Pkg.activate(env_dir; io=io)
+            output = String(take!(io))
+            @test occursin(r"Activating.*project at.*`.*v1.0`", output)
+            @test Pkg.Types.Context().env.manifest.manifest_format == v"2.0.0"
+        end
+    end
+end
+
+@testset "Manifest metadata" begin
+    @testset "julia_version" begin
+        @testset "new environment: value is `nothing`, then `VERSION` after resolve" begin
             isolate(loaded_depot=true) do
-                io = IOBuffer()
-                Pkg.activate(env_dir; io=io)
-                output = String(take!(io))
-                @test occursin(r"Activating.*project at.*`.*v1.0`", output)
-                @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest))
-
-                Pkg.upgrade_manifest()
-                @test Base.is_v1_format_manifest(Base.parsed_toml(env_manifest)) == false
-                Pkg.activate(env_dir; io=io)
-                output = String(take!(io))
-                @test occursin(r"Activating.*project at.*`.*v1.0`", output)
-                @test Pkg.Types.Context().env.manifest.manifest_format == v"2.0.0"
+                Pkg.activate(; temp=true)
+                @test Pkg.Types.Context().env.manifest.julia_version == nothing
+                Pkg.add("Profile")
+                @test Pkg.Types.Context().env.manifest.julia_version == VERSION
+            end
+        end
+        @testset "activating old environment: maintains old version, then `VERSION` after resolve" begin
+            reference_manifest_isolated_test("v2.0") do env_dir, env_manifest
+                Pkg.activate(env_dir)
+                @test Pkg.Types.Context().env.manifest.julia_version == v"1.7.0-DEV.1199"
+
+                Pkg.add("Profile")
+                @test Pkg.Types.Context().env.manifest.julia_version == VERSION
+            end
+        end
+        @testset "instantiate manifest from different julia_version" begin
+            reference_manifest_isolated_test("v1.0", v1 = true) do env_dir, env_manifest
+                Pkg.activate(env_dir)
+                @test_logs (:warn, r"The active manifest file") Pkg.instantiate()
+                @test Pkg.Types.Context().env.manifest.julia_version == nothing
+            end
+            if VERSION >= v"1.8"
+                reference_manifest_isolated_test("v2.0") do env_dir, env_manifest
+                    Pkg.activate(env_dir)
+                    @test_logs (:warn, r"The active manifest file") Pkg.instantiate()
+                    @test Pkg.Types.Context().env.manifest.julia_version == v"1.7.0-DEV.1199"
+                end
             end
-        finally
-            cp(string(env_manifest, "_backup"), env_manifest, force = true)
-            rm(string(env_manifest, "_backup"))
         end
     end
 end
 
-
 end # module

test/new.jl

@@ -895,7 +895,7 @@ end
                               ) Pkg.pkg"add some/really/random/Dir"
         # warn if not explicit about adding directory
         mkdir("Example")
-        @test_logs (:info, r"Use `./Example` to add or develop the local directory at `.*`.") Pkg.pkg"add Example"
+        @test_logs (:info, r"Use `./Example` to add or develop the local directory at `.*`.") match_mode=:any Pkg.pkg"add Example"
     end end
 end
 
@@ -1967,7 +1967,7 @@ end
     # other
     isolate(loaded_depot=true) do
         @test_deprecated Pkg.status(Pkg.PKGMODE_MANIFEST)
-        @test_logs (:warn, r"diff option only available") Pkg.status(diff=true)
+        @test_logs (:warn, r"diff option only available") match_mode=:any Pkg.status(diff=true)
     end
     # State changes
     isolate(loaded_depot=true) do