Skip to content

Commit a35990f

Browse files
authored
Update deprecations on master (#121)
1 parent a1945a6 commit a35990f

9 files changed

+11
-10
lines changed

REQUIRE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
julia 0.6
2-
Compat 0.27.0
2+
Compat 0.33.0

src/MATLAB.jl

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ __precompile__()
22

33
module MATLAB
44

5+
using Compat
56
using Compat.Sys: islinux, iswindows, isapple
67

78
import Base: eltype, close, size, copy, ndims, unsafe_convert

src/mxarray.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ function mxarray(a::Array{T}) where T<:MxComplexNum
278278
end
279279

280280
mxarray(a::BitArray) = mxarray(convert(Array{Bool}, a))
281-
mxarray(a::Range) = mxarray([a;])
281+
mxarray(a::AbstractRange) = mxarray([a;])
282282

283283
# sparse matrix
284284

test/engine.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Base.Test
2+
using Compat.Test
33

44
# test engine
55

test/matfile.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Base.Test
2+
using Compat.Test
33

44
# test MMAT file I/O
55
fn = "$(tempname()).mat"

test/matstr.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Base.Test
2+
using Compat.Test
33

44
@test mat"1" == 1
55
@test mat"[1, 2, 3]" == [1 2 3]

test/mstatements.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Base.Test
2+
using Compat.Test
33

44
@test mstatement(:abc) == "abc"
55

test/mxarray.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Base.Test
2+
using Compat.Test
33

44
# Unit testing for MxArray
55

@@ -192,7 +192,7 @@ a_mx = mxarray(a)
192192

193193
a2 = jsparse(a_mx)
194194
@test size(a2) == (8, 9)
195-
@test countnz(a2) == countnz(a)
195+
@test count(!iszero, a2) == count(!iszero, a)
196196
@test isequal(a2, a)
197197
delete(a_mx)
198198

@@ -205,7 +205,7 @@ a_mx = mxarray(a)
205205

206206
a2 = jsparse(a_mx)
207207
@test size(a2) == (8, 9)
208-
@test countnz(a2) == countnz(a)
208+
@test count(!iszero, a2) == count(!iszero, a)
209209
@test isequal(a2, a)
210210
delete(a_mx)
211211

test/runtests.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Base.Test
2+
using Compat.Test
33

44
include("engine.jl")
55
include("matfile.jl")

0 commit comments

Comments
 (0)