remove the need for Compat (#239)

JuliaOpt · Feb 10, 2020 · 094eddc · 094eddc · ccoffrin · Feb 15, 2020
1 parent 369d777
commit 094eddc
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 30 deletions.
diff --git a/Project.toml b/Project.toml
@@ -4,16 +4,17 @@ repo = "https://github.com/JuliaOpt/MathProgBase.jl.git"
 version = "0.7.8"
 
 [deps]
-Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [compat]
-Compat = "~0, ~1, ~2"
 julia = "1"
 
 [extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199"
 GLPKMathProgInterface = "3c7084bd-78ad-589a-b5bb-dbd673274bea"
 Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
 
 [targets]
-test = ["GLPKMathProgInterface", "ECOS", "Ipopt"]
+test = ["Test", "GLPKMathProgInterface", "ECOS", "Ipopt"]
diff --git a/src/HighLevelInterface/HighLevelInterface.jl b/src/HighLevelInterface/HighLevelInterface.jl
@@ -2,11 +2,10 @@ module HighLevelInterface
 
 using ..SolverInterface
 using ..MathProgBase
-using Compat
 
 function warn_no_inf(T)
     if !(isinf(typemin(T)) && isinf(typemax(T)))
-        @Compat.warn("Element type $T does not have an infinite value. Note that this may artifically introduce ranged (two-sided) constraints. To avoid this, consider casting the problem data to Float64.")
+        @warn("Element type $T does not have an infinite value. Note that this may artifically introduce ranged (two-sided) constraints. To avoid this, consider casting the problem data to Float64.")
     end
 end
 

diff --git a/src/HighLevelInterface/linprog.jl b/src/HighLevelInterface/linprog.jl
@@ -86,15 +86,15 @@ function solvelp(m)
         try
             attrs[:infeasibilityray] = getinfeasibilityray(m)
         catch
-            Compat.@warn("Problem is infeasible, but infeasibility ray (\"Farkas proof\") is unavailable; check that the proper solver options are set.")
+            @warn("Problem is infeasible, but infeasibility ray (\"Farkas proof\") is unavailable; check that the proper solver options are set.")
         end
         return LinprogSolution(stat, nothing, [], attrs)
     elseif stat == :Unbounded
         attrs = Dict()
         try
             attrs[:unboundedray] = getunboundedray(m)
         catch
-            Compat.@warn("Problem is unbounded, but unbounded ray is unavailable; check that the proper solver options are set.")
+            @warn("Problem is unbounded, but unbounded ray is unavailable; check that the proper solver options are set.")
         end
         return LinprogSolution(stat, nothing, [], attrs)
     else

diff --git a/src/SolverInterface/SolverInterface.jl b/src/SolverInterface/SolverInterface.jl
@@ -1,9 +1,8 @@
 module SolverInterface
 
 using Base.Meta
-using Compat
-using Compat.SparseArrays
-using Compat.LinearAlgebra
+using SparseArrays
+using LinearAlgebra
 
 const methods_by_tag = Dict{Symbol,Vector{Symbol}}()
 

diff --git a/src/SolverInterface/conic_to_lpqp.jl b/src/SolverInterface/conic_to_lpqp.jl
@@ -259,7 +259,7 @@ function getreducedcosts(wrap::ConicToLPQPBridge)
         redcost[varidx] -= conedual[i]
     end
     if wrap.sense == :Max
-        Compat.rmul!(redcost, -1.0)
+        rmul!(redcost, -1.0)
     end
     return redcost
 end
@@ -272,7 +272,7 @@ function getconstrduals(wrap::ConicToLPQPBridge)
         constrduals[i-offset] -= conedual[i]
     end
     if wrap.sense == :Max
-        Compat.rmul!(constrduals, -1.0)
+        rmul!(constrduals, -1.0)
     end
     return constrduals
 end

diff --git a/test/REQUIRE b/test/REQUIRE
diff --git a/test/conicinterface.jl b/test/conicinterface.jl
@@ -5,9 +5,9 @@
 # Test the MathProgBase.jl interface for a provided conic solver.
 #############################################################################
 
-using Compat.Test
-using Compat.LinearAlgebra
-using Compat.SparseArrays
+using Test
+using LinearAlgebra
+using SparseArrays
 using MathProgBase
 
 function coniclineartest(solver::MathProgBase.AbstractMathProgSolver;duals=false, tol=1e-6)

diff --git a/test/linprog.jl b/test/linprog.jl
@@ -1,6 +1,6 @@
-using Compat.Test
-using Compat.LinearAlgebra
-using Compat.SparseArrays
+using Test
+using LinearAlgebra
+using SparseArrays
 using MathProgBase
 
 function linprogtest(solver; objtol = 1e-7, primaltol = 1e-6)

diff --git a/test/linproginterface.jl b/test/linproginterface.jl
@@ -1,6 +1,5 @@
-using Compat.Test
-using Compat.LinearAlgebra
-#using MathProgBase
+using Test
+using LinearAlgebra
 using MathProgBase.SolverInterface
 
 function linprogsolvertest(solver::AbstractMathProgSolver, eps = Base.rtoldefault(Float64))

diff --git a/test/mixintprog.jl b/test/mixintprog.jl
@@ -1,5 +1,5 @@
-using Compat.Test
-using Compat.LinearAlgebra
+using Test
+using LinearAlgebra
 using MathProgBase
 
 function mixintprogtest(solver)

diff --git a/test/nlp.jl b/test/nlp.jl
@@ -1,6 +1,5 @@
 using MathProgBase
-using Compat
-using Compat.Test
+using Test
 
 # Here the type represents the complete instance, but it
 # could also store instance data.

diff --git a/test/quadprog.jl b/test/quadprog.jl
@@ -1,5 +1,5 @@
-using Compat.Test
-using Compat.LinearAlgebra
+using Test
+using LinearAlgebra
 using MathProgBase
 
 function quadprogtest(solver)