Skip to content

Commit

Permalink
install Optim in all versions
Browse files Browse the repository at this point in the history
  • Loading branch information
schillic committed Oct 20, 2018
1 parent 035ddf0 commit 872a590
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@ else
error("unknown parameter 1: $(ARGS[1])")
end

@static if VERSION >= v"0.7-"
using Pkg
end

Pkg.add("Optim")

if test_suite_polyhedra || test_suite_plotting
@static if VERSION >= v"0.7-"
using Pkg
else
@static if VERSION < v"0.7-"
Pkg.add("CDDLib")
end
Pkg.add("Polyhedra"); Pkg.add("Optim")
Pkg.add("Polyhedra")
using Polyhedra

# fix namespace conflicts with Polyhedra
Expand Down Expand Up @@ -123,9 +127,6 @@ if test_suite_basic
end

if test_suite_plotting
@static if VERSION >= v"0.7-"
using Pkg
end
Pkg.add("Plots")
using Plots

Expand All @@ -138,7 +139,6 @@ if test_suite_doctests
Pkg.pin("Documenter", v"0.18.0")
else
# NOTE: can be removed when using a Project.toml file
using Pkg
Pkg.add("Documenter")
Pkg.add("Plots")
Pkg.add("GR")
Expand Down

0 comments on commit 872a590

Please sign in to comment.