From b20ba2b1e1f289e63024011aba414ee37841cc2b Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Fri, 10 Jul 2020 18:50:34 +0000 Subject: [PATCH 1/4] Deprecate the REPL command `] generate` --- src/REPLMode/command_declarations.jl | 2 +- src/generate.jl | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/REPLMode/command_declarations.jl b/src/REPLMode/command_declarations.jl index b5bb21428d..cdc41a4c51 100644 --- a/src/REPLMode/command_declarations.jl +++ b/src/REPLMode/command_declarations.jl @@ -278,7 +278,7 @@ patch version; if the `--fixed` upgrade level is given, then the following packages will not be upgraded at all. """, ],[ :name => "generate", - :api => API.generate, + :api => API.generate_deprecated, :arg_count => 1 => 1, :arg_parser => ((x,y) -> map(expanduser, unwrap(x))), :description => "generate files for a new project", diff --git a/src/generate.jl b/src/generate.jl index 734327f267..7b57c50bf1 100644 --- a/src/generate.jl +++ b/src/generate.jl @@ -1,5 +1,10 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license +function generate_deprecated(varargs...; kwargs...) + Base.depwarn("Pkg.generate is deprecated. Please use PkgTemplates.jl instead.", Core.Typeof(generate).name.mt.name) + return generate(varargs...; kwargs...) +end + generate(path::String; kwargs...) = generate(Context(), path; kwargs...) function generate(ctx::Context, path::String; kwargs...) Context!(ctx; kwargs...) From f0b499a8cea1d53f20576d892b437b66c474503d Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Fri, 10 Jul 2020 17:14:27 -0400 Subject: [PATCH 2/4] Easier way of passing the function symbol to depwarn --- src/generate.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generate.jl b/src/generate.jl index 7b57c50bf1..f640b38070 100644 --- a/src/generate.jl +++ b/src/generate.jl @@ -1,7 +1,7 @@ # This file is a part of Julia. License is MIT: https://julialang.org/license function generate_deprecated(varargs...; kwargs...) - Base.depwarn("Pkg.generate is deprecated. Please use PkgTemplates.jl instead.", Core.Typeof(generate).name.mt.name) + Base.depwarn("Pkg.generate is deprecated. Please use PkgTemplates.jl instead.", Symbol("Pkg.generate")) return generate(varargs...; kwargs...) end From df84a0ccd1b6c414e1315e1603775e4e2c669f60 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Sun, 12 Jul 2020 17:21:15 +0000 Subject: [PATCH 3/4] Fix the test suite --- test/new.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/new.jl b/test/new.jl index 4d98799941..6ef24bbd6c 100644 --- a/test/new.jl +++ b/test/new.jl @@ -1816,7 +1816,7 @@ end isolate() do Pkg.REPLMode.TEST_MODE[] = true api, arg, opts = first(Pkg.pkg"generate Foo") - @test api == Pkg.generate + @test api == Pkg.generate_deprecated @test arg == "Foo" @test isempty(opts) mktempdir() do dir From 65c63dcc8d1991fc4c6f3f31d82a1ff5c0ac0d9b Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Mon, 13 Jul 2020 00:35:18 +0000 Subject: [PATCH 4/4] Fix the tests --- test/new.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/new.jl b/test/new.jl index 6ef24bbd6c..e76d181293 100644 --- a/test/new.jl +++ b/test/new.jl @@ -1816,7 +1816,7 @@ end isolate() do Pkg.REPLMode.TEST_MODE[] = true api, arg, opts = first(Pkg.pkg"generate Foo") - @test api == Pkg.generate_deprecated + @test api == Pkg.API.generate_deprecated @test arg == "Foo" @test isempty(opts) mktempdir() do dir