update to 1.0 (#61)

* update to 1.0

* update julia versions

Author: mileslucas

.gitignore

@@ -0,0 +1,31 @@
+
+# Created by https://www.toptal.com/developers/gitignore/api/julia
+# Edit at https://www.toptal.com/developers/gitignore?templates=julia
+
+### Julia ###
+# Files generated by invoking Julia with --code-coverage
+*.jl.cov
+*.jl.*.cov
+
+# Files generated by invoking Julia with --track-allocation
+*.jl.mem
+
+# System-specific files and directories generated by the BinaryProvider and BinDeps packages
+# They contain absolute paths specific to the host computer, and so should not be committed
+deps/deps.jl
+deps/build.log
+deps/downloads/
+deps/usr/
+deps/src/
+
+# Build artifacts for creating documentation generated by the Documenter package
+docs/build/
+docs/site/
+
+# File generated by Pkg, the package manager, based on a corresponding Project.toml
+# It records a fixed state of all packages used by the project. As such, it should not be
+# committed for packages, but should be committed for applications that require a static
+# environment.
+Manifest.toml
+
+# End of https://www.toptal.com/developers/gitignore/api/julia

.travis.yml

@@ -3,9 +3,8 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
-  - 0.7
   - 1.0
+  - 1
 notifications:
   email: false
 sudo: false # use a docker worker

Project.toml

@@ -0,0 +1,20 @@
+name = "GLPKMathProgInterface"
+uuid = "3c7084bd-78ad-589a-b5bb-dbd673274bea"
+version = "0.5.0"
+
+[deps]
+GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[compat]
+GLPK = "0.6,0.7,0.8,0.9,0.10,0.11,0.12,0.13"
+MathProgBase = "0.5,0.7,0.8"
+julia = "1"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

REQUIRE

@@ -1,8 +1,7 @@
 module GLPKInterfaceBase
 
-using Compat
-using Compat.SparseArrays
-using Compat.LinearAlgebra
+using SparseArrays
+using LinearAlgebra
 import GLPK
 
 import MathProgBase

src/GLPKInterfaceBase.jl

@@ -1,8 +1,7 @@
 module GLPKInterfaceLP
 
-using Compat
-using Compat.SparseArrays
-using Compat.LinearAlgebra
+using SparseArrays
+using LinearAlgebra
 
 import GLPK
 import MathProgBase
@@ -52,7 +51,7 @@ function MPB.LinearQuadraticModel(s::GLPKSolverLP)
     elseif s.method == :InteriorPoint
         param = GLPK.InteriorParam()
         if s.presolve
-            Compat.@warn("Ignored option: presolve")
+            @warn "Ignored option: presolve"
         end
     else
         error("This is a bug")
@@ -64,7 +63,7 @@ function MPB.LinearQuadraticModel(s::GLPKSolverLP)
             t = typeof(param).types[i]
             setfield!(param, i, convert(t, v))
         else
-            Compat.@warn("Ignored option: $(string(k))")
+            @warn "Ignored option: $(string(k))"
         end
     end
     lpm = GLPKMathProgModelLP(GLPK.Prob(), s.method, param, false)

src/GLPKInterfaceLP.jl

@@ -4,9 +4,8 @@ import GLPK
 import MathProgBase
 const MPB = MathProgBase
 using ..GLPKInterfaceBase
-using Compat
-using Compat.SparseArrays
-using Compat.LinearAlgebra
+using SparseArrays
+using LinearAlgebra
 
 export GLPKSolverMIP, GLPKCallbackData
 
@@ -41,14 +40,14 @@ function Base.copy(m::GLPKMathProgModelMIP)
     m2.param = deepcopy(m.param)
     m2.smplxparam = deepcopy(m.smplxparam)
 
-    m.lazycb == nothing || @Compat.warn "Callbacks can't be copied, lazy callback ignored"
-    m.cutcb == nothing || @Compat.warn "Callbacks can't be copied, cut callback ignored"
-    m.heuristiccb == nothing || @Compat.warn "Callbacks can't be copied, heuristic callback ignored"
-    m.infocb == nothing || @Compat.warn "Callbacks can't be copied, info callback ignored"
+    m.lazycb == nothing || @warn "Callbacks can't be copied, lazy callback ignored"
+    m.cutcb == nothing || @warn "Callbacks can't be copied, cut callback ignored"
+    m.heuristiccb == nothing || @warn "Callbacks can't be copied, heuristic callback ignored"
+    m.infocb == nothing || @warn "Callbacks can't be copied, info callback ignored"
 
     m2.objbound = m.objbound
 
-    m.cbdata == nothing || @Compat.warn "Callbacks can't be copied, callbackdata ignored"
+    m.cbdata == nothing || @warn "Callbacks can't be copied, callbackdata ignored"
 
     m2.binaries = deepcopy(m.binaries)
     m2.userlimit = m.userlimit
@@ -165,7 +164,7 @@ function MPB.LinearQuadraticModel(s::GLPKSolverMIP)
 
     for (k,v) in s.opts
         if k in [:cb_func, :cb_info]
-            Compat.@warn("ignored option: $(string(k)); use the MathProgBase callback interface instead")
+            @warn "ignored option: $(string(k)); use the MathProgBase callback interface instead"
             continue
         end
         i = findfirst(x->x==k, fieldnames(typeof(lpm.param)))
@@ -177,7 +176,7 @@ function MPB.LinearQuadraticModel(s::GLPKSolverMIP)
             t = typeof(lpm.smplxparam).types[s]
             setfield!(lpm.smplxparam, s, convert(t, v))
         else
-            Compat.@warn("Ignored option: $(string(k))")
+            @warn "Ignored option: $(string(k))"
             continue
         end
     end
@@ -364,7 +363,7 @@ function MPB.cbaddsolution!(d::GLPKCallbackData)
     u = MPB.getvarUB(d.model)
     for i in 1:length(l)
         if d.sol[i] < l[i] - 1e-6 || d.sol[i] > u[i] + 1e-6
-            Compat.@warn("Ignoring infeasible solution from heuristic callback")
+            @warn "Ignoring infeasible solution from heuristic callback"
             return
         end
     end
@@ -374,7 +373,7 @@ function MPB.cbaddsolution!(d::GLPKCallbackData)
     y = A*d.sol
     for i in 1:length(lb)
         if y[i] < lb[i] - 1e-6 || y[i] > ub[i] + 1e-6
-            Compat.@warn("Ignoring infeasible solution from heuristic callback")
+            @warn "Ignoring infeasible solution from heuristic callback"
             return
         end
     end

src/GLPKInterfaceMIP.jl

@@ -1,7 +1,6 @@
-import Compat.Pkg
+const mathprogbase_test = joinpath(dirname(pathof(MathProgBase)), "..", "test")
 
 @testset "MathProgBase tests" begin
-    mathprogbase_test = joinpath(Pkg.dir("MathProgBase"), "test")
 
     include(joinpath(mathprogbase_test, "linprog.jl"))
     linprogtest(GLPKSolverLP())

test/mathprog.jl

@@ -1,6 +1,6 @@
 using GLPKMathProgInterface, GLPK
 using MathProgBase
-using Compat.Test
+using Test
 
 include("params.jl")
 include("setbounds.jl")

test/runtests.jl

@@ -1,5 +1,5 @@
 using GLPKMathProgInterface, MathProgBase
-using Compat.Test
+using Test
 
 @testset "Invalid bounds" begin
     solver = GLPKSolverLP()