Merge pull request #390 from JuliaOpt/ml/drop05

drop julia 0.5
jump-dev · Jul 12, 2017 · c3a6a26 · c3a6a26
2 parents 68f245b + fb9b231
commit c3a6a26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ os:
   - linux
 #  - osx # disabled because of day-long queue time
 julia:
-  - 0.5
+  - 0.6
 #  - nightly # disabled because JuMP not working on nightly as of 07/2017
 # Workaround for https://github.com/travis-ci/travis-ci/issues/4942
 git:

diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,4 @@
-julia 0.5
+julia 0.6
 MathProgBase 0.5 0.7
 JuMP 0.15
 ConicNonlinearBridge

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -141,7 +141,7 @@ println()
     end
 
     @testset "MISOCP solver - $mipname" for (mipname, mip) in solvers["MISOCP"]
-        if msd && !applicable(MathProgBase.setlazycallback!, MathProgBase.ConicModel(mip), _ -> _)
+        if msd && !applicable(MathProgBase.setlazycallback!, MathProgBase.ConicModel(mip), x -> x)
             # Only test MSD on lazy callback solvers
             continue
         end