Merge #416

416: 🤖 Automatically format the source code files r=DilumAluthge a=github-actions[bot]

This pull request formats the source code files using the JuliaFormatter package.

Co-authored-by: bors[bot] <bors[bot]@users.noreply.github.com>

Author: bors[bot]

bin/remember_to_update_registryci.jl

@@ -7,34 +7,31 @@ using Pkg
 # Some of the code in this file is taken from:
 # https://github.com/bcbi/CompatHelper.jl
 
-struct AlwaysAssertionError <: Exception
-end
+struct AlwaysAssertionError <: Exception end
 
 @inline function always_assert(cond::Bool)::Nothing
     cond || throw(AlwaysAssertionError())
     return nothing
 end
 
-function get_all_pull_requests(api::GitHub.GitHubAPI,
-                               repo::GitHub.Repo,
-                               state::String;
-                               auth::GitHub.Authorization,
-                               per_page::Integer = 100,
-                               page_limit::Integer = 100)
+function get_all_pull_requests(
+    api::GitHub.GitHubAPI,
+    repo::GitHub.Repo,
+    state::String;
+    auth::GitHub.Authorization,
+    per_page::Integer=100,
+    page_limit::Integer=100,
+)
     all_pull_requests = Vector{GitHub.PullRequest}(undef, 0)
-    myparams = Dict("state" => state,
-                    "per_page" => per_page,
-                    "page" => 1)
-    prs, page_data = GitHub.pull_requests(api, repo;
-                                          auth=auth,
-                                          params = myparams,
-                                          page_limit = page_limit)
+    myparams = Dict("state" => state, "per_page" => per_page, "page" => 1)
+    prs, page_data = GitHub.pull_requests(
+        api, repo; auth=auth, params=myparams, page_limit=page_limit
+    )
     append!(all_pull_requests, prs)
     while haskey(page_data, "next")
-        prs, page_data = GitHub.pull_requests(api, repo;
-                                              auth=auth,
-                                              page_limit = page_limit,
-                                              start_page = page_data["next"])
+        prs, page_data = GitHub.pull_requests(
+            api, repo; auth=auth, page_limit=page_limit, start_page=page_data["next"]
+        )
         append!(all_pull_requests, prs)
     end
     unique!(all_pull_requests)
@@ -45,19 +42,22 @@ _repos_are_the_same(::GitHub.Repo, ::Nothing) = false
 _repos_are_the_same(::Nothing, ::GitHub.Repo) = false
 _repos_are_the_same(::Nothing, ::Nothing) = false
 function _repos_are_the_same(x::GitHub.Repo, y::GitHub.Repo)
-    if x.name == y.name && x.full_name == y.full_name &&
-                           x.owner == y.owner &&
-                           x.id == y.id &&
-                           x.url == y.url &&
-                           x.html_url == y.html_url &&
-                           x.fork == y.fork
-       return true
+    if x.name == y.name &&
+       x.full_name == y.full_name &&
+       x.owner == y.owner &&
+       x.id == y.id &&
+       x.url == y.url &&
+       x.html_url == y.html_url &&
+       x.fork == y.fork
+        return true
     else
         return false
     end
 end
 
-function exclude_pull_requests_from_forks(repo::GitHub.Repo, pr_list::Vector{GitHub.PullRequest})
+function exclude_pull_requests_from_forks(
+    repo::GitHub.Repo, pr_list::Vector{GitHub.PullRequest}
+)
     non_forked_pull_requests = Vector{GitHub.PullRequest}(undef, 0)
     for pr in pr_list
         always_assert(_repos_are_the_same(repo, pr.base.repo))
