Skip to content

Commit

Permalink
Drop 0.4 support, fix a few depwarns (#67)
Browse files Browse the repository at this point in the history
* Drop 0.4 support, fix a few depwarns

* update CI versions

* Fix a few more deprecations

* fix invalid escape sequence on nightly
  • Loading branch information
tkelman authored and jrevels committed Jul 18, 2017
1 parent ef5e719 commit dc6d368
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
language: julia
julia:
- 0.4
- 0.5
- 0.6
- nightly
notifications:
email: false
sudo: false
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone(pwd()); Pkg.build("GitHub"); Pkg.test("GitHub"; coverage=true)';
#script:
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
# - julia -e 'Pkg.clone(pwd()); Pkg.build("GitHub"); Pkg.test("GitHub"; coverage=true)';
after_success:
- julia -e 'cd(Pkg.dir("GitHub")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
5 changes: 2 additions & 3 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
julia 0.4
julia 0.5

Compat 0.8.4
Compat 0.17
JSON
HttpServer
MbedTLS
Dates
HttpCommon
Requests
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"

Expand Down
2 changes: 1 addition & 1 deletion src/repositories/contents.jl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ end
function permalink(content::Content, commit)
url = string(get(content.html_url))
prefix = get(content.typ) == "file" ? "blob" : "tree"
rgx = Regex(string("\/", prefix, "\/.*?\/"))
rgx = Regex(string("/", prefix, "/.*?/"))
replacement = string("/", prefix, "/", name(commit), "/")
return HttpCommon.URI(replace(url, rgx, replacement))
end
Expand Down
4 changes: 2 additions & 2 deletions src/utils/GitHubType.jl
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
# - A GitHubType's field types should be Nullables of either concrete types, a
# Vectors of concrete types, or Dicts.

abstract GitHubType
@compat abstract type GitHubType end

typealias GitHubString Compat.UTF8String
const GitHubString = Compat.UTF8String

function @compat(Base.:(==))(a::GitHubType, b::GitHubType)
if typeof(a) != typeof(b)
Expand Down
2 changes: 1 addition & 1 deletion src/utils/auth.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Authorization Types #
#######################

abstract Authorization
@compat abstract type Authorization end

immutable OAuth2 <: Authorization
token::GitHubString
Expand Down
4 changes: 2 additions & 2 deletions test/ghtype_tests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ function test_show(g::GitHub.GitHubType)
show(tmpio, g)

# basically trivial, but proves that things aren't completely broken
@test repr(g) == takebuf_string(tmpio)
@test repr(g) == String(take!(tmpio))

tmpio = IOBuffer()
showcompact(tmpio, g)

@test "$(typeof(g))($(repr(name(g))))" == takebuf_string(tmpio)
@test "$(typeof(g))($(repr(name(g))))" == String(take!(tmpio))
end

#########
Expand Down

1 comment on commit dc6d368

@KristofferC
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should have removed pkg badge from README.md for 0.4?

Please sign in to comment.