Skip to content

Commit b09e316

Browse files
omusquinnj
authored andcommitted
Compatibility changes to support Julia 0.6 (#174)
* Avoid using `@isdefined` on Julia 0.6 Not supported in Compat: JuliaLang/Compat.jl#402 * Support Sys.is<os> on Julia 0.6 * Add Julia 0.6 to CI Note: Julia 0.5 was dropped from the CI as the REQUIRE file already specifies a minimum of Julia 0.6.
1 parent 831d820 commit b09e316

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ os:
1515
- linux
1616

1717
julia:
18-
- 0.5
18+
- 0.6
1919
- nightly
2020

2121
services:

REQUIRE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ DataFrames
44
CategoricalArrays 0.2
55
WeakRefStrings 0.3.0
66
DecFP 0.3.0
7-
Missings
7+
Missings
8+
Compat 0.27

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
3+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
4+
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
55
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
66
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
77

src/API.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Contents
2525
module API
2626

2727
using WeakRefStrings
28+
import Compat: @__MODULE__, Sys
2829

2930
if VERSION < v"0.7.0-DEV.2575"
3031
const Dates = Base.Dates

src/ODBC.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ __precompile__(true)
22
module ODBC
33

44
using DataStreams, Missings, CategoricalArrays, WeakRefStrings, DataFrames
5+
import Compat: Sys
56

67
export Data, DataFrame, odbcdf
78

@@ -199,4 +200,4 @@ function ODBCFreeStmt!(stmt)
199200
ODBC.API.SQLFreeStmt(stmt, ODBC.API.SQL_RESET_PARAMS)
200201
end
201202

202-
end #ODBC module
203+
end #ODBC module

src/types.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using DecFP, Missings, WeakRefStrings
33
# Link to ODBC Driver Manager (system-dependent)
44
let
55
global odbc_dm
6-
if !@isdefined odbc_dm
6+
if !isdefined(@__MODULE__, :odbc_dm)
77
Sys.islinux() && (lib_choices = ["libodbc", "libodbc.so", "libodbc.so.1", "libodbc.so.2", "libodbc.so.3"])
88
Sys.iswindows() && (lib_choices = ["odbc32"])
99
Sys.isapple() && (lib_choices = ["libodbc.2.dylib","libodbc.dylib","libiodbc","libiodbc.dylib","libiodbc.1.dylib","libiodbc.2.dylib","libiodbc.3.dylib"])

0 commit comments

Comments
 (0)