@@ -72,7 +72,7 @@ function only_my_pull_requests(pr_list::Vector{GitHub.PullRequest}; my_username:
     _my_username_lowercase = lowercase(strip(my_username))
     n = length(pr_list)
     pr_is_mine = BitVector(undef, n)
-    for i = 1:n
+    for i in 1:n
         pr_user_login = pr_list[i].user.login
         if lowercase(strip(pr_user_login)) == _my_username_lowercase
             pr_is_mine[i] = true
@@ -84,19 +84,21 @@ function only_my_pull_requests(pr_list::Vector{GitHub.PullRequest}; my_username:
     return my_pr_list
 end
 
-function create_new_pull_request(api::GitHub.GitHubAPI,
-                                 repo::GitHub.Repo;
-                                 base_branch::String,
-                                 head_branch::String,
-                                 title::String,
-                                 body::String,
-                                 auth::GitHub.Authorization)
-    params = Dict{String, String}()
+function create_new_pull_request(
+    api::GitHub.GitHubAPI,
+    repo::GitHub.Repo;
+    base_branch::String,
+    head_branch::String,
+    title::String,
+    body::String,
+    auth::GitHub.Authorization,
+)
+    params = Dict{String,String}()
     params["title"] = title
     params["head"] = head_branch
     params["base"] = base_branch
     params["body"] = body
-    result = GitHub.create_pull_request(api, repo; params = params, auth = auth)
+    result = GitHub.create_pull_request(api, repo; params=params, auth=auth)
     return result
 end
 
@@ -130,46 +132,50 @@ function set_git_identity(username, email)
     return nothing
 end
 
-function create_new_pull_request(api::GitHub.GitHubAPI,
-                                 repo::GitHub.Repo;
-                                 base_branch::String,
-                                 head_branch::String,
-                                 title::String,
-                                 body::String,
-                                 auth::GitHub.Authorization)
-    params = Dict{String, String}()
+function create_new_pull_request(
+    api::GitHub.GitHubAPI,
+    repo::GitHub.Repo;
+    base_branch::String,
+    head_branch::String,
+    title::String,
+    body::String,
+    auth::GitHub.Authorization,
+)
+    params = Dict{String,String}()
     params["title"] = title
     params["head"] = head_branch
     params["base"] = base_branch
     params["body"] = body
-    result = GitHub.create_pull_request(api, repo; params = params, auth = auth)
+    result = GitHub.create_pull_request(api, repo; params=params, auth=auth)
     return result
 end
 
-function main(relative_path;
-              registry,
-              github_token = ENV["GITHUB_TOKEN"],
-              master_branch = "master",
-              pr_branch = "github_actions/remember_to_update_registryci",
-              pr_title = "Update RegistryCI.jl by updating the .ci/Manifest.toml file",
-              cc_usernames = String[],
-              my_username = "github-actions[bot]",
-              my_email = "41898282+github-actions[bot]@users.noreply.github.com")
+function main(
+    relative_path;
+    registry,
+    github_token=ENV["GITHUB_TOKEN"],
+    master_branch="master",
+    pr_branch="github_actions/remember_to_update_registryci",
+    pr_title="Update RegistryCI.jl by updating the .ci/Manifest.toml file",
+    cc_usernames=String[],
+    my_username="github-actions[bot]",
+    my_email="41898282+github-actions[bot]@users.noreply.github.com",
+)
     original_project = Base.active_project()
     original_directory = pwd()
     api = GitHubWebAPI(HTTP.URI("https://api.github.com"))
     tmp_dir = mktempdir()
-    atexit(() -> rm(tmp_dir; force = true, recursive = true))
+    atexit(() -> rm(tmp_dir; force=true, recursive=true))
     cd(tmp_dir)
 
     auth = GitHub.authenticate(api, github_token)
-    my_repo = GitHub.repo(api, registry; auth = auth)
+    my_repo = GitHub.repo(api, registry; auth=auth)
     registry_url_with_auth = "https://x-access-token:$(github_token)@github.com/$(registry)"
-    _all_open_prs = get_all_pull_requests(api, my_repo, "open"; auth = auth)
+    _all_open_prs = get_all_pull_requests(api, my_repo, "open"; auth=auth)
     _nonforked_prs = exclude_pull_requests_from_forks(my_repo, _all_open_prs)
-    pr_list = only_my_pull_requests(_nonforked_prs; my_username = my_username)
+    pr_list = only_my_pull_requests(_nonforked_prs; my_username=my_username)
     pr_titles = Vector{String}(undef, length(pr_list))
-    for i = 1:length(pr_list)
+    for i in 1:length(pr_list)
         pr_titles[i] = convert(String, strip(pr_list[i].title))::String
     end
 
@@ -187,7 +193,7 @@ function main(relative_path;
     end
     cd(relative_path)
     manifest_filename = joinpath(pwd(), "Manifest.toml")
-    rm(manifest_filename; force = true, recursive = true)
+    rm(manifest_filename; force=true, recursive=true)
     Pkg.activate(pwd())
     Pkg.instantiate()
     Pkg.update()
@@ -207,22 +213,29 @@ function main(relative_path;
         if pr_title in pr_titles
             @info("An open PR with the title already exists", pr_title)
         else
-            new_pr_body = strip(string("This pull request updates ",
-                                       "RegistryCI.jl by updating the ",
-                                       "`.ci/Manifest.toml` file.\n\n",
-                                       username_mentions_text))
+            new_pr_body = strip(
+                string(
+                    "This pull request updates ",
+                    "RegistryCI.jl by updating the ",
+                    "`.ci/Manifest.toml` file.\n\n",
+                    username_mentions_text,
+                ),
+            )
             _new_pr_body = convert(String, strip(new_pr_body))
-            create_new_pull_request(api, my_repo;
-                                    base_branch = master_branch,
-                                    head_branch = pr_branch,
-                                    title = pr_title,
-                                    body = _new_pr_body,
-                                    auth = auth)
+            create_new_pull_request(
+                api,
+                my_repo;
+                base_branch=master_branch,
+                head_branch=pr_branch,
+                title=pr_title,
+                body=_new_pr_body,
+                auth=auth,
+            )
         end
     end
 
     cd(original_directory)
-    rm(tmp_dir; force = true, recursive = true)
+    rm(tmp_dir; force=true, recursive=true)
     Pkg.activate(original_project)
     return commit_was_success
 end

docs/make.jl

@@ -24,7 +24,4 @@ makedocs(;
     strict=true,
 )
 
-deploydocs(;
-    repo="github.com/JuliaRegistries/RegistryCI.jl",
-    push_preview=false,
-)
+deploydocs(; repo="github.com/JuliaRegistries/RegistryCI.jl", push_preview=false)

src/AutoMerge/AutoMerge.jl

@@ -1,21 +1,21 @@
 module AutoMerge
 
-import Dates
+using Dates: Dates
 # import GitCommand
-import GitHub
-import HTTP
-import LibGit2
-import Pkg
-import TimeZones
-import JSON
-import VisualStringDistances
-import StringDistances
-import LicenseCheck
-import TOML
-import Printf
-import RegistryTools
-import ..RegistryCI
-import Tar
+using GitHub: GitHub
+using HTTP: HTTP
+using LibGit2: LibGit2
+using Pkg: Pkg
+using TimeZones: TimeZones
+using JSON: JSON
+using VisualStringDistances: VisualStringDistances
+using StringDistances: StringDistances
+using LicenseCheck: LicenseCheck
+using TOML: TOML
+using Printf: Printf
+using RegistryTools: RegistryTools
+using ..RegistryCI: RegistryCI
+using Tar: Tar
 
 include("types.jl")
 include("ciservice.jl")

src/AutoMerge/api_rate_limiting.jl

@@ -1,7 +1,4 @@
 function my_retry(f::Function)
-    delays = ExponentialBackOff(;
-        n = 10,
-        max_delay = 30.0,
-    )
-    return retry(f; delays = delays)()
+    delays = ExponentialBackOff(; n=10, max_delay=30.0)
+    return retry(f; delays=delays)()
 end

src/AutoMerge/automerge_comment.jl

@@ -1,5 +1,4 @@
-function update_automerge_comment!(data::GitHubAutoMergeData,
-                                   body::AbstractString)::Nothing
+function update_automerge_comment!(data::GitHubAutoMergeData, body::AbstractString)::Nothing
     if data.read_only
         @info "`read_only` mode; skipping updating automerge comment."
         return nothing
@@ -10,52 +9,42 @@ function update_automerge_comment!(data::GitHubAutoMergeData,
     auth = data.auth
     whoami = data.whoami
 
-    my_comments = my_retry(() -> get_all_my_pull_request_comments(api,
-                                                                  repo,
-                                                                  pr;
-                                                                  auth = auth,
-                                                                  whoami = whoami))
+    my_comments = my_retry(
+        () -> get_all_my_pull_request_comments(api, repo, pr; auth=auth, whoami=whoami)
+    )
     num_comments = length(my_comments)
-    _body = string(strip(string(body,
-                                "\n",
-                                "<!---\n",
-                                "this_is_the_single_automerge_comment\n",
-                                "--->\n")))
+    _body = string(
+        strip(
+            string(
+                body, "\n", "<!---\n", "this_is_the_single_automerge_comment\n", "--->\n"
+            ),
+        ),
+    )
     if num_comments > 1
-        for i = 2:num_comments
+        for i in 2:num_comments
             comment_to_delete = my_comments[i]
             try
-                my_retry(() -> delete_comment!(api, repo,
-                                               pr,
-                                               comment_to_delete;
-                                               auth = auth))
+                my_retry(() -> delete_comment!(api, repo, pr, comment_to_delete; auth=auth))
             catch ex
-                @error("Ignoring error: ", exception=(ex, catch_backtrace()))
+                @error("Ignoring error: ", exception = (ex, catch_backtrace()))
             end
         end
         comment_to_update = my_comments[1]
         if strip(comment_to_update.body) != _body
-            my_retry(() -> edit_comment!(api, repo,
-                                         pr,
-                                         comment_to_update,
-                                         _body;
-                                         auth = auth))
+            my_retry(
+                () -> edit_comment!(api, repo, pr, comment_to_update, _body; auth=auth)
+            )
         end
     elseif num_comments == 1
         comment_to_update = my_comments[1]
         if strip(comment_to_update.body) != _body
-            my_retry(() -> edit_comment!(api, repo,
-                                         pr,
-                                         comment_to_update,
-                                         _body;
-                                         auth = auth))
+            my_retry(
+                () -> edit_comment!(api, repo, pr, comment_to_update, _body; auth=auth)
+            )
         end
     else
         always_assert(num_comments < 1)
-        my_retry(() -> post_comment!(api, repo,
-                                     pr,
-                                     _body;
-                                     auth = auth))
+        my_retry(() -> post_comment!(api, repo, pr, _body; auth=auth))
     end
     return nothing
 end