Merge pull request #53 from davidanthoff/julia-0.7

Update to julia 0.7

Author: davidanthoff

.travis.yml

@@ -3,7 +3,8 @@ os:
   - osx
   - linux
 julia:
-  - 0.6
+  - 0.7
+  - nightly
 notifications:
   email: false
 branches:

NEWS.md

@@ -1,3 +1,6 @@
+# ExcelReaders.jl v0.10.0 Release Notes
+* Drop julia 0.6 support, add julia 0.7 support
+
 # ExcelReaders.jl v0.9.0 Release Notes
 * Drop support for DataFrames.
 * Use Dates.Time.

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.6
-DataValues
-PyCall 1.5
+julia 0.7-
+DataValues 0.4.1
+PyCall 1.17.1

appveyor.yml

@@ -1,19 +1,19 @@
 environment:
   matrix:
 # Releases
-  - 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/x86/0.7/julia-0.7-latest-win32.exe"
     PYTHONDIR: "C:\\Python36"
     PYTHON: "C:\\Python36\\python.exe"
 
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
     PYTHONDIR: "C:\\Python36-x64"
     PYTHON: "C:\\Python36-x64\\python.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/x86/0.7/julia-0.7-latest-win32.exe"
     PYTHONDIR: "use_conda"
     PYTHON: "use_conda"
 
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
     PYTHONDIR: "use_conda"
     PYTHON: "use_conda"
 

src/ExcelReaders.jl

@@ -2,7 +2,7 @@ __precompile__()
 
 module ExcelReaders
 
-using PyCall, DataValues
+using PyCall, DataValues, Dates
 
 export openxl, readxl, readxlsheet, ExcelErrorCell, ExcelFile, readxlnames, readxlrange
 
@@ -213,7 +213,7 @@ function get_cell_value(ws, row, col, wb)
         elseif celltype == xlrd[:XL_CELL_DATE]
             date_year,date_month,date_day,date_hour,date_minute,date_sec = xlrd[:xldate_as_tuple](cellval, wb[:datemode])
             if date_month==0
-                return Base.Dates.Time(date_hour, date_minute, date_sec)
+                return Time(date_hour, date_minute, date_sec)
             else
                 return DateTime(date_year, date_month, date_day, date_hour, date_minute, date_sec)
             end
@@ -235,7 +235,7 @@ function readxl_internal(file::ExcelFile, sheetname::AbstractString, startrow::I
         return get_cell_value(ws, startrow, startcol, wb)
     else
 
-        data = Array{Any}(endrow-startrow+1,endcol-startcol+1)
+        data = Array{Any}(undef,endrow-startrow+1,endcol-startcol+1)
 
         for row in startrow:endrow
             for col in startcol:endcol

test/runtests.jl

@@ -1,15 +1,16 @@
 using ExcelReaders
-using Base.Test
+using Dates
 using PyCall
 using DataValues
+using Test
 
 @testset "ExcelReaders" begin
 
 # TODO Throw julia specific exceptions for these errors
 @test_throws PyCall.PyError openxl("FileThatDoesNotExist.xlsx")
 @test_throws PyCall.PyError openxl("runtests.jl")
 
-filename = normpath(Pkg.dir("ExcelReaders"),"test", "TestData.xlsx")
+filename = normpath(@__DIR__, "TestData.xlsx")
 file = openxl(filename)
 @test file.filename == "TestData.xlsx"
 
@@ -39,7 +40,7 @@ for f in [file, filename]
     @test data[2,9] == Date(2015,3,3)
     @test data[3,9] == DateTime(2015,2,4,10,14)
     @test data[4,9] == DateTime(1988,4,9,0,0)
-    @test data[5,9] == Dates.Time(15,2,0)
+    @test data[5,9] == Time(15,2,0)
     @test data[3,10] == DateTime(1950,8,9,18,40)
     @test DataValues.isna(data[5,10])
     @test isa(data[2,11], ExcelErrorCell)
@@ -67,7 +68,7 @@ for f in [file, filename]
         @test data[2,1] == 1.
         @test data[5,2] == "CCC"
         @test data[3,3] == false
-        @test data[6,6] == Dates.Time(15,2,00)
+        @test data[6,6] == Time(15,2,00)
         @test DataValues.isna(data[4,3])
         @test DataValues.isna(data[4,6])
 
@@ -76,7 +77,7 @@ for f in [file, filename]
         @test data[2,1] == 1.
         @test data[5,2] == "CCC"
         @test data[3,3] == false
-        @test data[6,6] == Dates.Time(15,2,00)
+        @test data[6,6] == Time(15,2,00)
         @test DataValues.isna(data[4,3])
         @test DataValues.isna(data[4,6])
 
@@ -85,7 +86,7 @@ for f in [file, filename]
         @test data[2+7,1+3] == 1.
         @test data[5+7,2+3] == "CCC"
         @test data[3+7,3+3] == false
-        @test data[6+7,6+3] == Dates.Time(15,2,00)
+        @test data[6+7,6+3] == Time(15,2,00)
         @test DataValues.isna(data[4+7,3+3])
         @test DataValues.isna(data[4+7,6+3])
 
@@ -94,7 +95,7 @@ for f in [file, filename]
         @test data[2+7,1] == 1.
         @test data[5+7,2] == "CCC"
         @test data[3+7,3] == false
-        @test data[6+7,6] == Dates.Time(15,2,00)
+        @test data[6+7,6] == Time(15,2,00)
         @test DataValues.isna(data[4+7,3])
         @test DataValues.isna(data[4+7,6])
 
@@ -103,7 +104,7 @@ for f in [file, filename]
         @test data[2,1+3] == 1.
         @test data[5,2+3] == "CCC"
         @test data[3,3+3] == false
-        @test data[6,6+3] == Dates.Time(15,2,00)
+        @test data[6,6+3] == Time(15,2,00)
         @test DataValues.isna(data[4,3+3])
         @test DataValues.isna(data[4,6+3])
 
@@ -112,7 +113,7 @@ for f in [file, filename]
         @test data[2+6,1+2] == 1.
         @test data[5+6,2+2] == "CCC"
         @test data[3+6,3+2] == false
-        @test_throws BoundsError data[6+6,6+2] == Dates.Time(15,2,00)
+        @test_throws BoundsError data[6+6,6+2] == Time(15,2,00)
         @test DataValues.isna(data[4+6,2+2])
     end
 end