From 1c9d6d86a2135ef8bc5af74c74930f7b9a2e8dd5 Mon Sep 17 00:00:00 2001 From: schillic Date: Sat, 22 Sep 2018 14:14:43 +0200 Subject: [PATCH 1/2] remove Plots.jl from requirements --- .travis.yml | 1 + Project_tmp | 5 ++--- REQUIRE | 1 - test/runtests.jl | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39077d7b70..59f41bdd6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ after_success: - julia -e 'VERSION >= v"0.7-" && using Pkg; Pkg.add("Documenter"); VERSION < v"0.7-" && Pkg.pin("Documenter", v"0.18.0"); + Pkg.add("Plots"); Pkg.add("Polyhedra"); Pkg.add("CDDLib");' - julia -e 'cd(Pkg.dir("LazySets")); include(joinpath("docs", "make.jl"))' diff --git a/Project_tmp b/Project_tmp index fb3de33490..e24aa1ba45 100644 --- a/Project_tmp +++ b/Project_tmp @@ -14,7 +14,6 @@ GLPKMathProgInterface = "3c7084bd-78ad-589a-b5bb-dbd673274bea" GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253" MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73" -Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" Requires = "ae029012-a4dd-5104-9daa-d747884805df" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" @@ -27,13 +26,13 @@ GLPKMathProgInterface = "0.4" GR = "0.32" IntervalArithmetic = "0.14" MathProgBase = "0.7" -Plots = "0.19" RecipesBase = "0.5" Requires = "0.5" [extras] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" +Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" [targets] # add targets here, e.g., for testing (define new packages under 'extras') -test = ["Documenter"] +test = ["Documenter", "Plots"] diff --git a/REQUIRE b/REQUIRE index 0afbc454c5..7dd65172ba 100644 --- a/REQUIRE +++ b/REQUIRE @@ -5,6 +5,5 @@ GLPKMathProgInterface 0.4 GR 0.32 IntervalArithmetic 0.14 MathProgBase 0.7 -Plots 0.17 RecipesBase 0.3 Requires 0.4 diff --git a/test/runtests.jl b/test/runtests.jl index e996b48697..8fd99dbd40 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -118,6 +118,7 @@ if test_suite_doctests # NOTE: can be removed when using a Project.toml file using Pkg Pkg.add("Documenter") + Pkg.add("Plots") end using Documenter @time @testset "LazySets.doctests" begin include("../docs/make_doctests_only.jl") end From 998b70af01ab8fb0c5ae33ebd6721d28b714bc2b Mon Sep 17 00:00:00 2001 From: schillic Date: Sat, 22 Sep 2018 14:18:11 +0200 Subject: [PATCH 2/2] remove GR from requirements --- .travis.yml | 1 + Project_tmp | 5 ++--- REQUIRE | 1 - test/runtests.jl | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59f41bdd6d..e74ee98735 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ after_success: Pkg.add("Documenter"); VERSION < v"0.7-" && Pkg.pin("Documenter", v"0.18.0"); Pkg.add("Plots"); + Pkg.add("GR"); Pkg.add("Polyhedra"); Pkg.add("CDDLib");' - julia -e 'cd(Pkg.dir("LazySets")); include(joinpath("docs", "make.jl"))' diff --git a/Project_tmp b/Project_tmp index e24aa1ba45..965ae4aff0 100644 --- a/Project_tmp +++ b/Project_tmp @@ -11,7 +11,6 @@ author = ["Marcelo Forets", Compat = "34da2185-b29b-5c13-b0c7-acf172513d20" Expokit = "a1e7a1ef-7a5d-5822-a38c-be74e1bb89f4" GLPKMathProgInterface = "3c7084bd-78ad-589a-b5bb-dbd673274bea" -GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253" MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73" RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" @@ -23,7 +22,6 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" Compat = "1.0" Expokit = "0.2" GLPKMathProgInterface = "0.4" -GR = "0.32" IntervalArithmetic = "0.14" MathProgBase = "0.7" RecipesBase = "0.5" @@ -32,7 +30,8 @@ Requires = "0.5" [extras] Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" +GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" [targets] # add targets here, e.g., for testing (define new packages under 'extras') -test = ["Documenter", "Plots"] +test = ["Documenter", "Plots", "GR"] diff --git a/REQUIRE b/REQUIRE index 7dd65172ba..2ec5678fa9 100644 --- a/REQUIRE +++ b/REQUIRE @@ -2,7 +2,6 @@ julia 0.6 Compat 1.0 Expokit 0.1 GLPKMathProgInterface 0.4 -GR 0.32 IntervalArithmetic 0.14 MathProgBase 0.7 RecipesBase 0.3 diff --git a/test/runtests.jl b/test/runtests.jl index 8fd99dbd40..96d915f0d5 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -119,6 +119,7 @@ if test_suite_doctests using Pkg Pkg.add("Documenter") Pkg.add("Plots") + Pkg.add("GR") end using Documenter @time @testset "LazySets.doctests" begin include("../docs/make_doctests_only.jl") end