Try #458:

JuliaRegistries · Oct 28, 2023 · 9f46bf5 · 9f46bf5
2 parents 7b7166f + 8c7b462
commit 9f46bf5
Show file tree

Hide file tree

Showing 14 changed files with 306 additions and 36 deletions.
diff --git a/src/dependencies.jl b/src/dependencies.jl
@@ -18,35 +18,39 @@ end
 
 function get_project_deps(project_file::AbstractString; include_jll::Bool=false)
     project_deps = Set{DepInfo}()
+    dep_section = Dict{DepInfo,String}()
     project = TOML.parsefile(project_file)
 
-    if haskey(project, "deps")
-        deps = project["deps"]
-        add_compat_section!(project)
-        compat = project["compat"]
-
-        for dep in deps
-            name = dep[1]
-            uuid = UUIDs.UUID(dep[2])
-
-            # 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, "")))
-
-                if !isempty(dep_entry)
-                    compat_entry.version_spec = semver_spec(dep_entry)
-                    compat_entry.version_verbatim = dep_entry
+    for section in ["deps", "weakdeps"]
+        if haskey(project, section)
+            deps = project[section]
+            add_compat_section!(project)
+            compat = project["compat"]
+
+            for dep in deps
+                name = dep[1]
+                uuid = UUIDs.UUID(dep[2])
+
+                # 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, "")))
+
+                    if !isempty(dep_entry)
+                        compat_entry.version_spec = semver_spec(dep_entry)
+                        compat_entry.version_verbatim = dep_entry
+                    end
+
+                    push!(project_deps, compat_entry)
+                    get!(dep_section, compat_entry, section)
                 end
-
-                push!(project_deps, compat_entry)
             end
         end
     end
 
-    return project_deps
+    return project_deps, dep_section
 end
 
 function clone_all_registries(f::Function, registry_list::Vector{Pkg.RegistrySpec})

