From 8c460f33f5c07dc9d1d96a6379d704ead442c135 Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:23:45 -0600 Subject: [PATCH 1/7] updating depricated os checks --- deps/build.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/deps/build.jl b/deps/build.jl index b6d05ad..1471ff6 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -8,14 +8,14 @@ version = "2.9.2" provides(Sources, URI("http://www.coin-or.org/download/source/OS/OS-$version.tgz"), [libOS], os = :Unix) -@windows_only begin +@static if is_windows() using WinRPM push!(WinRPM.sources, "http://download.opensuse.org/repositories/home:/kelman:/mingw-coinor/openSUSE_13.2") WinRPM.update() provides(WinRPM.RPM, "OptimizationServices", [libOS], os = :Windows) end -@osx_only begin +@static if is_apple() using Homebrew provides(Homebrew.HB, "Optimizationservices", [libOS], os = :Darwin) end @@ -33,8 +33,10 @@ patchdir = BinDeps.depsdir(libOS) builddir = joinpath(BinDeps.depsdir(libOS), "src", "OS-$version", "build") ENV2 = copy(ENV) -@unix_only ENV2["PKG_CONFIG_PATH"] = string(joinpath(cbclibdir, "pkgconfig"), +@static if is_unix() + ENV2["PKG_CONFIG_PATH"] = string(joinpath(cbclibdir, "pkgconfig"), ":", joinpath(ipoptlibdir, "pkgconfig")) +end cbcincdir = joinpath(cbclibdir, "..", "include", "coin") provides(SimpleBuild, From 3245e84ef48d3b2417c1972aa0c7b53001eb88df Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:36:46 -0600 Subject: [PATCH 2/7] updating test REQUIRE to be in sync with JuMP --- test/REQUIRE | 1 + 1 file changed, 1 insertion(+) diff --git a/test/REQUIRE b/test/REQUIRE index e4ae2fe..c48973c 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -1,2 +1,3 @@ JuMP 0.13 +OffsetArrays 0.2.13 FactCheck From b25192dc38b1947eb92c09b7eacc0537b964139b Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:38:25 -0600 Subject: [PATCH 3/7] adding julia v0.5 to CI --- .travis.yml | 1 + appveyor.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9dc2f64..c799443 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ os: - osx julia: - 0.4 + - 0.5 - nightly notifications: email: false diff --git a/appveyor.yml b/appveyor.yml index 194d764..9394d28 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,8 @@ environment: matrix: - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe" - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe" + - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe" + - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe" - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe" - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe" From 9f65a131a6a87a159cdbb4aba6f2ba4c4d2aa1f1 Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:47:27 -0600 Subject: [PATCH 4/7] updating string types --- src/CoinOptServices.jl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CoinOptServices.jl b/src/CoinOptServices.jl index 4304bec..51f2cb2 100644 --- a/src/CoinOptServices.jl +++ b/src/CoinOptServices.jl @@ -26,10 +26,10 @@ osildir = Pkg.dir("CoinOptServices", ".osil") export OsilSolver, OsilBonminSolver, OsilCouenneSolver, OSOption immutable OsilSolver <: AbstractMathProgSolver - solver::UTF8String - osil::UTF8String - osol::UTF8String - osrl::UTF8String + solver::String + osil::String + osol::String + osrl::String printLevel::Int options::Vector{Dict} end @@ -89,10 +89,10 @@ OSOption(optname, optval; kwargs...) = OSOption(name = optname, value = optval; kwargs...) type OsilMathProgModel <: AbstractMathProgModel - solver::UTF8String - osil::UTF8String - osol::UTF8String - osrl::UTF8String + solver::String + osil::String + osol::String + osrl::String printLevel::Int options::Vector{Dict} From 341266c36d02a4d1891ac55a05296040c09f64fa Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:54:14 -0600 Subject: [PATCH 5/7] updating tests to julia v0.5 and JuMP v0.15 --- REQUIRE | 2 +- test/REQUIRE | 2 +- test/runtests.jl | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/REQUIRE b/REQUIRE index 37e551a..0263fa1 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ -julia 0.4 +julia 0.5 Clp Cbc Ipopt diff --git a/test/REQUIRE b/test/REQUIRE index c48973c..c97c9c8 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -1,3 +1,3 @@ -JuMP 0.13 +JuMP 0.15 OffsetArrays 0.2.13 FactCheck diff --git a/test/runtests.jl b/test/runtests.jl index e871829..7796c03 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -27,10 +27,10 @@ nvar = 10 solver=OsilSolver(solver = "couenne") m = Model(solver=solver) @variable(m, -10 <= x[i=1:nvar] <= 10) -@NLobjective(m, Min, sum{1/(1+exp(-x[i])), i=1:nvar}) -@constraint(m, sum{x[i], i=1:nvar} <= .4*nvar) +@NLobjective(m, Min, sum(1/(1+exp(-x[i])) for i in 1:nvar)) +@constraint(m, sum(x[i] for i in 1:nvar) <= .4*nvar) @test solve(m) == :Optimal -@test isapprox(getvalue(x[1]),-10.0) +@test isapprox(getvalue(x[1]), -10.0) include(Pkg.dir("JuMP","test","runtests.jl")) From a6bbe7d0e957ced63e6f3de7219728b32d82c7ce Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:54:52 -0600 Subject: [PATCH 6/7] removing julia v0.4 from CI --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9394d28..f02e04b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,5 @@ environment: matrix: - - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe" - - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe" - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe" - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe" - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe" From db1909c6a55d1eeea572502e122d912a1ae322e3 Mon Sep 17 00:00:00 2001 From: ccoffrin Date: Thu, 30 Mar 2017 21:55:19 -0600 Subject: [PATCH 7/7] removing julia v0.4 from travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c799443..17fa7ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ os: - linux - osx julia: - - 0.4 - 0.5 - nightly notifications: