From 59d0f05e80290003209190afe04703a614aae891 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Sat, 14 Oct 2023 17:29:06 -0400 Subject: [PATCH 1/3] Stop ignoring stdlibs --- src/dependencies.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dependencies.jl b/src/dependencies.jl index ef5a8c60..26375df4 100644 --- a/src/dependencies.jl +++ b/src/dependencies.jl @@ -29,9 +29,9 @@ function get_project_deps(project_file::AbstractString; include_jll::Bool=false) name = dep[1] uuid = UUIDs.UUID(dep[2]) - # Ignore STDLIB packages and JLL ones if flag set - if !Pkg.Types.is_stdlib(uuid) && - (!endswith(lowercase(strip(name)), "_jll") || include_jll) + # Ignore JLL packages if flag set + # Do NOT ignore stdlib packages. + if !endswith(lowercase(strip(name)), "_jll") || include_jll package = Package(name, uuid) compat_entry = DepInfo(package) dep_entry = convert(String, strip(get(compat, name, ""))) From ab0b827918102e73c6bdfedd8862dec8f21008d2 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Thu, 26 Oct 2023 03:36:33 -0400 Subject: [PATCH 2/3] Update some tests (#459) * Update some tests * Update another test --- test/dependencies.jl | 4 ++-- test/main.jl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dependencies.jl b/test/dependencies.jl index d0bc4566..cc140a4a 100644 --- a/test/dependencies.jl +++ b/test/dependencies.jl @@ -15,9 +15,9 @@ end project = joinpath(@__DIR__, "deps", "Project.toml") deps = CompatHelper.get_project_deps(project; include_jll=true) - @test length(deps) == 2 + @test length(deps) == 3 deps = CompatHelper.get_project_deps(project; include_jll=false) - @test length(deps) == 1 + @test length(deps) == 2 end @testset "clone_all_registries" begin diff --git a/test/main.jl b/test/main.jl index d9c6fb0f..1826fad0 100644 --- a/test/main.jl +++ b/test/main.jl @@ -96,7 +96,7 @@ ) do delete!(ENV, "GITHUB_REPOSITORY") prs = CompatHelper.main() - @test length(prs) == 1 + @test length(prs) == 2 @test prs[1] isa GitLab.MergeRequest end end From a339fe9a13804e5c4701d84746d89a5417449867 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Thu, 26 Oct 2023 03:40:50 -0400 Subject: [PATCH 3/3] Update another test --- test/main.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/main.jl b/test/main.jl index 1826fad0..3742ba1d 100644 --- a/test/main.jl +++ b/test/main.jl @@ -62,7 +62,7 @@ "GITHUB_REPOSITORY" => "CompatHelper.jl", "GITHUB_TOKEN" => "token" ) do prs = CompatHelper.main() - @test length(prs) == 1 + @test length(prs) == 2 @test prs[1] isa GitHub.PullRequest end end