diff --git a/src/main.jl b/src/main.jl
@@ -51,7 +51,7 @@ function main(
 
     for subdir in options.subdirs
         project_file = @mock joinpath(local_clone_path, subdir, "Project.toml")
-        deps = get_project_deps(project_file; include_jll=options.include_jll)
+        deps, dep_sections = get_project_deps(project_file; include_jll=options.include_jll)
 
         if options.use_existing_registries
             get_existing_registries!(deps, options.depot; options)
@@ -60,6 +60,7 @@ function main(
         end
 
         for dep in deps
+            dep_section = dep_sections[dep]
             pr = @mock make_pr_for_new_version(
                 api,
                 repo,
@@ -69,6 +70,7 @@ function main(
                 options,
                 subdir,
                 local_clone_path,
+                dep_section,
             )
 
             if !isnothing(pr)

diff --git a/src/utilities/new_versions.jl b/src/utilities/new_versions.jl
@@ -43,9 +43,14 @@ function subdir_string(subdir::AbstractString)
     end
 end
 
+function section_string(section::AbstractString)
+    return section == "deps" ? "" : " in [$(section)]"
+end
+
 function pr_info(
     compat_entry_verbatim::Nothing,
     name::AbstractString,
+    section_str::AbstractString,
     compat_entry_for_latest_version::AbstractString,
     compat_entry::AbstractString,
     subdir_string::AbstractString,
@@ -54,7 +59,7 @@ function pr_info(
     pr_title_prefix::String,
 )
     new_pr_title = m"""
-    $(pr_title_prefix)CompatHelper: add new compat entry for $(name) at version
+    $(pr_title_prefix)CompatHelper: add new compat entry for $(name)$(section_str) at version
     $(compat_entry_for_latest_version)$(subdir_string)$(pr_title_parenthetical)
     """
 
@@ -73,6 +78,7 @@ end
 function pr_info(
     compat_entry_verbatim::AbstractString,
     name::AbstractString,
+    section_str::AbstractString,
     compat_entry_for_latest_version::AbstractString,
     compat_entry::AbstractString,
     subdir_string::AbstractString,
@@ -81,7 +87,7 @@ function pr_info(
     pr_title_prefix::String,
 )
     new_pr_title = m"""
-    $(pr_title_prefix)CompatHelper: bump compat for $(name) to
+    $(pr_title_prefix)CompatHelper: bump compat for $(name)$(section_str) to
     $(compat_entry_for_latest_version)$(subdir_string)$(pr_title_parenthetical)
     """
 
@@ -209,6 +215,7 @@ function make_pr_for_new_version(
     options::Options,
     subdir::String,
     local_clone_path::AbstractString,
+    dep_section::String,
 )
     if !continue_with_pr(dep, options.bump_compat_containing_equality_specifier)
         return nothing
@@ -222,6 +229,7 @@ function make_pr_for_new_version(
     new_pr_title, new_pr_body = pr_info(
         dep.version_verbatim,
         dep.package.name,
+        section_string(dep_section),
         compat_entry_for_latest_version,
         brand_new_compat,
         subdir_string(subdir),

diff --git a/test/dependencies.jl b/test/dependencies.jl
@@ -14,10 +14,27 @@ end
 @testset "get_project_deps" begin
     project = joinpath(@__DIR__, "deps", "Project.toml")
 
-    deps = CompatHelper.get_project_deps(project; include_jll=true)
+    deps, dep_section = CompatHelper.get_project_deps(project; include_jll=true)
+    @test length(deps) == 5
+    @test issetequal(keys(dep_section), deps)
+    for (k, s) in pairs(dep_section)
+        if k.package.name ∈ ["Bex_jll", "Skix"]
+            @test s == "weakdeps"
+        else
+            @test s == "deps"
+        end
+    end
+
+    deps, dep_section = CompatHelper.get_project_deps(project; include_jll=false)
     @test length(deps) == 3
-    deps = CompatHelper.get_project_deps(project; include_jll=false)
-    @test length(deps) == 2
+    @test issetequal(keys(dep_section), deps)
+    for (k, s) in pairs(dep_section)
+        if k.package.name == "Skix"
+            @test s == "weakdeps"
+        else
+            @test s == "deps"
+        end
+    end
 end
 
 @testset "clone_all_registries" begin

diff --git a/test/deps/Project.toml b/test/deps/Project.toml
@@ -7,7 +7,16 @@ Foobar_jll = "6ca821de-e512-569d-89d9-0b16ce691416"
 Baz = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
+[weakdeps]
+Bex_jll = "3db6da90-6ed3-11ee-0779-f549c8e3e90d"
+Skix = "3db6da90-6ed3-11ee-0779-f549c8e3e90d"
+
+[extensions]
+Ext = ["Bex_jll", "Skix"]
+
 [compat]
 Foobar_jll = "1"
 Baz = "1"
+Bex_jll = "1"
+Skix = "1"
 julia = "1.6"
diff --git a/test/integration_tests.jl b/test/integration_tests.jl
@@ -171,6 +171,106 @@ function run_integration_tests(
         end
     end
 
+    sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+    @testset "master_9" begin
+        with_master_branch(templates("master_9"), url, "master") do master_9
+            withenv(env...) do
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-9c] ",
+                    master_branch=master_9,
+                    entry_type=KeepEntry(),
+                )
+            end
+        end
+    end
+
+    sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+    @testset "master_10" begin
+        with_master_branch(templates("master_10"), url, "master") do master_10
+            withenv(env...) do
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-10a] ",
+                    master_branch=master_10,
+                    entry_type=DropEntry(),
+                )
+
+                sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-10b] ",
+                    master_branch=master_10,
+                    entry_type=KeepEntry(),
+                )
+
+                sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-10c] ",
+                    master_branch=master_10,
+                    entry_type=KeepEntry(),
+                )
+            end
+        end
+    end
+
+    sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+    @testset "master_11" begin
+        with_master_branch(templates("master_11"), url, "master") do master_11
+            withenv(env...) do
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-11c] ",
+                    master_branch=master_11,
+                    entry_type=KeepEntry(),
+                )
+            end
+        end
+    end
+
+    sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+    @testset "master_12" begin
+        with_master_branch(templates("master_12"), url, "master") do master_12
+            withenv(env...) do
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-12a] ",
+                    master_branch=master_12,
+                    entry_type=DropEntry(),
+                )
+            end
+        end
+    end
+
+    sleep(1)  # Prevent hitting the GH Secondary Rate Limits
+
+    @testset "master_13" begin
+        with_master_branch(templates("master_13"), url, "master") do master_13
+            withenv(env...) do
+                CompatHelper.main(
+                    ENV,
+                    ci_cfg;
+                    pr_title_prefix="$(GLOBAL_PR_TITLE_PREFIX) [test-13a] ",
+                    master_branch=master_13,
+                    entry_type=DropEntry(),
+                )
+            end
+        end
+    end
+
     return _cleanup_old_branches(url)
 end
 

