move extra deps into [extras] section (#531)

Author: StefanKarpinski

stdlib/Pkg/docs/src/index.md

@@ -689,13 +689,18 @@ Testing...
 
 #### Test-specific dependencies
 
-Sometimes one might want to use some packages only at testing time but not enforce a dependency on them when the package is used.
-This is possible by adding dependencies to a "test target" to the Project file. Here we add the `Test` standard library as a
-test-only dependency by adding the following to the Project file:
+Sometimes one might want to use some packages only at testing time but not
+enforce a dependency on them when the package is used. This is possible by
+adding `[extra]` dependencies and adding a a "test target" to the Project file.
+Here we add the `Test` standard library as a test-only dependency by adding the
+following to the Project file:
 
 ```
-[targets.test.deps]
+[extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]
 ```
 
 We can now use `Test` in the test script and we can see that it gets installed on testing:

stdlib/Pkg/src/Operations.jl

@@ -874,14 +874,10 @@ function collect_target_deps!(ctx::Context, pkgs::Vector{PackageSpec}, pkg::Pack
     # Collect target deps from Project
     if project !== nothing
         targets = project["targets"]
-        haskey(targets, target) || return pkgs
-        targets = project["targets"]
-        target_info = targets[target]
-        haskey(target_info, "deps") || return pkgs
-        targets = project["targets"]
-        deps = target_info["deps"]
-        for (pkg, uuid) in deps
-            push!(pkgs, PackageSpec(pkg, UUID(uuid)))
+        haskey(targets, target) || return
+        for pkg in targets[target]
+            uuid = UUID(ctx.env.project["extras"][pkg])
+            push!(pkgs, PackageSpec(pkg, uuid))
         end
     end
     return nothing

stdlib/Pkg/src/Types.jl

@@ -348,6 +348,37 @@ function Context!(ctx::Context; kwargs...)
     end
 end
 
+# target === nothing : main dependencies
+# target === "*"     : main + all extras
+# target === "name"  : named target deps
+
+function deps_names(project::Dict, target::Union{Nothing,String}=nothing)::Vector{String}
+    deps = sort!(collect(keys(project["deps"])))
+    target == "*" && return !haskey(project, "extras") ? deps :
+        sort!(union!(deps, collect(keys(project["extras"]))))
+    haskey(project, "targets") || return deps
+    targets = project["targets"]
+    haskey(targets, target) || return deps
+    return sort!(union!(deps, targets[target]))
+end
+
+function get_deps(project::Dict, target::Union{Nothing,String}=nothing)
+    names = deps_names(project, target)
+    deps = filter(((dep, _),) -> dep in names, project["deps"])
+    extras = get(project, "extras", Dict{String,Any}())
+    for name in names
+        haskey(deps, name) && continue
+        haskey(extras, name) ||
+            cmderror("target `$target` has unlisted dependency `$name`")
+        deps[name] = extras[name]
+    end
+    return deps
+end
+get_deps(env::EnvCache, target::Union{Nothing,String}=nothing) =
+    get_deps(env.project, target)
+get_deps(ctx::Context, target::Union{Nothing,String}=nothing) =
+    get_deps(ctx.env, target)
+
 function project_compatibility(ctx::Context, name::String)
     v = VersionSpec()
     project = ctx.env.project

stdlib/Pkg/test/pkg.jl

@@ -414,6 +414,32 @@ temp_pkg_dir() do project_path
     end
 end
 
+temp_pkg_dir() do project_path
+    cd(project_path) do
+        project = """
+        [deps]
+        UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+
+        [extras]
+        Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
+        Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+        [targets]
+        test = ["Markdown", "Test"]
+        """
+        write("Project.toml", project)
+        Pkg.activate(".")
+        @testset "resolve ignores extras" begin
+            Pkg.resolve()
+            @test read("Manifest.toml", String) == """
+            [[UUIDs]]
+            uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+            """
+        end
+        Pkg.activate()
+    end
+end
+
 include("repl.jl")
 
 end # module

stdlib/Pkg/test/test_packages/BigProject/Project.toml

@@ -3,7 +3,9 @@ uuid = "da7e1942-2519-11e8-2822-f5508ce758f0"
 authors = ["Some One <[email protected]>"]
 version = "0.1.0"
 
-[deps]
-
-[targets.test.deps]
+[extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Example = "7876af07-990d-54b4-ab0e-23690620f79a"
+
+[targets]
+test = ["Example", "Test"]