diff --git a/PlotsBase/src/examples.jl b/PlotsBase/src/examples.jl index 86c02710e..d11b4a342 100644 --- a/PlotsBase/src/examples.jl +++ b/PlotsBase/src/examples.jl @@ -1258,12 +1258,10 @@ _animation_examples = [02, 31] _backend_skips = Dict( :none => Int[], :pythonplot => Int[], - :gr => [25, 30], # TODO: add back when StatsPlots is available + :gr => Int[], :plotlyjs => [ 21, 24, - 25, - 30, 49, 50, 51, @@ -1314,6 +1312,10 @@ _backend_skips = Dict( ], ) _backend_skips[:plotly] = _backend_skips[:plotlyjs] +# 25 and 30 require StatsPlots, which doesn't support Plots v2 yet +for backend in keys(_backend_skips) + append!(_backend_skips[backend], [25, 30]) +end # --------------------------------------------------------------------------------- # replace `f(args...)` with `f(rng, args...)` for `f ∈ (rand, randn)` diff --git a/PlotsBase/test/runtests.jl b/PlotsBase/test/runtests.jl index 85b987e21..c154cc0ca 100644 --- a/PlotsBase/test/runtests.jl +++ b/PlotsBase/test/runtests.jl @@ -54,12 +54,8 @@ is_ci() || @eval using Gtk # see JuliaPlots/VisualRegressionTests.jl/issues/30 ref_name(i) = "ref" * lpad(i, 3, '0') -const blacklist = if VERSION.major == 1 && VERSION.minor ≥ 9 - [ - 25, - 30, # FIXME: remove, when StatsPlots supports Plots v2 - 41, - ] # FIXME: github.com/JuliaLang/julia/issues/47261 +const broken_examples = if Sys.isapple() + [50] # FIXME: https://github.com/jheinen/GR.jl/issues/550 else [] end diff --git a/PlotsBase/test/test_backends.jl b/PlotsBase/test/test_backends.jl index 6c83ac87b..b30fc6b99 100644 --- a/PlotsBase/test/test_backends.jl +++ b/PlotsBase/test/test_backends.jl @@ -66,7 +66,7 @@ is_pkgeval() || @testset "Backends" begin @test filesize(fn) > 1_000 end Sys.islinux() && for be ∈ TEST_BACKENDS - skip = vcat(PlotsBase._backend_skips[be], blacklist) + skip = vcat(PlotsBase._backend_skips[be], broken_examples) PlotsBase.test_examples(be; skip, callback, disp = is_ci(), strict = true) # `ci` display for coverage closeall() end diff --git a/PlotsBase/test/test_pgfplotsx.jl b/PlotsBase/test/test_pgfplotsx.jl index af51bde12..0d5f86068 100644 --- a/PlotsBase/test/test_pgfplotsx.jl +++ b/PlotsBase/test/test_pgfplotsx.jl @@ -436,7 +436,7 @@ with(:pgfplotsx) do @test PlotsBase.pgfx_sanitize_string("A string, with 2 punctuation chars.") == "A string, with 2 punctuation chars." @test PlotsBase.pgfx_sanitize_string("Interpolação polinomial") == - raw"Interpola$\textnormal{\c{c}}$$\textnormal{\~{a}}$o polinomial" + raw"Interpola$\textnormal{\c{c}}$$\tilde{a}$o polinomial" @test PlotsBase.pgfx_sanitize_string("∫∞ ∂x") == raw"$\int$$\infty$ $\partial$x" # special LaTeX characters diff --git a/PlotsBase/test/test_reference.jl b/PlotsBase/test/test_reference.jl index a03389b30..4e3133af0 100644 --- a/PlotsBase/test/test_reference.jl +++ b/PlotsBase/test/test_reference.jl @@ -105,6 +105,7 @@ end function image_comparison_facts( pkg::Symbol; skip = [], # skip these examples (int index) + broken = [], # known broken examples (int index) only = nothing, # limit to these examples (int index) debug = false, # print debug information ? sigma = [1, 1], # number of pixels to "blur" @@ -112,7 +113,11 @@ function image_comparison_facts( ) for i ∈ setdiff(1:length(PlotsBase._examples), skip) if only ≡ nothing || i in only - @test success(image_comparison_tests(pkg, i; debug, sigma, tol)) + if i ∈ broken + @test_broken success(image_comparison_tests(pkg, i; debug, sigma, tol)) + else + @test success(image_comparison_tests(pkg, i; debug, sigma, tol)) + end end end end @@ -141,7 +146,8 @@ end image_comparison_facts( :gr, tol = PLOTS_IMG_TOL, - skip = vcat(PlotsBase._backend_skips[:gr], blacklist), + skip = vcat(PlotsBase._backend_skips[:gr]), + broken = broken_examples, ) end end diff --git a/Project.toml b/Project.toml index cb4539f3b..36e36ba3f 100644 --- a/Project.toml +++ b/Project.toml @@ -9,8 +9,22 @@ PlotsBase = "c52230a3-c5da-43a3-9e85-260fcdfdc737" PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" +[weakdeps] +FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" +GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326" +IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a" +ImageInTerminal = "d8c32880-2388-543b-8c61-d9f865259254" +Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d" + +[extensions] +FileIOExt = "FileIO" +GeometryBasicsExt = "GeometryBasics" +IJuliaExt = "IJulia" +ImageInTerminalExt = "ImageInTerminal" +UnitfulExt = "Unitful" + [compat] -GR = "0, 1" +GR = "0.73, 1" PlotsBase = "0.1" PrecompileTools = "1" Reexport = "1"