Skip to content

Commit

Permalink
FreeTypeAbstraction compat - Aqua test - fix ambiguity (#282)
Browse files Browse the repository at this point in the history
  • Loading branch information
t-bltg authored Jul 19, 2022
1 parent 01bc7b1 commit d006e7b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ColorTypes = "0.11"
Contour = "0.5 - 0.6"
Crayons = "4.1"
FileIO = "1"
FreeTypeAbstraction = "0.9"
FreeTypeAbstraction = "0.9 - 0.10"
LazyModules = "0.3"
MarchingCubes = "0.1"
NaNMath = "0.3, 1"
Expand All @@ -39,6 +39,7 @@ Unitful = "1"
julia = "1.6"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
Expand All @@ -47,4 +48,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"

[targets]
test = ["ImageMagick", "Random", "ReferenceTests", "StableRNGs", "Test", "TimerOutputs"]
test = ["Aqua", "ImageMagick", "Random", "ReferenceTests", "StableRNGs", "Test", "TimerOutputs"]
4 changes: 2 additions & 2 deletions src/graphics/bargraphics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct BarplotGraphics{R<:Number,XS<:Function} <: GraphicsArea
visible::Bool,
color::Union{UserColorType,AbstractVector},
maximum::Union{Nothing,Number},
symbols::Union{NTuple{<:Any,S},AbstractVector{S}},
symbols::AbstractVector{S},
xscale,
) where {R<:Number,S<:Union{AbstractChar,AbstractString}}
for s symbols
Expand Down Expand Up @@ -54,7 +54,7 @@ BarplotGraphics(
color::Union{UserColorType,AbstractVector} = :green,
maximum::Union{Nothing,Number} = nothing,
symbols = KEYWORDS.symbols,
) = BarplotGraphics(bars, char_width, visible, color, maximum, symbols, xscale)
) = BarplotGraphics(bars, char_width, visible, color, maximum, collect(symbols), xscale)

function addrow!(
c::BarplotGraphics{R},
Expand Down
2 changes: 2 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import Dates: Date, Day
import Random: seed!
import ColorSchemes
import FileIO
import Aqua

using ReferenceTests
using LinearAlgebra
Expand Down Expand Up @@ -120,6 +121,7 @@ withenv("FORCE_COLOR" => "X") do # JuliaPlots/UnicodePlots.jl/issues/134
@timeit_include "tst_volume.jl"
@timeit_include "tst_surfaceplot.jl"
@timeit_include "tst_isosurface.jl"
@timeit_include "tst_quality.jl"
end

# ~ 166s & 15.0GiB on 1.7
Expand Down
5 changes: 5 additions & 0 deletions test/tst_quality.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@testset "Aqua" begin
# JuliaTesting/Aqua.jl/issues/77
Aqua.test_all(UnicodePlots, ambiguities = false)
Aqua.test_ambiguities(UnicodePlots)
end

0 comments on commit d006e7b

Please sign in to comment.