From 87b11a23bb15dd18fb429d30e120fab5ebde0fe1 Mon Sep 17 00:00:00 2001 From: Kristoffer Carlsson Date: Mon, 16 Apr 2018 10:40:38 +0200 Subject: [PATCH] fix some deprecation warnings, 0.7 compatibility and test on mac --- .travis.yml | 3 +++ REQUIRE | 2 +- src/activity/events.jl | 4 ++-- src/git/reference.jl | 4 ++-- src/utils/GitHubType.jl | 42 ++++++++++++++++++------------------- src/utils/requests.jl | 2 +- test/commit_comment.jl | 2 ++ test/event_tests.jl | 2 +- test/ghtype_tests.jl | 6 +++--- test/read_only_api_tests.jl | 2 +- 10 files changed, 37 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23b7583..eda2418 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,7 @@ language: julia +os: + - linux + - osx julia: - 0.6 - nightly diff --git a/REQUIRE b/REQUIRE index a6c6a02..84265b6 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,6 +1,6 @@ julia 0.6 -Compat 0.43 +Compat 0.62 JSON MbedTLS HTTP 0.6.3 diff --git a/src/activity/events.jl b/src/activity/events.jl index dd08ca7..89b0096 100644 --- a/src/activity/events.jl +++ b/src/activity/events.jl @@ -43,7 +43,7 @@ sig_header(request::HTTP.Request) = HTTP.header(request, "X-Hub-Signature") function has_valid_secret(request::HTTP.Request, secret) if has_sig_header(request) - secret_sha = "sha1="*bytes2hex(MbedTLS.digest(MbedTLS.MD_SHA1, HTTP.payload(request, String), secret)) + secret_sha = "sha1="*bytes2hex(MbedTLS.digest(MbedTLS.MD_SHA1, HTTP.payload(request), secret)) return sig_header(request) == secret_sha end return false @@ -97,7 +97,7 @@ function handle_event_request(request, handle; return HTTP.Response(204, "event ignored") end - event = event_from_payload!(event_header(request), JSON.parse(HTTP.payload(request, String))) + event = event_from_payload!(event_header(request), JSON.parse(IOBuffer(HTTP.payload(request)))) if !(isa(repos, Nothing)) && !(from_valid_repo(event, repos)) return HTTP.Response(400, "invalid repo") diff --git a/src/git/reference.jl b/src/git/reference.jl index df4a682..35ece37 100644 --- a/src/git/reference.jl +++ b/src/git/reference.jl @@ -10,12 +10,12 @@ name(ref::Reference) = String(split(get(ref.ref), "refs/")[2]) @api_default function reference(api::GitHubAPI, repo, ref_obj; options...) result = gh_get_json(api, "/repos/$(name(repo))/git/refs/$(name(ref_obj))"; options...) - return Reference.(result) + return Reference(result) end @api_default function references(api::GitHubAPI, repo; options...) results, page_data = gh_get_paged_json(api, "/repos/$(name(repo))/git/refs"; options...) - return Reference.(results), page_data + return Reference.((results,)), page_data end @api_default function create_reference(api::GitHubAPI, repo; options...) diff --git a/src/utils/GitHubType.jl b/src/utils/GitHubType.jl index 855462b..8a417dc 100644 --- a/src/utils/GitHubType.jl +++ b/src/utils/GitHubType.jl @@ -82,7 +82,7 @@ end @generated function json2github(::Type{G}, data::Dict) where {G<:GitHubType} types = G.types fields = fieldnames(G) - args = Vector{Expr}(length(fields)) + args = Vector{Expr}(undef, length(fields)) for i in eachindex(fields) field, T = fields[i], first(types[i].parameters) key = field == :typ ? "type" : string(field) @@ -125,27 +125,27 @@ end ################### function Base.show(io::IO, g::GitHubType) - print(io, "$(typeof(g)) (all fields are Nullable):") - for field in fieldnames(typeof(g)) - val = getfield(g, field) - if !(isnull(val)) - gotval = get(val) - println(io) - print(io, " $field: ") - if isa(gotval, Vector) - print(io, typeof(gotval)) - else - showcompact(io, gotval) - end + if get(io, :compact, false) + uri_id = namefield(g) + if isnull(uri_id) + print(io, typeof(g), "(…)") + else + print(io, typeof(g), "($(repr(get(uri_id))))") end - end -end - -function Base.showcompact(io::IO, g::GitHubType) - uri_id = namefield(g) - if isnull(uri_id) - print(io, typeof(g), "(…)") else - print(io, typeof(g), "($(repr(get(uri_id))))") + print(io, "$(typeof(g)) (all fields are Nullable):") + for field in fieldnames(typeof(g)) + val = getfield(g, field) + if !(isnull(val)) + gotval = get(val) + println(io) + print(io, " $field: ") + if isa(gotval, Vector) + print(io, typeof(gotval)) + else + show(IOContext(io, :compact => true), gotval) + end + end + end end end diff --git a/src/utils/requests.jl b/src/utils/requests.jl index 10b3b1b..fd067da 100644 --- a/src/utils/requests.jl +++ b/src/utils/requests.jl @@ -92,7 +92,7 @@ get_page_links(r) = split(HTTP.header(r, "Link",), ",") function find_page_link(links, rel) relstr = "rel=\"$(rel)\"" for i in 1:length(links) - if contains(links[i], relstr) + if occursin(relstr, links[i]) return i end end diff --git a/test/commit_comment.jl b/test/commit_comment.jl index 94268a2..41807a7 100644 --- a/test/commit_comment.jl +++ b/test/commit_comment.jl @@ -1,3 +1,5 @@ +using Compat.Base64 + function create_event() data_base64 = "{"action":"created","comment":{"url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/comments/14047058","html_url":"https://github.com/JuliaCI/BenchmarkTrackers.jl/commit/32d35f285777b077d8b6a2521309d1ab646d2379#commitcomment-14047058","id":14047058,"user":{"login":"jrevels","id":3277443,"avatar_url":"https://avatars.githubusercontent.com/u/3277443?v=3","gravatar_id":"","url":"https://api.github.com/users/jrevels","html_url":"https://github.com/jrevels","followers_url":"https://api.github.com/users/jrevels/followers","following_url":"https://api.github.com/users/jrevels/following{/other_user}","gists_url":"https://api.github.com/users/jrevels/gists{/gist_id}","starred_url":"https://api.github.com/users/jrevels/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jrevels/subscriptions","organizations_url":"https://api.github.com/users/jrevels/orgs","repos_url":"https://api.github.com/users/jrevels/repos","events_url":"https://api.github.com/users/jrevels/events{/privacy}","received_events_url":"https://api.github.com/users/jrevels/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"32d35f285777b077d8b6a2521309d1ab646d2379","created_at":"2015-10-28T17:56:49Z","updated_at":"2015-10-28T17:56:49Z","body":"`RunBenchmarks(\"binary\", \"unary\")`"},"repository":{"id":44189107,"name":"BenchmarkTrackers.jl","full_name":"JuliaCI/BenchmarkTrackers.jl","owner":{"login":"JuliaCI","id":9957604,"avatar_url":"https://avatars.githubusercontent.com/u/9957604?v=3","gravatar_id":"","url":"https://api.github.com/users/JuliaCI","html_url":"https://github.com/JuliaCI","followers_url":"https://api.github.com/users/JuliaCI/followers","following_url":"https://api.github.com/users/JuliaCI/following{/other_user}","gists_url":"https://api.github.com/users/JuliaCI/gists{/gist_id}","starred_url":"https://api.github.com/users/JuliaCI/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JuliaCI/subscriptions","organizations_url":"https://api.github.com/users/JuliaCI/orgs","repos_url":"https://api.github.com/users/JuliaCI/repos","events_url":"https://api.github.com/users/JuliaCI/events{/privacy}","received_events_url":"https://api.github.com/users/JuliaCI/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/JuliaCI/BenchmarkTrackers.jl","description":"Track a Julia package's benchmark results as part of CI","fork":false,"url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl","forks_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/forks","keys_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/keys{/key_id}","collaborators_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/teams","hooks_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/hooks","issue_events_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/issues/events{/number}","events_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/events","assignees_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/assignees{/user}","branches_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/branches{/branch}","tags_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/tags","blobs_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/git/refs{/sha}","trees_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/git/trees{/sha}","statuses_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/statuses/{sha}","languages_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/languages","stargazers_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/stargazers","contributors_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/contributors","subscribers_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/subscribers","subscription_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/subscription","commits_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/commits{/sha}","git_commits_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/git/commits{/sha}","comments_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/comments{/number}","issue_comment_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/issues/comments{/number}","contents_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/contents/{+path}","compare_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/compare/{base}...{head}","merges_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/merges","archive_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/downloads","issues_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/issues{/number}","pulls_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/pulls{/number}","milestones_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/milestones{/number}","notifications_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/labels{/name}","releases_url":"https://api.github.com/repos/JuliaCI/BenchmarkTrackers.jl/releases{/id}","created_at":"2015-10-13T16:17:04Z","updated_at":"2015-10-22T14:45:04Z","pushed_at":"2015-10-28T17:52:36Z","git_url":"git://github.com/JuliaCI/BenchmarkTrackers.jl.git","ssh_url":"git@github.com:JuliaCI/BenchmarkTrackers.jl.git","clone_url":"https://github.com/JuliaCI/BenchmarkTrackers.jl.git","svn_url":"https://github.com/JuliaCI/BenchmarkTrackers.jl","homepage":null,"size":397,"stargazers_count":1,"watchers_count":1,"language":"Julia","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":1,"forks":1,"open_issues":1,"watchers":1,"default_branch":"master"},"organization":{"login":"JuliaCI","id":9957604,"url":"https://api.github.com/orgs/JuliaCI","repos_url":"https://api.github.com/orgs/JuliaCI/repos","events_url":"https://api.github.com/orgs/JuliaCI/events","members_url":"https://api.github.com/orgs/JuliaCI/members{/member}","public_members_url":"https://api.github.com/orgs/JuliaCI/public_members{/member}","avatar_url":"https://avatars.githubusercontent.com/u/9957604?v=3","description":"Continous Integration (CI) Support for the Julia Language"},"sender":{"login":"jrevels","id":3277443,"avatar_url":"https://avatars.githubusercontent.com/u/3277443?v=3","gravatar_id":"","url":"https://api.github.com/users/jrevels","html_url":"https://github.com/jrevels","followers_url":"https://api.github.com/users/jrevels/followers","following_url":"https://api.github.com/users/jrevels/following{/other_user}","gists_url":"https://api.github.com/users/jrevels/gists{/gist_id}","starred_url":"https://api.github.com/users/jrevels/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jrevels/subscriptions","organizations_url":"https://api.github.com/users/jrevels/orgs","repos_url":"https://api.github.com/users/jrevels/repos","events_url":"https://api.github.com/users/jrevels/events{/privacy}","received_events_url":"https://api.github.com/users/jrevels/received_events","type":"User","site_admin":false}}" diff --git a/test/event_tests.jl b/test/event_tests.jl index 3b118bb..603f883 100644 --- a/test/event_tests.jl +++ b/test/event_tests.jl @@ -1,6 +1,6 @@ include("commit_comment.jl") event_request = create_event() -event_json = JSON.parse(HTTP.payload(event_request, String)) +event_json = JSON.parse(IOBuffer(HTTP.payload(event_request))) event = GitHub.event_from_payload!("commit_comment", event_json) @testset "WebhookEvent" begin diff --git a/test/ghtype_tests.jl b/test/ghtype_tests.jl index abe728c..f4fa964 100644 --- a/test/ghtype_tests.jl +++ b/test/ghtype_tests.jl @@ -12,7 +12,7 @@ function test_show(g::GitHub.GitHubType) @test repr(g) == String(take!(tmpio)) tmpio = IOBuffer() - showcompact(tmpio, g) + show(IOContext(tmpio, :compact => true), g) @test "$(typeof(g))($(repr(name(g))))" == String(take!(tmpio)) end @@ -540,7 +540,7 @@ end test_show(hook_result) end - + @testset "Gist" begin gist_json = JSON.parse(""" { @@ -734,7 +734,7 @@ end "updated_at": "2017-07-08T16:18:44" } """) - + app_result = App(app_json) @test name(app_result) == Int(app_json["id"]) end diff --git a/test/read_only_api_tests.jl b/test/read_only_api_tests.jl index 8cc4850..78c7480 100644 --- a/test/read_only_api_tests.jl +++ b/test/read_only_api_tests.jl @@ -189,7 +189,7 @@ end @test entry["type"] == "blob" b = blob(github_jl, entry["sha"]; auth=auth) - @test contains(String(base64decode(replace(get(b.content),"\n" => ""))), "GitHub.jl") + @test occursin("GitHub.jl", String(base64decode(replace(get(b.content),"\n" => "")))) break end