fix widen removal (#520)

Author: t-bltg

.github/workflows/CI.yml

@@ -1,11 +1,19 @@
 name: CI
+
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
+
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   test:
+    env:
+      GKS_ENCODING: "utf8"
+      GKSwstype: "nul"
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.version == 'nightly' }}

src/marginalhist.jl

@@ -7,8 +7,14 @@
     bns = get(plotattributes, :bins, :auto)
     scale = get(plotattributes, :scale, :identity)
     edges1, edges2 = Plots._hist_edges((x, y), bns)
-    xlims, ylims = Plots.widen(Plots.ignorenan_extrema(x)..., scale),
-    Plots.widen(Plots.ignorenan_extrema(y)..., scale)
+    xlims, ylims = map(
+        x -> Plots.scale_lims(
+            Plots.ignorenan_extrema(x)...,
+            Plots.default_widen_factor,
+            scale,
+        ),
+        (x, y),
+    )
 
     # set up the subplots
     legend --> false

src/marginalscatter.jl

@@ -5,8 +5,14 @@
     i = isfinite.(x) .& isfinite.(y)
     x, y = x[i], y[i]
     scale = get(plotattributes, :scale, :identity)
-    xlims, ylims = Plots.widen(Plots.ignorenan_extrema(x)..., scale),
-    Plots.widen(Plots.ignorenan_extrema(y)..., scale)
+    xlims, ylims = map(
+        x -> Plots.scale_lims(
+            Plots.ignorenan_extrema(x)...,
+            Plots.default_widen_factor,
+            scale,
+        ),
+        (x, y),
+    )
 
     # set up the subplots
     legend --> false

test/runtests.jl

@@ -141,9 +141,10 @@ end
 end
 
 @testset "errorline" begin
+    rng = StableRNG(1337)
     x = 1:10
     # Test for floats
-    y = rand(10, 100) .* collect(1:2:20)
+    y = rand(rng, 10, 100) .* collect(1:2:20)
     @test errorline(1:10, y)[1][1][:x] == x # x-input
     @test all(
         round.(errorline(1:10, y)[1][1][:y], digits = 3) .==
@@ -161,3 +162,15 @@ end
         round.(std(y, dims = 2), digits = 3),
     )
 end
+
+@testset "marginalhist" begin
+    rng = StableRNG(1337)
+    pl = marginalhist(rand(rng, 100), rand(rng, 100))
+    @test show(devnull, pl) isa Nothing
+end
+
+@testset "marginalscatter" begin
+    rng = StableRNG(1337)
+    pl = marginalscatter(rand(rng, 100), rand(rng, 100))
+    @test show(devnull, pl) isa Nothing
+end