From f3864f706fc53b0c944e87e47fba21c7fca497c0 Mon Sep 17 00:00:00 2001 From: Giorgio Calderone Date: Tue, 29 Aug 2017 01:38:50 +0200 Subject: [PATCH] Try again with gnuplot5 --- .travis.yml | 4 ++-- src/Gnuplot.jl | 4 ++-- src/GnuplotInternals.jl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2fbace6..b42c07f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ matrix: #addons: # apt: # apt-get for linux # packages: -# - gnuplot>=4.7 +# - gnuplot before_script: # homebrew for mac - - if [ $TRAVIS_OS_NAME = osx ]; then brew install gnuplot; else sudo apt-get install gnuplot>=4.7; fi + - if [ $TRAVIS_OS_NAME = osx ]; then brew install gnuplot; else sudo apt-get install gnuplot5; fi ## uncomment the following lines to override the default test script #script: diff --git a/src/Gnuplot.jl b/src/Gnuplot.jl index 54866b4..0cf168c 100644 --- a/src/Gnuplot.jl +++ b/src/Gnuplot.jl @@ -423,8 +423,8 @@ gp.dump() will be appended); """ function data(data::Vararg{AbstractArray{T,1},N}; - name::Union{Void,String}=nothing, - prefix::Union{Void,String}=nothing) where {T<:Number,N} + name::Union{Void,String}=nothing, + prefix::Union{Void,String}=nothing) where {T<:Number,N} p_.getProcOrStartIt() cur = p_.main.states[p_.main.curPos] diff --git a/src/GnuplotInternals.jl b/src/GnuplotInternals.jl index a7cd9b4..f8e2371 100644 --- a/src/GnuplotInternals.jl +++ b/src/GnuplotInternals.jl @@ -122,7 +122,7 @@ function checkGnuplotVersion() end end - if ver < v"4.6" + if ver < v"4.7" error("gnuplot ver. >= 4.7 is required, but " * string(ver) * " was found.") end log(1, "Found gnuplot version: " * string(ver))