diff --git a/test/main.jl b/test/main.jl
@@ -62,8 +62,9 @@
                     "GITHUB_REPOSITORY" => "CompatHelper.jl", "GITHUB_TOKEN" => "token"
                 ) do
                     prs = CompatHelper.main()
-                    @test length(prs) == 2
+                    @test length(prs) == 3
                     @test prs[1] isa GitHub.PullRequest
+                    @test prs[2] isa GitHub.PullRequest
                 end
             end
         end
@@ -96,8 +97,9 @@
                     ) do
                         delete!(ENV, "GITHUB_REPOSITORY")
                         prs = CompatHelper.main()
-                        @test length(prs) == 2
+                        @test length(prs) == 3
                         @test prs[1] isa GitLab.MergeRequest
+                        @test prs[2] isa GitLab.MergeRequest
                     end
                 end
             end

diff --git a/test/templates/master_10/Project.toml b/test/templates/master_10/Project.toml
@@ -0,0 +1,28 @@
+name = "compathelper_integration_test_repo"
+uuid = "0e97b93d-f6aa-40c8-b749-d2f6bf239ed7"
+authors = ["Brown Center for Biomedical Informatics"]
+description = "Test Project.toml with both dependencies and weak dependencies, compat entries; major ver, ~"
+version = "0.1.0"
+
+[weakdeps]
+BioSequences = "7e6ae17a-c86d-528c-b3b9-7f778a29fe59"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+Flux = "587475ba-b771-5e3f-ad9e-33799f191a9c"
+IterableTables = "1c8ee90f-4401-5389-894e-7a04a3dc0f4d"
+Nettle_jll = "4c82536e-c426-54e4-b420-14f461c4ed8b"
+PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[extensions]
+Ext = ["BioSequences", "DataFrames", "Flux", "IterableTables", "Nettle_jll", "PGFPlotsX"]
+
+[compat]
+IterableTables = "1"
+PGFPlotsX = "~1.0.0"
+julia = "1.2"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]
diff --git a/test/templates/master_11/Project.toml b/test/templates/master_11/Project.toml
@@ -0,0 +1,20 @@
+name = "compathelper_integration_test_repo"
+uuid = "0e97b93d-f6aa-40c8-b749-d2f6bf239ed7"
+authors = ["Brown Center for Biomedical Informatics"]
+description = "Test Project.toml with weak dependency where package does not exist"
+version = "0.1.0"
+
+[weakdeps]
+ThisPackageDoesNotExist = "2c58d03c-75de-479c-aa0b-96bf0b358d76"
+
+[extensions]
+Ext = "ThisPackageDoesNotExist"
+
+[compat]
+julia = "1.2"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]
diff --git a/test/templates/master_12/Project.toml b/test/templates/master_12/Project.toml
@@ -0,0 +1,21 @@
+name = "compathelper_integration_test_repo"
+uuid = "0e97b93d-f6aa-40c8-b749-d2f6bf239ed7"
+authors = ["Brown Center for Biomedical Informatics"]
+description = "Test Project.toml with weak dependency and compat entry for it"
+version = "0.1.0"
+
+[weakdeps]
+PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
+
+[extensions]
+Ext = "PGFPlotsX"
+
+[compat]
+PGFPlotsX = "~1.0.0"
+julia = "1.2"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]