Skip to content

Commit

Permalink
Merge #440
Browse files Browse the repository at this point in the history
440: Adds changes to fix GitForge compat bump r=BaileyBox a=BaileyBox

Skipping 0.3 and going to 0.4 to ~~(hopefully)~~ fix the `datetime` changes between 0.3 and 0.4.1 found [here](https://github.com/JuliaRegistries/CompatHelper.jl/actions/runs/2862683110/jobs/4538934920#step:8:514).

Edit: After running `bors`, all the tests pass. Should be good to merge.

Co-authored-by: bailey.shirtliff <[email protected]>
  • Loading branch information
bors[bot] and bailey.shirtliff authored Oct 11, 2022
2 parents d5dc1f4 + f01151f commit d1bf4f8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "CompatHelper"
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
authors = ["Dilum Aluthge", "Brown Center for Biomedical Informatics", "contributors"]
version = "3.4.0"
version = "3.5.0"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand All @@ -16,7 +16,7 @@ TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[compat]
GitForge = "0.2.3"
GitForge = "0.4"
Mocking = "0.7"
MultilineStrings = "0.1"
TimeZones = "1"
Expand Down
2 changes: 1 addition & 1 deletion test/patches.jl
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ end
gl_gpr_patch = @patch function CompatHelper.get_pull_requests(
api::GitLab.GitLabAPI, repo::GitLab.Project, state::String
)
origin_repo = GitLab.Project(; id=1, fork=false)
origin_repo = GitLab.Project(; id=1)

pr_from_origin = GitLab.MergeRequest(;
project_id=1, author=GitLab.User(; username="foobar"), title="title"
Expand Down
6 changes: 3 additions & 3 deletions test/pull_requests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ end
end

@testset "GitLab" begin
origin_repo = GitLab.Project(; id=1, fork=false)
fork_repo = GitLab.Project(; id=2, fork=true)
origin_repo = GitLab.Project(; id=1)
fork_repo = GitLab.Project(; id=2)

pr_from_origin = GitLab.MergeRequest(;
id=1, project_id=1, author=GitLab.User(; username=username), title="PR A"
Expand Down Expand Up @@ -110,7 +110,7 @@ end
end

@testset "GitLab" begin
origin_repo = GitLab.Project(; id=1, fork=false)
origin_repo = GitLab.Project(; id=1)

pr_from_me = GitLab.MergeRequest(;
id=1, project_id=1, author=GitLab.User(; username=username), title="PR A"
Expand Down
10 changes: 7 additions & 3 deletions test/utilities/new_versions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,14 @@ end

@testset "unsub_from_pr" begin
@testset "GitHub" begin
@test_throws ErrorException(
"GitForge.GitHub.GitHubAPI has not implemented this function"
api = GitHub.GitHubAPI()
@test_throws GitForge.ForgeAPINotImplemented(
GitForge.unsubscribe_from_pull_request,
(1, 1),
true,
api
) CompatHelper.unsub_from_pr(
GitHub.GitHubAPI(), GitHub.PullRequest(; repo=GitHub.Repo(; id=1), id=1)
api, GitHub.PullRequest(; repo=GitHub.Repo(; id=1), id=1)
)
end

Expand Down

2 comments on commit d1bf4f8

@DilumAluthge
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/70030

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v3.5.0 -m "<description of version>" d1bf4f827823faa8c68c97f65bd4e66321153f03
git push origin v3.5.0

Please sign in to comment.