From 169851564ce9d7a5d72081b04ee5879f6c8c798c Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Wed, 8 May 2019 17:23:36 +0200 Subject: [PATCH 1/7] use Project.toml + clean up test deps --- .gitignore | 1 + .travis.yml | 50 ++++------------------------------------ Project.toml | 55 ++++++++++++++++++++++++++++++++++++++++++++ test/REQUIRE | 10 -------- test/add_packages.jl | 46 ------------------------------------ test/runtests.jl | 7 +++++- test/snoop.jl | 36 ----------------------------- 7 files changed, 67 insertions(+), 138 deletions(-) create mode 100644 Project.toml delete mode 100644 test/REQUIRE delete mode 100644 test/add_packages.jl delete mode 100644 test/snoop.jl diff --git a/.gitignore b/.gitignore index 8b7142dd..1bac5f19 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ examples/meetup/.ipynb_checkpoints/* deps/plotly-latest.min.js deps/build.log deps/deps.jl +Manifest.toml diff --git a/.travis.yml b/.travis.yml index e236fe4f..fc303b0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,57 +4,17 @@ os: - linux # - osx julia: - # - 1.0 + - 1.1 - nightly -# matrix: -# allow_failures: -# - julia: nightly - -# # before install: -# # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi -# # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install wkhtmltopdf; fi - -# ref: http://askubuntu.com/a/556672 for the wkhtmltopdf apt repository info + +matrix: + allow_failures: + - julia: nightly sudo: required before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pwd ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./test/install_wkhtmltoimage.sh ; fi -# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository -y ppa:pov/wkhtmltopdf ; fi -# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update ; fi -# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y wkhtmltopdf ; fi -# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wkhtmltopdf -V ; fi -# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wkhtmltoimage -V ; fi -# echo 'exec xvfb-run -a -s "-screen 0 640x480x16" wkhtmltopdf "$@"' | sudo tee /usr/local/bin/wkhtmltopdf.sh >/dev/null -# sudo chmod a+x /usr/local/bin/wkhtmltopdf.sh - -# # borrowed from Blink.jl's travis file -# matrix: -# include: -# - os: linux -# julia: 0.4 -# env: TESTCMD="xvfb-run julia" -# - os: osx -# julia: 0.4 -# env: TESTCMD="julia" - - notifications: email: true -# uncomment the following lines to override the default test script -# script: - # - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi - # - julia -e 'import Pkg; Pkg.add(Pkg.PackageSpec(path=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")' - # # - julia -e 'Pkg.clone("https://github.com/tbreloff/ImageMagick.jl.git"); Pkg.checkout("ImageMagick","tb_write"); Pkg.build("ImageMagick")' - # - julia -e 'Pkg.clone("https://github.com/tbreloff/ExamplePlots.jl.git");' - # # - julia -e 'Pkg.clone("https://github.com/JunoLab/Blink.jl.git"); Pkg.build("Blink"); import Blink; Blink.AtomShell.install()' - # # - julia -e 'Pkg.clone("https://github.com/spencerlyon2/PlotlyJS.jl.git")' - # - julia -e 'ENV["PYTHON"] = ""; Pkg.add("PyPlot"); Pkg.build("PyPlot")' - # - # # - $TESTCMD -e 'Pkg.test("Plots"; coverage=false)' - # - julia -e 'Pkg.test("Plots"; coverage=false)' - # # - julia -e 'cd(Pkg.dir("Plots")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())' diff --git a/Project.toml b/Project.toml new file mode 100644 index 00000000..e59e581a --- /dev/null +++ b/Project.toml @@ -0,0 +1,55 @@ +name = "Plots" +uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" + +[deps] +Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" +Contour = "d38c429a-6771-53c6-b99e-75d170b6e991" +Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" +FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93" +GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" +GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb" +JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" +Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e" +NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +PlotReferenceImages = "c5e800db-1e6b-5f72-915a-308d267b7a19" +PlotThemes = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a" +PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043" +Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" +REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" +Reexport = "189a3867-3050-52da-a836-e630ba90ab69" +Requires = "ae029012-a4dd-5104-9daa-d747884805df" +Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" +SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" +Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" +UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" + +[compat] +FixedPointNumbers = "≥ 0.3.0" +GR = "≥ 0.31.0" +PlotThemes = "≥ 0.1.3" +PlotUtils = "≥ 0.4.1" +RecipesBase = "≥ 0.6.0" +StatsBase = "≥ 0.14.0" +julia = "≥ 1.0.0" + +[extras] +FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" +GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" +ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" +Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0" +LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" +Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" +RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b" +Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" +StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" +VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92" + +[targets] +test = ["Pkg", "GR", "Test", "Random", "StatsPlots", "VisualRegressionTests", "LaTeXStrings", "Images", "ImageMagick", "RDatasets", "FileIO", "UnicodePlots"] diff --git a/test/REQUIRE b/test/REQUIRE deleted file mode 100644 index 06f37166..00000000 --- a/test/REQUIRE +++ /dev/null @@ -1,10 +0,0 @@ -StatsPlots -Images -ImageMagick -@osx QuartzImageIO -FileIO -GR 0.31.0 -RDatasets -VisualRegressionTests -UnicodePlots -LaTeXStrings diff --git a/test/add_packages.jl b/test/add_packages.jl deleted file mode 100644 index 4e27bb30..00000000 --- a/test/add_packages.jl +++ /dev/null @@ -1,46 +0,0 @@ -using Pkg - -# need this to use Conda -# ENV["PYTHON"] = "" - -to_add = [ - # PackageSpec(url="https://github.com/JuliaStats/KernelDensity.jl.git"), - PackageSpec(name="PlotUtils", rev="master"), - PackageSpec(name="RecipesBase", rev="master"), - # PackageSpec(name="Blink", rev="master"), - # PackageSpec(name="Rsvg", rev="master"), - # PackageSpec(name="PlotlyJS", rev="master"), - # PackageSpec(name="VisualRegressionTests", rev="master"), - # PackageSpec("PyPlot"), - # PackageSpec("InspectDR"), -] - -if isinteractive() - Pkg.develop(PackageSpec(url="https://github.com/JuliaPlots/PlotReferenceImages.jl.git")) - append!(to_add, [ - PackageSpec(name="FileIO"), - PackageSpec(name="ImageMagick"), - PackageSpec(name="UnicodePlots"), - PackageSpec(name="VisualRegressionTests"), - PackageSpec(name="Gtk"), - # PlotlyJS: - # PackageSpec(name="PlotlyJS"), - # PackageSpec(name="Blink"), - # PackageSpec(name="ORCA"), - # PyPlot: - # PackageSpec(name="PyPlot"), - # PackageSpec(name="PyCall"), - # PackageSpec(name="LaTeXStrings"), - ]) -else - push!(to_add, PackageSpec(url="https://github.com/JuliaPlots/PlotReferenceImages.jl.git")) -end - -Pkg.add(to_add) - -Pkg.build("ImageMagick") -# Pkg.build("GR") -# Pkg.build("Blink") -# import Blink -# Blink.AtomShell.install() -# Pkg.build("PyPlot") diff --git a/test/runtests.jl b/test/runtests.jl index 906c5804..924aa2ea 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,8 +1,13 @@ module PlotsTests -include("add_packages.jl") +using Pkg + +# This should be fine since it's run in it's own test env? +pkg"add https://github.com/JuliaPlots/PlotReferenceImages.jl.git" + include("imgcomp.jl") + # don't actually show the plots Random.seed!(1234) default(show=false, reuse=true) diff --git a/test/snoop.jl b/test/snoop.jl deleted file mode 100644 index cf137d63..00000000 --- a/test/snoop.jl +++ /dev/null @@ -1,36 +0,0 @@ -import SnoopCompile - -### Log the compiles -# This only needs to be run once (to generate "/tmp/plots_compiles.csv") - -# SnoopCompile.@snoop "/tmp/plots_compiles.csv" begin -# include(joinpath(dirname(@__FILE__), "runtests.jl")) -# end - -# ---------------------------------------------------------- - -### Parse the compiles and generate precompilation scripts -# This can be run repeatedly to tweak the scripts - -# IMPORTANT: we must have the module(s) defined for the parcelation -# step, otherwise we will get no precompiles for the Plots module -using Plots - -data = SnoopCompile.read("/tmp/plots_compiles.csv") - -# The Plots tests are run inside a module PlotsTest, so all -# the precompiles get credited to PlotsTest. Credit them to Plots instead. -subst = Dict("PlotsTests"=>"Plots") - -# Blacklist helps fix problems: -# - MIME uses type-parameters with symbols like :image/png, which is -# not parseable -blacklist = ["MIME"] - -# Use these two lines if you want to create precompile functions for -# individual packages -pc, discards = SnoopCompile.parcel(data[end:-1:1,2], subst=subst, blacklist=blacklist) -SnoopCompile.write("/tmp/precompile", pc) - -pdir = joinpath(dirname(@__FILE__), "..") -run(`cp /tmp/precompile/precompile_Plots.jl $pdir/src/precompile.jl`) From 63f8f52c9f27b7cd00bba7fa1bdd89b3f215fb0c Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 9 May 2019 11:06:22 +0200 Subject: [PATCH 2/7] remove REQUIRES --- REQUIRE | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 REQUIRE diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index bd236535..00000000 --- a/REQUIRE +++ /dev/null @@ -1,16 +0,0 @@ -julia 1.0 - -RecipesBase 0.6.0 -PlotUtils 0.4.1 -PlotThemes 0.1.3 -Reexport -GeometryTypes -FixedPointNumbers 0.3 -Measures -Showoff -StatsBase 0.14.0 -JSON -NaNMath -Requires -Contour -GR 0.39.0 From a3be970f29f42e4b714caef6e4009fbde573a274 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 9 May 2019 11:48:40 +0200 Subject: [PATCH 3/7] get around registered PLotReferenceImages by downloading source of tags --- Project.toml => .Project.toml | 0 REQUIRE | 16 +++++++++++ test/.gitignore | 1 + test/REQUIRE | 11 ++++++++ test/imgcomp.jl | 51 ++++++++++++++++++++--------------- test/runtests.jl | 3 --- 6 files changed, 57 insertions(+), 25 deletions(-) rename Project.toml => .Project.toml (100%) create mode 100644 REQUIRE create mode 100644 test/.gitignore create mode 100644 test/REQUIRE diff --git a/Project.toml b/.Project.toml similarity index 100% rename from Project.toml rename to .Project.toml diff --git a/REQUIRE b/REQUIRE new file mode 100644 index 00000000..bd236535 --- /dev/null +++ b/REQUIRE @@ -0,0 +1,16 @@ +julia 1.0 + +RecipesBase 0.6.0 +PlotUtils 0.4.1 +PlotThemes 0.1.3 +Reexport +GeometryTypes +FixedPointNumbers 0.3 +Measures +Showoff +StatsBase 0.14.0 +JSON +NaNMath +Requires +Contour +GR 0.39.0 diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 00000000..2a6ccb02 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1 @@ +reference_images diff --git a/test/REQUIRE b/test/REQUIRE new file mode 100644 index 00000000..f357d290 --- /dev/null +++ b/test/REQUIRE @@ -0,0 +1,11 @@ +FileIO +ImageMagick +Images +LaTeXStrings +RDatasets +Random +StatsPlots +Test +UnicodePlots +VisualRegressionTests +BinaryProvider diff --git a/test/imgcomp.jl b/test/imgcomp.jl index 6d7dd457..c8ae9966 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -1,26 +1,7 @@ - using VisualRegressionTests -# using ExamplePlots - -if isinteractive() - @eval Main import Gtk -end - -# 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 - - using Plots -# using StatsPlots -import PlotReferenceImages using Random +using BinaryProvider using Test default(size=(500,300)) @@ -31,6 +12,33 @@ default(size=(500,300)) import Plots._current_plots_version +# Taken from MakieGallery +""" +Downloads the reference images from ReferenceImages for a specific version +""" +function download_reference(version = v"0.0.1") + download_dir = abspath(@__DIR__, "reference_images") + isdir(download_dir) || mkpath(download_dir) + tarfile = joinpath(download_dir, "reference_images.zip") + url = "https://github.com/JuliaPlots/PlotReferenceImages.jl/archive/v$(version).tar.gz" + refpath = joinpath(download_dir, "PlotReferenceImages.jl-$(version)") + if !isdir(refpath) # if not yet downloaded + @info "downloading reference images for version $version" + download(url, tarfile) + BinaryProvider.unpack(tarfile, download_dir) + # check again after download + if !isdir(refpath) + error("Something went wrong while downloading reference images. Plots can't be compared to references") + else + rm(tarfile, force = true) + end + else + @info "using reference images for version $version (already downloaded)" + end + refpath +end + +const ref_image_dir = download_reference() function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], tol = 1e-2) Plots._debugMode.on = debug @@ -43,8 +51,7 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is Random.seed!(1234) # reference image directory setup - # refdir = joinpath(Pkg.dir("ExamplePlots"), "test", "refimg", string(pkg)) - refdir = joinpath(dirname(pathof(PlotReferenceImages)), "..", "Plots", string(pkg)) + refdir = joinpath(ref_image_dir, "Plots", string(pkg)) fn = "ref$idx.png" # firgure out version info diff --git a/test/runtests.jl b/test/runtests.jl index 924aa2ea..167eb6a1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2,9 +2,6 @@ module PlotsTests using Pkg -# This should be fine since it's run in it's own test env? -pkg"add https://github.com/JuliaPlots/PlotReferenceImages.jl.git" - include("imgcomp.jl") From d5f3a3ef69ed9db9a59e6c46c2c9099012a4d519 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 9 May 2019 12:40:19 +0200 Subject: [PATCH 4/7] clean up & fix tests --- src/examples.jl | 5 +- test/imgcomp.jl | 20 +++----- test/runtests.jl | 122 +++-------------------------------------------- 3 files changed, 15 insertions(+), 132 deletions(-) diff --git a/src/examples.jl b/src/examples.jl index 9e382eef..6dd1b7f4 100644 --- a/src/examples.jl +++ b/src/examples.jl @@ -86,8 +86,9 @@ yaxis!("YLABEL", :log10) PlotExample("Images", "Plot an image. y-axis is set to flipped", [:(begin - import FileIO, PlotReferenceImages - img = FileIO.load(joinpath(dirname(pathof(PlotReferenceImages)), "..", "Plots","pyplot","0.7.0","ref1.png")) + import FileIO + path = download("http://juliaplots.org/PlotReferenceImages.jl/Plots/pyplot/0.7.0/ref1.png") + img = FileIO.load(path) plot(img) end)] ), diff --git a/test/imgcomp.jl b/test/imgcomp.jl index c8ae9966..e61a47c9 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -1,15 +1,3 @@ -using VisualRegressionTests -using Plots -using Random -using BinaryProvider -using Test - -default(size=(500,300)) - - -# TODO: use julia's Condition type and the wait() and notify() functions to initialize a Window, then wait() on a condition that -# is referenced in a button press callback (the button clicked callback will call notify() on that condition) - import Plots._current_plots_version # Taken from MakieGallery @@ -43,10 +31,11 @@ const ref_image_dir = download_reference() function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = isinteractive(), sigma = [1,1], tol = 1e-2) Plots._debugMode.on = debug example = Plots._examples[idx] + Plots.theme(:default) @info("Testing plot: $pkg:$idx:$(example.header)") backend(pkg) backend() - + default(size=(500,300)) # ensure consistent results Random.seed!(1234) @@ -83,7 +72,10 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is # test function func = (fn, idx) -> begin - map(eval, example.exprs) + expr = Expr(:block) + append!(expr.args, example.exprs) + eval(expr) + png(joinpath(@__DIR__, "testimgs", "test$idx.png")) png(fn) end diff --git a/test/runtests.jl b/test/runtests.jl index 167eb6a1..8e6ef9c1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,10 +1,11 @@ -module PlotsTests - -using Pkg +using VisualRegressionTests +using Plots +using Random +using BinaryProvider +using Test +using FileIO include("imgcomp.jl") - - # don't actually show the plots Random.seed!(1234) default(show=false, reuse=true) @@ -21,14 +22,6 @@ img_tol = isinteractive() ? 1e-2 : 10e-2 end end -# @static if isinteractive() -# @testset "PyPlot" begin -# @test pyplot() == Plots.PyPlotBackend() -# @test backend() == Plots.PyPlotBackend() -# -# image_comparison_facts(:pyplot, tol=img_tol, skip = [2, 25, 30, 31]) -# end -# end @testset "UnicodePlots" begin @test unicodeplots() == Plots.UnicodePlotsBackend() @@ -43,68 +36,6 @@ end @test isa(display(p), Nothing) == true end -# The plotlyjs testimages return a connection error on travis: -# connect: connection refused (ECONNREFUSED) - -# @static if isinteractive() -# @testset "PlotlyJS" begin -# @test plotlyjs() == Plots.PlotlyJSBackend() -# @test backend() == Plots.PlotlyJSBackend() -# -# image_comparison_facts(:plotlyjs, -# skip=[ -# 2, # animation (skipped for speed) -# 25, -# 27, # (polar plots) takes very long / not working -# 30, -# 31, # animation (skipped for speed) -# ], -# tol=img_tol) -# end -# end - -# InspectDR returns that error on travis: -# ERROR: LoadError: InitError: Cannot open display: -# in Gtk.GLib.GError(::Gtk.##229#230) at /home/travis/.julia/v0.5/Gtk/src/GLib/gerror.jl:17 - -# @testset "InspectDR" begin -# @test inspectdr() == Plots.InspectDRBackend() -# @test backend() == Plots.InspectDRBackend() -# -# image_comparison_facts(:inspectdr, -# skip=[ -# 2, # animation -# 6, # heatmap not defined -# 10, # heatmap not defined -# 22, # contour not defined -# 23, # pie not defined -# 27, # polar plot not working -# 28, # heatmap not defined -# 31, # animation -# ], -# tol=img_tol) -# end - - -# @testset "Plotly" begin -# @test plotly() == Plots.PlotlyBackend() -# @test backend() == Plots.PlotlyBackend() -# -# # # until png generation is reliable on OSX, just test on linux -# # @static Sys.islinux() && image_comparison_facts(:plotly, only=[1,3,4,7,8,9,10,11,12,14,15,20,22,23,27], tol=img_tol) -# end - -# @testset "PlotlyJS" begin -# @test plotlyjs() == Plots.PlotlyJSBackend() -# @test backend() == Plots.PlotlyJSBackend() -# -# # as long as we can plot anything without error, it should be the same as Plotly -# image_comparison_facts(:plotlyjs, only=[1], tol=img_tol) -# end - - - - @testset "Axes" begin p = plot() axis = p.subplots[1][:xaxis] @@ -122,44 +53,3 @@ end @testset "NoFail" begin histogram([1, 0, 0, 0, 0, 0]) end - -# tests for preprocessing recipes - -# @testset "recipes" begin - - # user recipe - - # type T end - # @recipe function f(::T) - # line := (3,0.3,:red) - # marker := (20,0.5,:blue,:o) - # bg := :yellow - # rand(10) - # end - # plot(T()) - - # plot recipe - - # @recipe function f(::Type{Val{:hiplt}},plt::Plot) - # line := (3,0.3,:red) - # marker := (20,0.5,:blue,:o) - # t := :path - # bg:=:green - # () - # end - # plot(rand(10),t=:hiplt) - - # series recipe - - # @recipe function f(::Type{Val{:hi}},x,y,z) - # line := (3,0.3,:red) - # marker := (20,0.5,:blue,:o) - # t := :path - # () - # end - # plot(rand(10),t=:hiplt) - -# end - - -end # module From 379a320d2dcddbc172b44ff4d3c3eebe941119b2 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 9 May 2019 12:45:13 +0200 Subject: [PATCH 5/7] remove debug --- test/REQUIRE | 2 -- test/imgcomp.jl | 1 - 2 files changed, 3 deletions(-) diff --git a/test/REQUIRE b/test/REQUIRE index f357d290..c469edc8 100644 --- a/test/REQUIRE +++ b/test/REQUIRE @@ -3,9 +3,7 @@ ImageMagick Images LaTeXStrings RDatasets -Random StatsPlots -Test UnicodePlots VisualRegressionTests BinaryProvider diff --git a/test/imgcomp.jl b/test/imgcomp.jl index e61a47c9..206b8d50 100644 --- a/test/imgcomp.jl +++ b/test/imgcomp.jl @@ -75,7 +75,6 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = is expr = Expr(:block) append!(expr.args, example.exprs) eval(expr) - png(joinpath(@__DIR__, "testimgs", "test$idx.png")) png(fn) end From 8cd48bc6601e05a6567b487b7149e6d3109a2415 Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 9 May 2019 13:01:49 +0200 Subject: [PATCH 6/7] add back tomls --- .Project.toml => Project.toml | 4 ++-- REQUIRE | 16 ---------------- test/REQUIRE | 9 --------- 3 files changed, 2 insertions(+), 27 deletions(-) rename .Project.toml => Project.toml (90%) delete mode 100644 REQUIRE delete mode 100644 test/REQUIRE diff --git a/.Project.toml b/Project.toml similarity index 90% rename from .Project.toml rename to Project.toml index e59e581a..ef757d7e 100644 --- a/.Project.toml +++ b/Project.toml @@ -39,7 +39,6 @@ julia = "≥ 1.0.0" [extras] FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1" Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0" LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f" @@ -50,6 +49,7 @@ StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228" VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92" +BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232" [targets] -test = ["Pkg", "GR", "Test", "Random", "StatsPlots", "VisualRegressionTests", "LaTeXStrings", "Images", "ImageMagick", "RDatasets", "FileIO", "UnicodePlots"] +test = ["BinaryProvider", "Pkg", "Test", "Random", "StatsPlots", "VisualRegressionTests", "LaTeXStrings", "Images", "ImageMagick", "RDatasets", "FileIO", "UnicodePlots"] diff --git a/REQUIRE b/REQUIRE deleted file mode 100644 index bd236535..00000000 --- a/REQUIRE +++ /dev/null @@ -1,16 +0,0 @@ -julia 1.0 - -RecipesBase 0.6.0 -PlotUtils 0.4.1 -PlotThemes 0.1.3 -Reexport -GeometryTypes -FixedPointNumbers 0.3 -Measures -Showoff -StatsBase 0.14.0 -JSON -NaNMath -Requires -Contour -GR 0.39.0 diff --git a/test/REQUIRE b/test/REQUIRE deleted file mode 100644 index c469edc8..00000000 --- a/test/REQUIRE +++ /dev/null @@ -1,9 +0,0 @@ -FileIO -ImageMagick -Images -LaTeXStrings -RDatasets -StatsPlots -UnicodePlots -VisualRegressionTests -BinaryProvider From d0830b90be15d3d673f3c5bbc47ab4bdf4850b8c Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Thu, 9 May 2019 13:06:05 +0200 Subject: [PATCH 7/7] remove PlotReferenceImages --- Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Project.toml b/Project.toml index ef757d7e..d7e0a52d 100644 --- a/Project.toml +++ b/Project.toml @@ -13,7 +13,6 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e" NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" -PlotReferenceImages = "c5e800db-1e6b-5f72-915a-308d267b7a19" PlotThemes = "ccf2f8ad-2431-5c83-bf29-c5338b663b6a" PlotUtils = "995b91a9-d308-5afd-9ec6-746e21dbc043" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"