remove compat for julia v0.6 (#24)

JuliaOpt · Feb 11, 2020 · 4009223 · 4009223
1 parent 7bc69e8
commit 4009223
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 27 deletions.
diff --git a/src/ConicBenchmarkUtilities.jl b/src/ConicBenchmarkUtilities.jl
@@ -1,22 +1,14 @@
-__precompile__()
-
 module ConicBenchmarkUtilities
 
 using GZip
 
-if VERSION < v"0.7.0-"
-    import Compat: undef
-    import Compat: @warn
-end
+using SparseArrays
+using LinearAlgebra
 
-if VERSION > v"0.7.0-"
-    using SparseArrays
-    using LinearAlgebra
-    # this is required because findall return type changed in v0.7
-    function SparseArrays.findnz(A::AbstractMatrix)
-        I = findall(!iszero, A)
-        return (getindex.(I, 1), getindex.(I, 2), A[I])
-    end
+# this is required because findnz does not support arrays by default in julia v1
+function SparseArrays.findnz(A::AbstractMatrix)
+    I = findall(!iszero, A)
+    return (getindex.(I, 1), getindex.(I, 2), A[I])
 end
 
 export readcbfdata, cbftompb, mpbtocbf, writecbfdata

diff --git a/test/REQUIRE b/test/REQUIRE
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -2,16 +2,10 @@ using ECOS, SCS, MathProgBase
 import JuMP
 using ConicBenchmarkUtilities
 
-if VERSION < v"0.7.0-"
-    using Base.Test
-    import Compat: det
-end
+using Test
+using SparseArrays
+using LinearAlgebra
 
-if VERSION > v"0.7.0-"
-    using Test
-    using SparseArrays
-    using LinearAlgebra
-end
 
 @testset "ConicBenchmarkUtilities Tests" begin