Merge pull request #328 from JuliaIO/tk/drop0.3

Drop Julia 0.3 support

Author: tkelman

.travis.yml

@@ -3,7 +3,6 @@ os:
     - linux
     - osx
 julia:
-    - 0.3
     - 0.4
     - 0.5
     - nightly

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.3.4
+julia 0.4
 BinDeps
 Blosc
 Compat 0.8.0

appveyor.yml

@@ -1,7 +1,5 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.3/julia-0.3-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.3/julia-0.3-latest-win64.exe"
   - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
   - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
   - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"

src/HDF5.jl

@@ -1,3 +1,3 @@
-VERSION >= v"0.4.0-dev+6521" && __precompile__()
+__precompile__()
 
 include("plain.jl")

src/datafile.jl

@@ -38,22 +38,11 @@ read(f::Base.Callable, parent::DataFile, name::String...) =
 	f(read(parent, name...)...)
 
 # Read every variable in the file
-if VERSION < v"0.4.0-dev+980"
-    function read(f::DataFile)
-        vars = names(f)
-        vals = Array(Any, length(vars))
-        for i = 1:length(vars)
-            vals[i] = read(f, vars[i])
-        end
-        Dict(vars, vals)
-    end
-else
-    function read(f::DataFile)
-        vars = names(f)
-        vals = Array(Any, length(vars))
-        for i = 1:length(vars)
-            vals[i] = read(f, vars[i])
-        end
-        Dict(zip(vars, vals))
+function read(f::DataFile)
+    vars = names(f)
+    vals = Array(Any, length(vars))
+    for i = 1:length(vars)
+        vals[i] = read(f, vars[i])
     end
+    Dict(zip(vars, vals))
 end

src/plain.jl

@@ -606,19 +606,17 @@ function h5open(f::Function, args...)
     end
 end
 
-if VERSION >= v"0.4"
-    function h5rewrite(f::Function, filename::AbstractString, args...)
-        tmppath,tmpio = mktemp(dirname(filename))
-        close(tmpio)
+function h5rewrite(f::Function, filename::AbstractString, args...)
+    tmppath,tmpio = mktemp(dirname(filename))
+    close(tmpio)
 
-        try
-            val = h5open(f, tmppath, "w", args...)
-            Compat.Filesystem.rename(tmppath, filename)
-            return val
-        catch
-            Compat.Filesystem.unlink(tmppath)
-            rethrow()
-        end
+    try
+        val = h5open(f, tmppath, "w", args...)
+        Compat.Filesystem.rename(tmppath, filename)
+        return val
+    catch
+        Compat.Filesystem.unlink(tmppath)
+        rethrow()
     end
 end
 
@@ -1883,10 +1881,6 @@ function h5d_write{T<:HDF5BitsKind}(dataset_id::Hid, memtype_id::Hid, x::T)
     tmp[1] = x
     h5d_write(dataset_id, memtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp)
 end
-if VERSION < v"0.4.0"
-    # Restricted version on 0.3 for the use in `h5d_write` below.
-    isassigned(ary, i) = isdefined(ary, i)
-end
 function h5d_write{S<:String}(dataset_id::Hid, memtype_id::Hid, strs::Array{S})
     len = length(strs)
     p = Array(Ptr{UInt8}, size(strs))
@@ -2375,11 +2369,7 @@ export
     @write
 
 # Define globally because JLD uses this, too
-if VERSION < v"0.4.0-dev+2014"
-    const rehash! = Base.rehash
-else
-    const rehash! = Base.rehash!
-end
+const rehash! = Base.rehash!
 
 # Across initializations of the library, the id of various properties
 # will change. So don't hard-code the id (important for precompilation)

test/plain.jl

@@ -251,49 +251,47 @@ close(g)
 close(fid)
 
 # more do syntax: atomic rename version
-if VERSION >= v"0.4"
-    tmpdir = mktempdir()
-    outfile = joinpath(tmpdir, "test.h5")
+tmpdir = mktempdir()
+outfile = joinpath(tmpdir, "test.h5")
 
-    # create a new file
-    h5rewrite(outfile) do fid
-        g_create(fid, "mygroup") do g
-            write(g, "x", 3.3)
-        end
-    end
-    @test length(readdir(tmpdir)) == 1
-    h5open(outfile, "r") do fid
-        @test names(fid) == Compat.ASCIIString["mygroup"]
-        @test names(fid["mygroup"]) == Compat.ASCIIString["x"]
+# create a new file
+h5rewrite(outfile) do fid
+    g_create(fid, "mygroup") do g
+        write(g, "x", 3.3)
     end
+end
+@test length(readdir(tmpdir)) == 1
+h5open(outfile, "r") do fid
+    @test names(fid) == Compat.ASCIIString["mygroup"]
+    @test names(fid["mygroup"]) == Compat.ASCIIString["x"]
+end
 
-    # fail to overwrite
-    @test_throws ErrorException h5rewrite(outfile) do fid
-        g_create(fid, "mygroup") do g
-            write(g, "oops", 3.3)
-        end
-        error("failed")
-    end
-    @test length(readdir(tmpdir)) == 1
-    h5open(outfile, "r") do fid
-        @test names(fid) == Compat.ASCIIString["mygroup"]
-        @test names(fid["mygroup"]) == Compat.ASCIIString["x"]
+# fail to overwrite
+@test_throws ErrorException h5rewrite(outfile) do fid
+    g_create(fid, "mygroup") do g
+        write(g, "oops", 3.3)
     end
+    error("failed")
+end
+@test length(readdir(tmpdir)) == 1
+h5open(outfile, "r") do fid
+    @test names(fid) == Compat.ASCIIString["mygroup"]
+    @test names(fid["mygroup"]) == Compat.ASCIIString["x"]
+end
 
-    # overwrite
-    h5rewrite(outfile) do fid
-        g_create(fid, "mygroup") do g
-            write(g, "y", 3.3)
-        end
-    end
-    @test length(readdir(tmpdir)) == 1
-    h5open(outfile, "r") do fid
-        @test names(fid) == Compat.ASCIIString["mygroup"]
-        @test names(fid["mygroup"]) == Compat.ASCIIString["y"]
+# overwrite
+h5rewrite(outfile) do fid
+    g_create(fid, "mygroup") do g
+        write(g, "y", 3.3)
     end
-
-    rm(tmpdir, recursive=true)
 end
+@test length(readdir(tmpdir)) == 1
+h5open(outfile, "r") do fid
+    @test names(fid) == Compat.ASCIIString["mygroup"]
+    @test names(fid["mygroup"]) == Compat.ASCIIString["y"]
+end
+
+rm(tmpdir, recursive=true)
 
 d = h5read(joinpath(test_path, "compound.h5"), "/data")
 @assert typeof(d) == HDF5.HDF5Compound