diff --git a/Project.toml b/Project.toml index fca0bbc6..14c434ee 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "RegistryCI" uuid = "0c95cc5f-2f7e-43fe-82dd-79dbcba86b32" authors = ["Dilum Aluthge ", "Fredrik Ekre ", "contributors"] -version = "8.4.1" +version = "9.0.0" [deps] Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" diff --git a/src/AutoMerge/guidelines.jl b/src/AutoMerge/guidelines.jl index d696f012..d90d65da 100644 --- a/src/AutoMerge/guidelines.jl +++ b/src/AutoMerge/guidelines.jl @@ -91,8 +91,8 @@ function meets_compat_for_all_deps(working_directory::AbstractString, pkg, versi for version_range in keys(deps) if version in Pkg.Types.VersionRange(version_range) for name in keys(deps[version_range]) - if !is_jll_name(name) && !is_julia_stdlib(name) - @debug("Found a new (non-stdlib non-JLL) dependency: $(name)") + if !is_jll_name(name) + @debug("Found a new (non-JLL) dependency: $(name)") dep_has_compat_with_upper_bound[name] = false end end diff --git a/src/AutoMerge/util.jl b/src/AutoMerge/util.jl index 994e1290..89520cd7 100644 --- a/src/AutoMerge/util.jl +++ b/src/AutoMerge/util.jl @@ -239,20 +239,6 @@ function comment_text_merge_now() return result end -is_julia_stdlib(name) = name in julia_stdlib_list() - -function julia_stdlib_list() - stdlib_list = readdir(Pkg.Types.stdlib_dir()) - # Before Julia v1.6 Artifacts.jl isn't a standard library, but - # we want to include it because JLL packages depend on the empty - # placeholder https://github.com/JuliaPackaging/Artifacts.jl - # in older versions for compatibility. - if VERSION < v"1.6.0" - push!(stdlib_list, "Artifacts") - end - return stdlib_list -end - function now_utc() utc = TimeZones.tz"UTC" return Dates.now(utc) diff --git a/test/templates/feature_1/R/Requires/Compat.toml b/test/templates/feature_1/R/Requires/Compat.toml index 06be3379..db7d46b0 100644 --- a/test/templates/feature_1/R/Requires/Compat.toml +++ b/test/templates/feature_1/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1] julia = "1" +UUIDs = "1" diff --git a/test/templates/feature_2/R/Requires/Compat.toml b/test/templates/feature_2/R/Requires/Compat.toml index 88f6aead..1d8754b5 100644 --- a/test/templates/feature_2/R/Requires/Compat.toml +++ b/test/templates/feature_2/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1-2] julia = "1" +UUIDs = "1" diff --git a/test/templates/feature_3/R/Req/Compat.toml b/test/templates/feature_3/R/Req/Compat.toml index 06be3379..db7d46b0 100644 --- a/test/templates/feature_3/R/Req/Compat.toml +++ b/test/templates/feature_3/R/Req/Compat.toml @@ -1,2 +1,3 @@ [1] julia = "1" +UUIDs = "1" diff --git a/test/templates/feature_4/R/Requires/Compat.toml b/test/templates/feature_4/R/Requires/Compat.toml index 88f6aead..1d8754b5 100644 --- a/test/templates/feature_4/R/Requires/Compat.toml +++ b/test/templates/feature_4/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1-2] julia = "1" +UUIDs = "1" diff --git a/test/templates/feature_5/R/Requires/Compat.toml b/test/templates/feature_5/R/Requires/Compat.toml index 88f6aead..1d8754b5 100644 --- a/test/templates/feature_5/R/Requires/Compat.toml +++ b/test/templates/feature_5/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1-2] julia = "1" +UUIDs = "1" diff --git a/test/templates/feature_5/R/ResettableStacks/Compat.toml b/test/templates/feature_5/R/ResettableStacks/Compat.toml index c787222f..404156b7 100644 --- a/test/templates/feature_5/R/ResettableStacks/Compat.toml +++ b/test/templates/feature_5/R/ResettableStacks/Compat.toml @@ -1,5 +1,9 @@ ["0-0.4"] julia = "0.7-1" +Random = "0.7-1" +Test = "0.7-1" ["0.5-1"] julia = "1" +Random = "1" +Test = "1" diff --git a/test/templates/feature_6/jll/H/HelloWorldC_jll/Compat.toml b/test/templates/feature_6/jll/H/HelloWorldC_jll/Compat.toml index 90c01f8a..8eb40f85 100644 --- a/test/templates/feature_6/jll/H/HelloWorldC_jll/Compat.toml +++ b/test/templates/feature_6/jll/H/HelloWorldC_jll/Compat.toml @@ -1,2 +1,4 @@ [1] julia = "1.3.0-1" +Libdl = "1.3.0-1" +Pkg = "1.3.0-1" diff --git a/test/templates/feature_7/jll/H/HelloWorldC_jll/Compat.toml b/test/templates/feature_7/jll/H/HelloWorldC_jll/Compat.toml index 4ca310f7..5e88e7da 100644 --- a/test/templates/feature_7/jll/H/HelloWorldC_jll/Compat.toml +++ b/test/templates/feature_7/jll/H/HelloWorldC_jll/Compat.toml @@ -1,5 +1,9 @@ ["1-1.0.6"] julia = "1.3.0-1" +Libdl = "1.3.0-1" +Pkg = "1.3.0-1" ["1.0.8-1"] julia = "1" +Libdl = "1" +Pkg = "1" diff --git a/test/templates/feature_8/jll/H/HelloWorldC_jll/Compat.toml b/test/templates/feature_8/jll/H/HelloWorldC_jll/Compat.toml index 90c01f8a..a8e9bfbf 100644 --- a/test/templates/feature_8/jll/H/HelloWorldC_jll/Compat.toml +++ b/test/templates/feature_8/jll/H/HelloWorldC_jll/Compat.toml @@ -1,2 +1,4 @@ [1] julia = "1.3.0-1" +LinearAlgebra = "1.3.0-1" +Pkg = "1.3.0-1" diff --git a/test/templates/master_2/R/Requires/Compat.toml b/test/templates/master_2/R/Requires/Compat.toml index 06be3379..db7d46b0 100644 --- a/test/templates/master_2/R/Requires/Compat.toml +++ b/test/templates/master_2/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1] julia = "1" +UUIDs = "1" diff --git a/test/templates/master_3/R/Requires/Compat.toml b/test/templates/master_3/R/Requires/Compat.toml index 06be3379..db7d46b0 100644 --- a/test/templates/master_3/R/Requires/Compat.toml +++ b/test/templates/master_3/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1] julia = "1" +UUIDs = "1" diff --git a/test/templates/master_3/R/ResettableStacks/Compat.toml b/test/templates/master_3/R/ResettableStacks/Compat.toml index c787222f..404156b7 100644 --- a/test/templates/master_3/R/ResettableStacks/Compat.toml +++ b/test/templates/master_3/R/ResettableStacks/Compat.toml @@ -1,5 +1,9 @@ ["0-0.4"] julia = "0.7-1" +Random = "0.7-1" +Test = "0.7-1" ["0.5-1"] julia = "1" +Random = "1" +Test = "1" diff --git a/test/templates/master_4/jll/H/HelloWorldC_jll/Compat.toml b/test/templates/master_4/jll/H/HelloWorldC_jll/Compat.toml index 90c01f8a..8eb40f85 100644 --- a/test/templates/master_4/jll/H/HelloWorldC_jll/Compat.toml +++ b/test/templates/master_4/jll/H/HelloWorldC_jll/Compat.toml @@ -1,2 +1,4 @@ [1] julia = "1.3.0-1" +Libdl = "1.3.0-1" +Pkg = "1.3.0-1" diff --git a/test/templates/public_2/R/Req/Compat.toml b/test/templates/public_2/R/Req/Compat.toml index 88f6aead..1d8754b5 100644 --- a/test/templates/public_2/R/Req/Compat.toml +++ b/test/templates/public_2/R/Req/Compat.toml @@ -1,2 +1,3 @@ [1-2] julia = "1" +UUIDs = "1" diff --git a/test/templates/public_3/R/Requires/Compat.toml b/test/templates/public_3/R/Requires/Compat.toml index 88f6aead..1d8754b5 100644 --- a/test/templates/public_3/R/Requires/Compat.toml +++ b/test/templates/public_3/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [1-2] julia = "1" +UUIDs = "1" diff --git a/test/templates/public_4/R/Requires/Compat.toml b/test/templates/public_4/R/Requires/Compat.toml index 322f203c..bc46af97 100644 --- a/test/templates/public_4/R/Requires/Compat.toml +++ b/test/templates/public_4/R/Requires/Compat.toml @@ -1,2 +1,3 @@ [0-1] julia = "1" +UUIDs = "1"