Merge pull request #54 from queryverse/julia-0.7

Julia 0.7

Author: davidanthoff

.travis.yml

@@ -1,22 +1,22 @@
 language: julia
 os:
-  - osx
   - linux
+  - osx
 julia:
   - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false
 branches:
   only:
   - master
   - /release-.*/
-before_install:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-script:
-  - julia -e 'Pkg.clone(pwd())'
-  - julia -e 'ENV["PYTHON"]=""; Pkg.build("ExcelReaders")'
-  - julia --check-bounds=yes -e 'Pkg.test("ExcelReaders", coverage=true)'
+  - /v(\d+)\.(\d+)\.(\d+)/   
+matrix:
+  allow_failures:
+  - julia: nightly
+env:
+  - PYTHON=""
 after_success:
-  - julia -e 'cd(Pkg.dir("ExcelReaders")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
-  - julia -e 'cd(Pkg.dir("ExcelReaders")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder())'
+  - julia -e 'cd(Pkg.dir("IteratorInterfaceExtensions")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

NEWS.md

@@ -1,3 +1,6 @@
+# ExcelReaders.jl v0.10.1 Release Notes
+* Fix remaining julia 0.7/1.0 compat issues
+
 # ExcelReaders.jl v0.10.0 Release Notes
 * Drop julia 0.6 support, add julia 0.7 support
 

README.md

@@ -1,9 +1,9 @@
 # ExcelReaders
 
-[![Build Status](https://travis-ci.org/davidanthoff/ExcelReaders.jl.svg?branch=master)](https://travis-ci.org/davidanthoff/ExcelReaders.jl)
-[![Build status](https://ci.appveyor.com/api/projects/status/n8039pvotidkussq/branch/master?svg=true)](https://ci.appveyor.com/project/davidanthoff/excelreaders-jl/branch/master)
-[![Coverage Status](https://coveralls.io/repos/davidanthoff/ExcelReaders.jl/badge.svg)](https://coveralls.io/r/davidanthoff/ExcelReaders.jl)
-[![codecov](https://codecov.io/gh/davidanthoff/ExcelReaders.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/davidanthoff/ExcelReaders.jl)
+[![Build Status](https://travis-ci.org/queryverse/ExcelReaders.jl.svg?branch=master)](https://travis-ci.org/queryverse/ExcelReaders.jl)
+[![Build status](https://ci.appveyor.com/api/projects/status/v7b60gfrg65qkqt5/branch/master?svg=true)](https://ci.appveyor.com/project/queryverse/excelreaders-jl/branch/master)
+[![Coverage Status](https://coveralls.io/repos/queryverse/ExcelReaders.jl/badge.svg)](https://coveralls.io/r/queryverse/ExcelReaders.jl)
+[![codecov](https://codecov.io/gh/queryverse/ExcelReaders.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/queryverse/ExcelReaders.jl)
 [![ExcelReaders](http://pkg.julialang.org/badges/ExcelReaders_0.3.svg)](http://pkg.julialang.org/?pkg=ExcelReaders&ver=0.3)
 [![ExcelReaders](http://pkg.julialang.org/badges/ExcelReaders_0.4.svg)](http://pkg.julialang.org/?pkg=ExcelReaders&ver=0.4)
 [![ExcelReaders](http://pkg.julialang.org/badges/ExcelReaders_0.5.svg)](http://pkg.julialang.org/?pkg=ExcelReaders&ver=0.5)
@@ -12,12 +12,12 @@
 ExcelReaders is a package that provides functionality to read Excel files.
 
 **WARNING**: Version v0.9.0 removed all support for [DataFrames.jl](https://github.com/JuliaData/DataFrames.jl)
-from this package. The [ExcelFiles.jl](https://github.com/davidanthoff/ExcelFiles.jl)
+from this package. The [ExcelFiles.jl](https://github.com/queryverse/ExcelFiles.jl)
 package now provides functionality to read data from an Excel file into
 a ``DataFrame`` (or any other table type), and users are encouraged to use
 that package for tabular data going forward. Version v0.9.0 also no longer
 uses [DataArrays.jl](https://github.com/JuliaStats/DataArrays.jl), but instead
-is based on [DataValues.jl](https://github.com/davidanthoff/DataValues.jl).
+is based on [DataValues.jl](https://github.com/queryverse/DataValues.jl).
 
 ## Installation
 

REQUIRE

@@ -1,3 +1,3 @@
-julia 0.7-
-DataValues 0.4.1
-PyCall 1.17.1
+julia 0.7
+DataValues 0.4.4
+PyCall 1.18.2

appveyor.yml

@@ -1,49 +1,44 @@
+#    PYTHONDIR: "use_conda"
+#    PYTHON: "use_conda"
 environment:
   matrix:
-# Releases
-  - 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_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
 
-  - 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"
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
 
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
-    PYTHONDIR: "use_conda"
-    PYTHON: "use_conda"
+matrix:
+  allow_failures:
+  - julia_version: latest
 
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
-    PYTHONDIR: "use_conda"
-    PYTHON: "use_conda"
+branches:
+  only:
+    - master
+    - /release-.*/
+    - /v(\d+)\.(\d+)\.(\d+)/   
 
 notifications:
   - provider: Email
     on_build_success: false
     on_build_failure: false
     on_build_status_changed: false
 
-branches:
-  only:
-  - master
-  - /release-.*/
-
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Install and upate pip
-  - "SET PATH=%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"
-# Install xlrd
-  - python -m pip install xlrd
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
+
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo(); Pkg.clone(pwd(), \"ExcelReaders\"); Pkg.build(\"ExcelReaders\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"ExcelReaders\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"
+
+# # Uncomment to support code coverage upload. Should only be enabled for packages
+# # which would have coverage gaps without running on Windows
+# on_success:
+#   - echo "%JL_CODECOV_SCRIPT%"
+#   - C:\julia\bin\julia -e "%JL_CODECOV_SCRIPT%"

src/ExcelReaders.jl

@@ -1,5 +1,3 @@
-__precompile__()
-
 module ExcelReaders
 
 using PyCall, DataValues, Dates
@@ -227,7 +225,7 @@ function get_cell_value(ws, row, col, wb)
     end
 end
 
-function readxl_internal(file::ExcelFile, sheetname::AbstractString, startrow::Int, startcol::Int, endrow::Int, endcol::Int)
+function readxl_internal(file::ExcelFile, sheetname::AbstractString, startrow::Integer, startcol::Integer, endrow::Integer, endcol::Integer)
     wb = file.workbook
     ws = wb[:sheet_by_name](sheetname)