Skip to content

Commit fd3a28f

Browse files
committed
Drop 0.6 support
1 parent 9ef57a5 commit fd3a28f

File tree

12 files changed

+21
-29
lines changed

12 files changed

+21
-29
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,10 @@ Text inside the `mat""` custom string literal is in MATLAB syntax. Variables fro
242242
```julia
243243
using MATLAB
244244

245-
x = linspace(-10., 10., 500)
245+
x = range(-10.0, stop=10.0, length=500)
246246
mat"plot($x, sin($x))" # evaluate a MATLAB function
247247

248-
y = linspace(2., 3., 500)
248+
y = range(2.0, stop=3.0, length=500)
249249
mat"""
250250
$u = $x + $y
251251
$v = $x - $y

REQUIRE

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
julia 0.6
2-
Compat 0.62.0
1+
julia 0.7

src/MATLAB.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
__precompile__()
2-
31
module MATLAB
42

5-
using Compat
6-
using Compat.Sys: islinux, iswindows, isapple
7-
using Compat.Libdl
8-
using Compat.SparseArrays
3+
using Base.Sys: islinux, iswindows, isapple
4+
using Libdl
5+
using SparseArrays
96

107
import Base: eltype, close, size, copy, ndims, unsafe_convert
118

src/engine.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ mutable struct MSession
1818
function MSession(bufsize::Integer = default_output_buffer_size)
1919
ep = ccall(eng_open[], Ptr{Cvoid}, (Ptr{UInt8},), default_startcmd)
2020
if ep == C_NULL
21-
Base.warn_once("Confirm MATLAB is installed and discoverable.")
21+
@warn "Confirm MATLAB is installed and discoverable."
2222
if iswindows()
23-
Base.warn_once("Ensure `matlab -regserver` has been run in a Command Prompt as Administrator.")
23+
@warn "Ensure `matlab -regserver` has been run in a Command Prompt as Administrator."
2424
elseif islinux()
25-
Base.warn_once("Ensure `csh` is installed; this may require running `sudo apt-get install csh`.")
25+
@warn "Ensure `csh` is installed; this may require running `sudo apt-get install csh`."
2626
end
2727
throw(MEngineError("failed to open MATLAB engine session"))
2828
end
@@ -42,7 +42,7 @@ mutable struct MSession
4242
end
4343

4444
self = new(ep, buf, bufptr)
45-
@compat finalizer(release, self)
45+
finalizer(release, self)
4646
return self
4747
end
4848
end

src/matfile.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ mutable struct MatFile
77
function MatFile(filename::String, mode::String)
88
p = ccall(mat_open[], Ptr{Cvoid}, (Ptr{Cchar}, Ptr{Cchar}), filename, mode)
99
self = new(p, filename)
10-
@compat finalizer(release, self)
10+
finalizer(release, self)
1111
return self
1212
end
1313
end

src/mxarray.jl

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mutable struct MxArray
88
p == C_NULL && error("NULL pointer for MxArray.")
99
self = new(p, own)
1010
if own
11-
@compat finalizer(release, self)
11+
finalizer(release, self)
1212
end
1313
return self
1414
end
@@ -294,9 +294,7 @@ function mxsparse(ty::Type{Bool}, m::Integer, n::Integer, nzmax::Integer)
294294
MxArray(pm)
295295
end
296296

297-
function _copy_sparse_mat(a::SparseMatrixCSC{V,I},
298-
ir_p::Ptr{mwIndex}, jc_p::Ptr{mwIndex}, pr_p::Ptr{V}) where {V,I}
299-
297+
function _copy_sparse_mat(a::SparseMatrixCSC{V,I}, ir_p::Ptr{mwIndex}, jc_p::Ptr{mwIndex}, pr_p::Ptr{V}) where {V,I}
300298
colptr::Vector{I} = a.colptr
301299
rinds::Vector{I} = a.rowval
302300
v::Vector{V} = a.nzval
@@ -473,7 +471,7 @@ function mxstructarray(d::Array{T}) where T
473471
return mx
474472
end
475473

476-
mxstruct(d::Compat.AbstractDict) = mxstruct(collect(d)...)
474+
mxstruct(d::AbstractDict) = mxstruct(collect(d)...)
477475
mxarray(d) = mxstruct(d)
478476

479477

test/engine.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using MATLAB
2-
using Compat.Test
3-
using Compat.SparseArrays
2+
using Test
3+
using SparseArrays
44

55
# test engine
66

test/matfile.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using MATLAB
2-
using Compat.Test
3-
using Compat.GC
2+
using Test
43

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

test/matstr.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Compat.Test
2+
using Test
33

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

test/mstatements.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using MATLAB
2-
using Compat.Test
2+
using Test
33

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

0 commit comments

Comments
 (0)