fix unitful bug (#384)

* fix unitful bug

* update CI

Author: t-bltg

.github/workflows/ci.yml

@@ -18,9 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'  # latest LTS
+          - '1.10'  # latest LTS
           - '1'
-          - '~1.11.0-0'  # upcoming julia version, next `rc`
         experimental:
           - false
         os: [ubuntu-latest]

Project.toml

@@ -40,8 +40,9 @@ Requires = "1"
 SparseArrays = "1"
 StaticArrays = "1"
 StatsBase = "0.33, 0.34"
+Term = "2"
 Unitful = "1"
-julia = "1.6"
+julia = "1.10"
 
 [extensions]
 FreeTypeExt = ["FileIO", "FreeType"]

ext/UnitfulExt.jl

@@ -24,22 +24,28 @@ unitless(x::Quantity) = ustrip(x)  # NOTE: keep in sync with src/common.jl
 # lineplot
 function UnicodePlots.lineplot(
     x::AbstractVector{<:RealOrRealQuantity},
-    y::AbstractVector{<:Quantity};
+    y::AbstractVector{<:RealOrRealQuantity};
     unicode_exponent::Bool = KEYWORDS.unicode_exponent,
+    canvas::Type = KEYWORDS.canvas,
     xlabel = KEYWORDS.xlabel,
     ylabel = KEYWORDS.ylabel,
     kw...,
 )
+    pkw, okw = UnicodePlots.split_plot_kw(kw)
     x, ux = number_unit(x, unicode_exponent)
     y, uy = number_unit(y, unicode_exponent)
-    UnicodePlots.lineplot(
-        unitless.(x),
-        unitless.(y);
+    x_, y_ = unitless.(x), unitless.(y)
+    plot = Plot(
+        x_,
+        y_,
+        nothing,
+        canvas;
         xlabel = unit_label(xlabel, ux),
         ylabel = unit_label(ylabel, uy),
         unicode_exponent,
-        kw...,
+        pkw...,
     )
+    UnicodePlots.lineplot!(plot, x_, y_; okw...)
 end
 
 UnicodePlots.lineplot!(
@@ -53,22 +59,28 @@ UnicodePlots.lineplot!(
 # scatterplot
 function UnicodePlots.scatterplot(
     x::AbstractVector{<:RealOrRealQuantity},
-    y::AbstractVector{<:Quantity};
+    y::AbstractVector{<:RealOrRealQuantity};
     unicode_exponent::Bool = KEYWORDS.unicode_exponent,
+    canvas::Type = KEYWORDS.canvas,
     xlabel = KEYWORDS.xlabel,
     ylabel = KEYWORDS.ylabel,
     kw...,
 )
+    pkw, okw = UnicodePlots.split_plot_kw(kw)
     x, ux = number_unit(x, unicode_exponent)
     y, uy = number_unit(y, unicode_exponent)
-    UnicodePlots.scatterplot(
-        unitless.(x),
-        unitless.(y);
+    x_, y_ = unitless.(x), unitless.(y)
+    plot = Plot(
+        x_,
+        y_,
+        nothing,
+        canvas;
         xlabel = unit_label(xlabel, ux),
         ylabel = unit_label(ylabel, uy),
         unicode_exponent,
-        kw...,
+        pkw...,
     )
+    UnicodePlots.scatterplot!(plot, x_, y_; okw...)
 end
 
 UnicodePlots.scatterplot!(

test/runtests.jl

@@ -132,7 +132,7 @@ withenv("FORCE_COLOR" => "X") do  # JuliaPlots/UnicodePlots.jl/issues/134
     @timeit_include "tst_quality.jl"
 end
 
-# ~ 90s & 8.26GiB on 1.9
+# ~ 94s & 9.88GiB on 1.11
 print_timer(TO; compact = true, sortby = :firstexec)
 
 println("\n== end: testing with $(UnicodePlots.colormode())bit colormode ==")

test/tst_io.jl

@@ -68,8 +68,8 @@ sombrero(x, y) = 30sinc(√(x^2 + y^2) / π)
         if measure
             GC.enable(false)
             stats = @timed string(p; color = true)  # repeated !
-            @test stats.bytes / 1e3 < 500  # ~ 356kB on 1.10
-            @test stats.time * 1e3 < 0.8  # ~ 0.3ms on 1.10
+            @test stats.bytes / 1e3 < 500  # ~ 292kB on 1.11
+            @test stats.time * 1e3 < 0.8  # ~ 0.3ms on 1.11
             GC.enable(true)
         end
     end
@@ -80,8 +80,8 @@ sombrero(x, y) = 30sinc(√(x^2 + y^2) / π)
         if measure
             GC.enable(false)
             stats = @timed string(p; color = true)  # repeated !
-            @test stats.bytes / 1e3 < 160  # ~ 152kB on 1.10
-            @test stats.time * 1e3 < 0.5  # ~ 0.26ms on 1.10
+            @test stats.bytes / 1e3 < 160  # ~ 123kB on 1.11
+            @test stats.time * 1e3 < 0.5  # ~ 0.2ms on 1.11
             GC.enable(true)
         end
     end

test/tst_issues.jl

@@ -95,4 +95,16 @@
         p = scatterplot(x, y; ylim)
         show(devnull, p)
     end
+
+    @testset "Unitful dispatch (#383)" begin
+        p = lineplot(rand(1), rand(1) * u"m")
+        show(devnull, p)
+        p = lineplot(rand(1) * u"m", rand(1))
+        show(devnull, p)
+
+        p = scatterplot(rand(1), rand(1) * u"m")
+        show(devnull, p)
+        p = scatterplot(rand(1) * u"m", rand(1))
+        show(devnull, p)
+    end
 end