diff --git a/.travis.yml b/.travis.yml index 66ae6064..63017e49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ notifications: # uncomment the following lines to override the default test script script: - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - - julia -e 'Pkg.clone(pwd()); Pkg.build("Plots")' + - julia -e 'using Pkg; Pkg.add(pwd()); Pkg.build("Plots")' - julia test/travis_commands.jl # - julia -e 'Pkg.clone("ImageMagick"); Pkg.build("ImageMagick")' # - julia -e 'Pkg.clone("GR"); Pkg.build("GR")' diff --git a/test/REQUIRE b/test/REQUIRE index 09681156..a7b6c784 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -6,3 +6,4 @@ GR 0.31.0 RDatasets VisualRegressionTests UnicodePlots +Test diff --git a/test/imgcomp.jl b/test/imgcomp.jl index 625d6d77..11656dc6 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -6,16 +6,16 @@ import DataFrames, RDatasets # don't let pyplot use a gui... it'll crash # note: Agg will set gui -> :none in PyPlot -ENV["MPLBACKEND"] = "Agg" -try - @eval import PyPlot - info("Matplotlib version: $(PyPlot.matplotlib[:__version__])") -end +# ENV["MPLBACKEND"] = "Agg" +# try +# @eval import PyPlot +# info("Matplotlib version: $(PyPlot.matplotlib[:__version__])") +# end using Plots using StatPlots -using Base.Test +using Test default(size=(500,300)) diff --git a/test/travis_commands.jl b/test/travis_commands.jl index a283d780..ca8a07a4 100644 --- a/test/travis_commands.jl +++ b/test/travis_commands.jl @@ -1,15 +1,18 @@ +using Pkg + Pkg.add("ImageMagick") Pkg.build("ImageMagick") # Pkg.clone("GR") # Pkg.build("GR") -Pkg.clone("https://github.com/JuliaPlots/PlotReferenceImages.jl.git") +Pkg.add("https://github.com/JuliaPlots/PlotReferenceImages.jl.git") # Pkg.clone("https://github.com/JuliaStats/KernelDensity.jl.git") -Pkg.clone("StatPlots") -# Pkg.checkout("PlotUtils") +Pkg.add("StatPlots") +Pkg.checkout("PlotUtils") +Pkg.checkout("RecipesBase") # Pkg.clone("Blink") # Pkg.build("Blink") @@ -22,9 +25,9 @@ Pkg.clone("StatPlots") # Pkg.clone("VisualRegressionTests") # need this to use Conda -ENV["PYTHON"] = "" -Pkg.add("PyPlot") -Pkg.build("PyPlot") +# ENV["PYTHON"] = "" +# Pkg.add("PyPlot") +# Pkg.build("PyPlot") # Pkg.add("InspectDR")