Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix deprecations, update for DataFrames 0.11 #38

Merged
merged 3 commits into from
Jan 27, 2018
Merged

Fix deprecations, update for DataFrames 0.11 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eff92c8
Fix deprecations
randyzwitch Jan 26, 2018
0ffcc90
Make AppVeyor versions match
randyzwitch Jan 26, 2018
a456f96
Update REQUIRE
randyzwitch Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions REQUIRE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
julia 0.6
JavaCall
DataFrames
DataArrays
JavaCall 0.5.2
DataFrames 0.11.5
DataArrays 0.7.0
8 changes: 3 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
JAVA_HOME: C:\Program Files\Java\jdk1.7.0\
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
JAVA_HOME: C:\Program Files\Java\jdk1.7.0\
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
JAVA_HOME: C:\Program Files\Java\jdk1.7.0\
#- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
# JAVA_HOME: C:\Program Files\Java\jdk1.7.0\

branches:
only:
Expand Down
2 changes: 0 additions & 2 deletions deps/build.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using Compat

tdeps = dirname(@__FILE__)
tika_jar = joinpath(tdeps, "tika-app-1.10.jar")
if !isfile(tika_jar)
Expand Down
8 changes: 4 additions & 4 deletions src/hssf.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ The `header` keyword argument should be set to `false` if no header is present i
Optional Arguments : similar to `Dataframes.readtable`.
```
header::Bool = true
nastrings::Vector = ASCIIString["", "NA"]
truestrings::Vector = ASCIIString["T", "t", "TRUE", "true"]
falsestrings::Vector = ASCIIString["F", "f", "FALSE", "false"]
nastrings::Vector = String["", "NA"]
truestrings::Vector = String["T", "t", "TRUE", "true"]
falsestrings::Vector = String["F", "f", "FALSE", "false"]
colnames::Vector = Symbol[]
coltypes::Vector{Any} = Any[]
skipstart::Int = 0
Expand Down Expand Up @@ -469,7 +469,7 @@ function writexl(filename::AbstractString, dfs::Vector{T}; headers=String[], she
r=createRow(s, headerlines+i)
for j=1:ncols
cellvalue = df[i,j]
if !any(isna(df[i,j]))
if !any(ismissing(df[i,j]))
if typeof(cellvalue) == Symbol
cellvalue = string(cellvalue)
end
Expand Down