Skip to content

Commit d69c286

Browse files
authored
Merge pull request #104 from JuliaIO/tk/drop0.4
Drop Julia 0.4 support
2 parents 52363f9 + 62804df commit d69c286

File tree

7 files changed

+8
-25
lines changed

7 files changed

+8
-25
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ os:
33
- linux
44
- osx
55
julia:
6-
- 0.4
76
- 0.5
87
- nightly
98
notifications:
109
email: false
11-
script:
12-
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
13-
- julia -e 'Pkg.clone(pwd()); Pkg.build("FileIO"); Pkg.test("FileIO"; coverage=true)'
10+
#script: # default script is equivalent to the following
11+
# - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
12+
# - julia -e 'Pkg.clone(pwd()); Pkg.build("FileIO"); Pkg.test("FileIO"; coverage=true)'
1413
after_success:
1514
- julia -e 'cd(Pkg.dir("FileIO")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
julia 0.4
1+
julia 0.5
22
Compat 0.9.5

appveyor.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
environment:
22
matrix:
3-
- JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
4-
- JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
53
- JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
64
- JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
75
- JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
@@ -13,7 +11,6 @@ branches:
1311
- /release-.*/
1412
install:
1513
# Download most recent Julia Windows binary
16-
1714
- ps: (new-object net.webclient).DownloadFile(
1815
$("http://s3.amazonaws.com/"+$env:JULIAVERSION),
1916
"C:\projects\julia-binary.exe")
@@ -23,7 +20,7 @@ install:
2320
build_script:
2421
# Need to convert from shallow to complete for Pkg.clone to work
2522
# - git fetch --unshallow
26-
- C:\projects\julia\bin\julia-debug -e "versioninfo(); Pkg.init(); Pkg.clone(pwd(), \"FileIO\")"
23+
- C:\projects\julia\bin\julia -e "versioninfo(); Pkg.init(); Pkg.clone(pwd(), \"FileIO\")"
2724

2825
test_script:
29-
- C:\projects\julia\bin\julia-debug -e "Pkg.test(\"FileIO\")"
26+
- C:\projects\julia\bin\julia -e "Pkg.test(\"FileIO\")"

src/FileIO.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION >= v"0.4.0-dev+6641" && __precompile__()
1+
__precompile__()
22

33
module FileIO
44
using Compat

src/query.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,6 @@ Base.readbytes!(s::Stream, b, nb) = readbytes!(stream(s), b, nb)
307307
Base.read(s::Stream) = read(stream(s))
308308
Base.read(s::Stream, nb) = read(stream(s), nb)
309309
Base.flush(s::Stream) = flush(stream(s))
310-
# 0.4 compat
311-
if isdefined(Base, :readbytes)
312-
Base.readbytes(s::Stream) = read(stream(s))
313-
Base.readbytes(s::Stream, nb) = read(stream(s), nb)
314-
end
315310

316311
Base.isreadonly(s::Stream) = isreadonly(stream(s))
317312
Base.isopen(s::Stream) = isopen(stream(s))

test/error_handling.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@ println("these tests will print warnings: ")
99
rserr, wrerr = redirect_stderr()
1010
ref = @async save("test.not_installed")
1111
println(wr, "y")
12-
if VERSION < v"0.4.0-dev"
13-
@test_throws ErrorException wait(ref) #("unknown package NotInstalled")
14-
else
15-
@test_throws CompositeException wait(ref) #("unknown package NotInstalled")
16-
end
12+
@test_throws CompositeException wait(ref) #("unknown package NotInstalled")
1713
ref = @async save("test.not_installed")
1814
println(wr, "invalid") #test invalid input
1915
println(wr, "n") # don't install

test/query.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ end
88
using Compat
99
import Compat.String
1010

11-
if VERSION < v"0.4.0-dev"
12-
import FileIO.Pair
13-
end
14-
1511
@testset "OS" begin
1612
if is_linux()
1713
@test FileIO.applies_to_os(FileIO.Linux)

0 commit comments

Comments
 (0)