Update deprecations on master (JuliaInterop#121)

juliamatlab · Oct 15, 2017 · a35990f · a35990f
1 parent a1945a6
commit a35990f
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,2 +1,2 @@
 julia 0.6
-Compat 0.27.0
+Compat 0.33.0
diff --git a/src/MATLAB.jl b/src/MATLAB.jl
@@ -2,6 +2,7 @@ __precompile__()
 
 module MATLAB
 
+using Compat
 using Compat.Sys: islinux, iswindows, isapple
 
 import Base: eltype, close, size, copy, ndims, unsafe_convert

diff --git a/src/mxarray.jl b/src/mxarray.jl
@@ -278,7 +278,7 @@ function mxarray(a::Array{T}) where T<:MxComplexNum
 end
 
 mxarray(a::BitArray) = mxarray(convert(Array{Bool}, a))
-mxarray(a::Range) = mxarray([a;])
+mxarray(a::AbstractRange) = mxarray([a;])
 
 # sparse matrix
 

diff --git a/test/engine.jl b/test/engine.jl
@@ -1,5 +1,5 @@
 using MATLAB
-using Base.Test
+using Compat.Test
 
 # test engine
 

diff --git a/test/matfile.jl b/test/matfile.jl
@@ -1,5 +1,5 @@
 using MATLAB
-using Base.Test
+using Compat.Test
 
 # test MMAT file I/O
 fn = "$(tempname()).mat"

diff --git a/test/matstr.jl b/test/matstr.jl
@@ -1,5 +1,5 @@
 using MATLAB
-using Base.Test
+using Compat.Test
 
 @test mat"1" == 1
 @test mat"[1, 2, 3]" == [1 2 3]

diff --git a/test/mstatements.jl b/test/mstatements.jl
@@ -1,5 +1,5 @@
 using MATLAB
-using Base.Test
+using Compat.Test
 
 @test mstatement(:abc) == "abc"
 

diff --git a/test/mxarray.jl b/test/mxarray.jl
@@ -1,5 +1,5 @@
 using MATLAB
-using Base.Test
+using Compat.Test
 
 # Unit testing for MxArray
 
@@ -192,7 +192,7 @@ a_mx = mxarray(a)
 
 a2 = jsparse(a_mx)
 @test size(a2) == (8, 9)
-@test countnz(a2) == countnz(a)
+@test count(!iszero, a2) == count(!iszero, a)
 @test isequal(a2, a)
 delete(a_mx)
 
@@ -205,7 +205,7 @@ a_mx = mxarray(a)
 
 a2 = jsparse(a_mx)
 @test size(a2) == (8, 9)
-@test countnz(a2) == countnz(a)
+@test count(!iszero, a2) == count(!iszero, a)
 @test isequal(a2, a)
 delete(a_mx)
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,5 +1,5 @@
 using MATLAB
-using Base.Test
+using Compat.Test
 
 include("engine.jl")
 include("matfile.jl")