From 5583d9f315678ce31cd3e66a406d8080b724f294 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Sat, 30 Jul 2016 22:24:38 -0400 Subject: [PATCH 1/3] Use dirname(@__FILE__) instead of Pkg.dir This allows installing the package elsewhere. Add testing against 0.5 to Travis - this runs the most recent RC now, release once final tags are done --- .travis.yml | 3 ++- src/backends/gadfly.jl | 2 +- src/backends/immerse.jl | 2 +- src/backends/plotly.jl | 2 +- test/snoop.jl | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ca4c6fa..fdaf9c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ os: - linux - osx julia: - # - release + - 0.4 + - 0.5 - nightly # matrix: # allow_failures: diff --git a/src/backends/gadfly.jl b/src/backends/gadfly.jl index d5c48ee7..29710fa8 100644 --- a/src/backends/gadfly.jl +++ b/src/backends/gadfly.jl @@ -41,7 +41,7 @@ function _initialize_backend(::GadflyBackend; kw...) @eval begin import Gadfly, Compose export Gadfly, Compose - include(joinpath(Pkg.dir("Plots"), "src", "backends", "gadfly_shapes.jl")) + include(joinpath(dirname(@__FILE__), "gadfly_shapes.jl")) end end diff --git a/src/backends/immerse.jl b/src/backends/immerse.jl index 8a025ba9..2a00111e 100644 --- a/src/backends/immerse.jl +++ b/src/backends/immerse.jl @@ -14,7 +14,7 @@ function _initialize_backend(::ImmerseBackend; kw...) @eval begin import Immerse, Gadfly, Compose, Gtk export Immerse, Gadfly, Compose, Gtk - include(joinpath(Pkg.dir("Plots"), "src", "backends", "gadfly_shapes.jl")) + include(joinpath(dirname(@__FILE__), "gadfly_shapes.jl")) end end diff --git a/src/backends/plotly.jl b/src/backends/plotly.jl index 5d11e288..347e972c 100644 --- a/src/backends/plotly.jl +++ b/src/backends/plotly.jl @@ -537,7 +537,7 @@ end # ---------------------------------------------------------------- function html_head(plt::Plot{PlotlyBackend}) - "" + "" end function html_body(plt::Plot{PlotlyBackend}, style = nothing) diff --git a/test/snoop.jl b/test/snoop.jl index 82a8f741..cf137d63 100644 --- a/test/snoop.jl +++ b/test/snoop.jl @@ -4,7 +4,7 @@ import SnoopCompile # This only needs to be run once (to generate "/tmp/plots_compiles.csv") # SnoopCompile.@snoop "/tmp/plots_compiles.csv" begin -# include(Pkg.dir("Plots", "test","runtests.jl")) +# include(joinpath(dirname(@__FILE__), "runtests.jl")) # end # ---------------------------------------------------------- @@ -32,5 +32,5 @@ blacklist = ["MIME"] pc, discards = SnoopCompile.parcel(data[end:-1:1,2], subst=subst, blacklist=blacklist) SnoopCompile.write("/tmp/precompile", pc) -pdir = Pkg.dir("Plots") +pdir = joinpath(dirname(@__FILE__), "..") run(`cp /tmp/precompile/precompile_Plots.jl $pdir/src/precompile.jl`) From 553125713d39d65f86f27693f479c84c6322813d Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Tue, 2 Aug 2016 20:37:39 -0700 Subject: [PATCH 2/3] 0.4 no longer supported on master --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fdaf9c1e..0abcc4ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ os: - linux - osx julia: - - 0.4 - 0.5 - nightly # matrix: From 4e6150fe1e7db362f0473c0d8d5d76d23ff6b52c Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Tue, 2 Aug 2016 20:39:49 -0700 Subject: [PATCH 3/3] use S3 links on appveyor and add fast-fail snippet --- appveyor.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f2c8f2cc..21481951 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,9 @@ environment: matrix: -# Releases - - JULIAVERSION: "stable/win32" - - JULIAVERSION: "stable/win64" -# Nightlies - - JULIAVERSION: "download/win32" - - JULIAVERSION: "download/win64" + - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe" + - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe" + - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe" + - JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe" notifications: - provider: Email @@ -14,8 +12,13 @@ notifications: on_build_status_changed: false install: +# If there's a newer build queued for the same PR, cancel this one + - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod ` + https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | ` + Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { ` + throw "There are newer queued builds for this pull request, failing early." } # Download most recent Julia Windows binary - - ps: (new-object net.webclient).DownloadFile($("http://status.julialang.org/"+$env:JULIAVERSION), "C:\projects\julia-binary.exe") + - ps: (new-object net.webclient).DownloadFile($("http://s3.amazonaws.com/"+$env:JULIAVERSION), "C:\projects\julia-binary.exe") # Run installer silently, output to C:\projects\julia - C:\projects\julia-binary.exe /S /D=C:\projects\julia @@ -26,4 +29,4 @@ build_script: test_script: # - C:\projects\julia\bin\julia -e "Pkg.test(\"Plots\")" - - C:\projects\julia\bin\julia -e "include(Pkg.dir(\"Plots\", \"test\", \"travis_commands.jl\"))" \ No newline at end of file + - C:\projects\julia\bin\julia -e "include(Pkg.dir(\"Plots\", \"test\", \"travis_commands.jl\"))"