minor bump [skip ci]

layouts fixed

.github/workflows/ci.yml

@@ -11,27 +11,60 @@ defaults:
 jobs:
   CI:
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    
     env:
       GKS_ENCODING: "utf8"
 
+    name: Julia ${{ matrix.julia_version }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       fail-fast: false
       matrix:
         julia_version:
+          - '1.3'
+          # - '1' (is included automatically)
           - 'nightly'
-          - '1'
-          - '1.0'
         os:
           - ubuntu-latest
           - windows-latest
           - macos-latest
         arch:
           - x64
-        #  - x32
+          # - x86
+        allow-failure: [false]
+        include:
+          ## allow failures on nightly
+          - version: 'nightly'
+            os: ubuntu-latest
+            arch: x64
+            allow-failure: true
+          - version: 'nightly'
+            os: macOS-latest
+            arch: x64
+            allow-failure: true
+          - version: 'nightly'
+            os: windows-latest
+            arch: x64
+            allow-failure: true
+          ## allow failures for julia 1.3 windows (test_images work but differ)
+          - version: '1.3'
+            os: windows-latest
+            arch: x64
+            allow-failure: true
+        ## if we want to run tests on x86:
+        #   - version: 'nightly'
+        #     os: ubuntu-latest
+        #     arch: x86
+        #     allow-failure: true
+        #   - version: 'nightly'
+        #     os: windows-latest
+        #     arch: x86
+        #     allow-failure: true
+        # exclude:
+        #   - os: macOS-latest
+        #     arch: x86
     steps:
-      
+
       # Setup environment
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@latest
@@ -42,22 +75,20 @@ jobs:
         env:
           cache-name: cache-artifacts
         with:
-          path: ~/.julia/artifacts 
+          path: ~/.julia/artifacts
           key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
           restore-keys: |
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
-          
-      # OS Dependencies            
+
+      ## maybe required if we ever want to run graphical tests for plotly
+      # OS Dependencies
       # - name: Ubuntu OS dependencies
       #   if: startsWith(matrix.os,'ubuntu')
       #   run: |
       #    ./test/install_wkhtmltoimage.sh
-  
-      #  at-spi2-core, libgtk-3-dev,  libgtk-3-0, and xvfb  are already installed: https://github.com/actions/virtual-environments/blob/master/images/linux/scripts/installers/basic.sh  
 
-  
       # TESTCMD
       - name: Default TESTCMD
         run: echo ::set-env name=TESTCMD::"julia"
@@ -68,11 +99,11 @@ jobs:
       # Julia Deoendencies
       - name: Install Julia dependencies
         uses: julia-actions/julia-buildpkg@latest
-        
+
       # Run tests
       - name: Run Graphical test
         run:  $TESTCMD --project -e 'using Pkg; Pkg.test(coverage=true);'
-          
+
       - name: Codecov
         uses: julia-actions/julia-uploadcodecov@latest
         env:

Project.toml

@@ -1,7 +1,7 @@
 name = "Plots"
 uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 author = ["Tom Breloff (@tbreloff)"]
-version = "1.4.2"
+version = "1.5.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -10,6 +10,7 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 FFMPEG = "c87230d0-a227-11e9-1b43-d7ebe4e7570a"
 FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 GR = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
+GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -35,11 +36,12 @@ Contour = "0.5"
 FFMPEG = "0.2, 0.3"
 FixedPointNumbers = "0.6, 0.7, 0.8"
 GR = "0.46, 0.47, 0.48, 0.49, 0.50"
+GeometryBasics = "0.2"
 GeometryTypes = "0.7, 0.8"
 JSON = "0.21"
 Measures = "0.3"
 NaNMath = "0.3"
-PGFPlotsX = "1.2.0 - 1.2.6"
+PGFPlotsX = "1.2.0"
 PlotThemes = "2"
 PlotUtils = "1"
 RecipesBase = "1"
@@ -47,10 +49,12 @@ RecipesPipeline = "0.1.7"
 Reexport = "0.2"
 Requires = "1"
 Showoff = "0.3.1"
+StableRNGs = "0.1.1"
 StatsBase = "0.32, 0.33"
-julia = "1.4"
+julia = "1.3"
 
 [extras]
+Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 Gtk = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
 HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
@@ -60,6 +64,7 @@ LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
 PGFPlotsX = "8314cec4-20b6-5062-9cdb-752b83310925"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
+StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
@@ -67,4 +72,4 @@ UnicodePlots = "b8865327-cd53-5732-bb35-84acbb429228"
 VisualRegressionTests = "34922c18-7c2a-561c-bac1-01e79b2c4c92"
 
 [targets]
-test = ["FileIO", "Gtk", "ImageMagick", "Images", "LibGit2", "OffsetArrays", "PGFPlotsX", "HDF5", "RDatasets", "StaticArrays", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]
+test = ["Distributions", "FileIO", "Gtk", "ImageMagick", "Images", "LibGit2", "OffsetArrays", "PGFPlotsX", "HDF5", "RDatasets", "StableRNGs", "StaticArrays", "StatsPlots", "Test", "UnicodePlots", "VisualRegressionTests"]

src/Plots.jl

@@ -8,7 +8,7 @@ const _current_plots_version = VersionNumber(split(first(filter(line -> occursin
 
 using Reexport
 
-import GeometryTypes
+import GeometryTypes, GeometryBasics
 using Dates, Printf, Statistics, Base64, LinearAlgebra, Random
 import SparseArrays: AbstractSparseMatrix, findnz
 

src/backends/gr.jl

@@ -752,7 +752,10 @@ function gr_convert_sci_tick_label(label)
         base, exponent = caret_split
         label = "$base^{$exponent}"
     end
-    convert_sci_unicode(label)
+    if occursin("×10", label)
+        label = string(replace(label, "×10" => "×10^{"), "}")
+    end
+    label
 end
 
 function gr_axis_height(sp, axis)

src/backends/plotly.jl

@@ -335,18 +335,32 @@ end
 function plotly_legend_pos(pos::Symbol)
     xleft = 0.07
     ybot = 0.07
-    ycenter = 0.52
+    ytop = 1.0
     xcenter = 0.55
+    ycenter = 0.52    
+    center = 0.5
+    youtertop = 1.1
+    youterbot = -0.15
+    xouterright = 1.05
+    xouterleft = -0.15
     plotly_legend_position_mapping = (
         right       = (coords = [1.0, ycenter], xanchor = "right", yanchor = "middle"),
         left        = (coords = [xleft, ycenter], xanchor = "left",  yanchor = "middle"),
-        top         = (coords = [xcenter, 1.0], xanchor = "center",  yanchor = "top"),
+        top         = (coords = [xcenter, ytop], xanchor = "center",  yanchor = "top"),
         bottom      = (coords = [xcenter, ybot], xanchor = "center",  yanchor = "bottom"),
         bottomleft  = (coords = [xleft, ybot], xanchor = "left",  yanchor = "bottom"),
         bottomright = (coords = [1.0, ybot], xanchor = "right", yanchor = "bottom"),
         topright    = (coords = [1.0, 1.0], xanchor = "right", yanchor = "top"),
         topleft     = (coords = [xleft, 1.0], xanchor = "left",  yanchor = "top"),
-        default     = (coords = [1.02, 1.0], xanchor = "auto",  yanchor = "auto")
+        outertop =(coords = [center, youtertop ], xanchor = "upper",  yanchor = "middle"), 
+        outerbottom =(coords = [center, youterbot], xanchor = "lower",  yanchor = "middle"), 
+        outerleft =(coords = [xouterleft, center], xanchor = "left",  yanchor = "top"), 
+        outerright =(coords = [xouterright, center], xanchor = "right",  yanchor = "top"),
+        outertopleft =(coords = [xouterleft, ytop], xanchor = "upper",  yanchor = "left"),
+        outertopright = (coords = [xouterright, ytop], xanchor = "upper",  yanchor = "right"),
+        outerbottomleft =(coords = [xouterleft, ybot], xanchor = "lower",  yanchor = "left"),
+        outerbottomright =(coords = [xouterright, ybot], xanchor = "lower",  yanchor = "right"),
+        default = (coords = [1.0, 1.0], xanchor = "auto",  yanchor = "auto")
     )
 
     legend_position = get(plotly_legend_position_mapping, pos, plotly_legend_position_mapping.default)

src/backends/pyplot.jl

@@ -437,18 +437,19 @@ function py_add_series(plt::Plot{PyPlotBackend}, series::Series)
             #     end
             #     push!(handles, handle)
             # else
-                for (i, rng) in enumerate(iter_segments(series))
-                    handle = ax."plot"((arg[rng] for arg in xyargs)...;
-                        label = i == 1 ? series[:label] : "",
-                        zorder = series[:series_plotindex],
-                        color = py_color(single_color(get_linecolor(series, clims, i)), get_linealpha(series, i)),
-                        linewidth = py_thickness_scale(plt, get_linewidth(series, i)),
-                        linestyle = py_linestyle(st, get_linestyle(series, i)),
-                        solid_capstyle = "round",
-                        drawstyle = py_stepstyle(st)
-                    )[1]
-                    push!(handles, handle)
-                end
+            for (i, rng) in enumerate(iter_segments(series))
+                handle = ax."plot"((arg[rng] for arg in xyargs)...;
+                                   label = i == 1 ? series[:label] : "",
+                                   zorder = series[:series_plotindex],
+                                   color = py_color(single_color(get_linecolor(series, clims, i)), get_linealpha(series, i)),
+                                   linewidth = py_thickness_scale(plt, get_linewidth(series, i)),
+                                   linestyle = py_linestyle(st, get_linestyle(series, i)),
+                                   solid_capstyle = "butt",
+                                   dash_capstyle = "butt",
+                                   drawstyle = py_stepstyle(st)
+                                   )[1]
+                push!(handles, handle)
+            end
             # end
 
             a = series[:arrow]
@@ -1263,7 +1264,7 @@ function _update_min_padding!(sp::Subplot{PyPlotBackend})
     # optionally add the width of colorbar labels and colorbar to rightpad
     if haskey(sp.attr, :cbar_ax)
         bb = py_bbox(sp.attr[:cbar_handle]."ax"."get_yticklabels"())
-        sp.attr[:cbar_width] = _cbar_width + width(bb) + (sp[:colorbar_title] == "" ? 0px : 30px)
+        sp.attr[:cbar_width] = width(bb) + (sp[:colorbar_title] == "" ? 0px : 30px)
         rightpad = rightpad + sp.attr[:cbar_width]
     end
 
@@ -1360,14 +1361,17 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                             edgecolor = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
                             facecolor = py_color(single_color(get_fillcolor(series, clims)), get_fillalpha(series)),
                             linewidth = py_thickness_scale(plt, clamp(get_linewidth(series), 0, 5)),
-                            linestyle = py_linestyle(series[:seriestype], get_linestyle(series))
+                            linestyle = py_linestyle(series[:seriestype], get_linestyle(series)),
+                            capstyle = "butt"
                         )
                     elseif series[:seriestype] in (:path, :straightline, :scatter, :steppre, :steppost)
                         hasline = get_linewidth(series) > 0
-                        PyPlot.plt."Line2D"((0,1),(0,0),
+                        PyPlot.plt."Line2D"((0, 1),(0,0),
                             color = py_color(single_color(get_linecolor(series, clims)), get_linealpha(series)),
                             linewidth = py_thickness_scale(plt, hasline * sp[:legendfontsize] / 8),
                             linestyle = py_linestyle(:path, get_linestyle(series)),
+                            solid_capstyle = "butt", solid_joinstyle = "miter",
+                            dash_capstyle = "butt", dash_joinstyle = "miter",
                             marker = py_marker(_cycle(series[:markershape], 1)),
                             markersize = py_thickness_scale(plt, 0.8 * sp[:legendfontsize]),
                             markeredgecolor = py_color(single_color(get_markerstrokecolor(series)), get_markerstrokealpha(series)),
@@ -1393,7 +1397,8 @@ function py_add_legend(plt::Plot, sp::Subplot, ax)
                 facecolor = py_color(sp[:background_color_legend]),
                 edgecolor = py_color(sp[:foreground_color_legend]),
                 framealpha = alpha(plot_color(sp[:background_color_legend])),
-                fancybox = false  # makes the legend box square
+                fancybox = false,  # makes the legend box square
+                borderpad=0.8      # to match GR legendbox
             )
             frame = leg."get_frame"()
             frame."set_linewidth"(py_thickness_scale(plt, 1))

src/examples.jl

@@ -983,6 +983,17 @@ const _examples = PlotExample[
             end,
         ],
     ),
+    PlotExample(
+        "Tuples and `Point`s as data",
+        "",
+        [quote
+            using GeometryBasics
+            using Distributions
+            d = MvNormal([1.0 0.75; 0.75 2.0])
+            plot([(1,2),(3,2),(2,1),(2,3)])
+            scatter!(Point2.(eachcol(rand(d,1000))), alpha=0.25)
+        end]
+    ),
 ]
 
 # Some constants for PlotDocs and PlotReferenceImages

src/layouts.jl

@@ -345,10 +345,8 @@ end
 # recursively compute the bounding boxes for the layout and plotarea (relative to canvas!)
 function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0mm,0mm])
     nr, nc = size(layout)
-
     # # create a matrix for each minimum padding direction
     # _update_min_padding!(layout)
-
     minpad_left   = map(leftpad,   layout.grid)
     minpad_top    = map(toppad,    layout.grid)
     minpad_right  = map(rightpad,  layout.grid)
@@ -407,10 +405,10 @@ function update_child_bboxes!(layout::GridLayout, minimum_perimeter = [0mm,0mm,0
         # this is the minimum perimeter as decided by this child's parent, so that
         # all children on this border have the same value
         min_child_perimeter = [
-            c == 1  ? layout.minpad[1] : 0mm,
-            r == 1  ? layout.minpad[2] : 0mm,
-            c == nc ? layout.minpad[3] : 0mm,
-            r == nr ? layout.minpad[4] : 0mm
+            c == 1  ? layout.minpad[1] : pad_left[c],
+            r == 1  ? layout.minpad[2] : pad_top[r],
+            c == nc ? layout.minpad[3] : pad_right[c],
+            r == nr ? layout.minpad[4] : pad_bottom[r]
         ]
 
         # recursively update the child's children

src/recipes.jl

@@ -1309,10 +1309,10 @@ end
 end
 
 # --------------------------------------------------------------------
-# Lists of tuples and GeometryTypes.Points
+# Lists of tuples and GeometryBasics.Points
 # --------------------------------------------------------------------
-@recipe f(v::AVec{<:GeometryTypes.Point}) = RecipesPipeline.unzip(v)
-@recipe f(p::GeometryTypes.Point) = [p]
+@recipe f(v::AVec{<:_Point}) = RecipesPipeline.unzip(v)
+@recipe f(p::_Point) = [p]
 
 # Special case for 4-tuples in :ohlc series
 @recipe f(xyuv::AVec{<:Tuple{R1, R2, R3, R4}}) where {R1, R2, R3, R4} =

src/utils.jl

@@ -149,16 +149,17 @@ makevec(v::T) where {T} = T[v]
 maketuple(x::Real)                     = (x,x)
 maketuple(x::Tuple{T,S}) where {T,S} = x
 
+const _Point{N,T} = Union{GeometryTypes.Point{N,T}, GeometryBasics.Point{N,T}}
 for i in 2:4
     @eval begin
         RecipesPipeline.unzip(v::Union{AVec{<:Tuple{Vararg{T,$i} where T}},
-                   AVec{<:GeometryTypes.Point{$i}}}) = $(Expr(:tuple, (:([t[$j] for t in v]) for j=1:i)...))
+                   AVec{<:_Point{$i}}}) = $(Expr(:tuple, (:([t[$j] for t in v]) for j=1:i)...))
     end
 end
 
-RecipesPipeline.unzip(v::Union{AVec{<:GeometryTypes.Point{N}},
+RecipesPipeline.unzip(v::Union{AVec{<:_Point{N}},
                AVec{<:Tuple{Vararg{T,N} where T}}}) where N = error("$N-dimensional unzip not implemented.")
-RecipesPipeline.unzip(v::Union{AVec{<:GeometryTypes.Point},
+RecipesPipeline.unzip(v::Union{AVec{<:_Point},
                AVec{<:Tuple}}) = error("Can't unzip points of different dimensions.")
 
 # given 2-element lims and a vector of data x, widen lims to account for the extrema of x

test/imgcomp.jl

@@ -1,5 +1,21 @@
 import Plots._current_plots_version
 
+# replace `f(args...)` with `f(rng, args...)` for `f ∈ (rand, randn)`
+function replace_rand!(ex) end
+function replace_rand!(ex::Expr)
+   for arg in ex.args
+       replace_rand!(arg)
+   end
+   if ex.head === :call && ex.args[1] ∈ (:rand, :randn)
+       pushfirst!(ex.args, ex.args[1])
+       ex.args[2] = :rng
+   end
+end
+function fix_rand!(ex)
+    replace_rand!(ex)
+    pushfirst!(ex.args[1].args, :(rng = StableRNG(1234)))
+end
+
 function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !is_ci(), sigma = [1,1], tol = 1e-2)
     Plots._debugMode.on = debug
     example = Plots._examples[idx]
@@ -8,8 +24,6 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !i
     backend(pkg)
     backend()
     default(size=(500,300))
-    # ensure consistent results
-    Random.seed!(1234)
 
     fn = "ref$idx.png"
     reffn = reference_file(pkg, idx, _current_plots_version)
@@ -19,6 +33,7 @@ function image_comparison_tests(pkg::Symbol, idx::Int; debug = false, popup = !i
     func = (fn, idx) -> begin
         expr = Expr(:block)
         append!(expr.args, example.exprs)
+        fix_rand!(expr)
         eval(expr)
         png(fn)
     end

test/runtests.jl

@@ -2,11 +2,12 @@ import ImageMagick
 using VisualRegressionTests
 using Plots
 using Random
+using StableRNGs
 using Test
 using FileIO
 using Gtk
 using LibGit2
-using GeometryTypes
+import GeometryTypes, GeometryBasics
 using Dates
 
 include("test_axes.jl")
@@ -178,6 +179,7 @@ end
     for z in zipped
         @test isequal(collect(zip(Plots.unzip(z)...)), z)
         @test isequal(collect(zip(Plots.unzip(GeometryTypes.Point.(z))...)), z)
+        @test isequal(collect(zip(Plots.unzip(GeometryBasics.Point.(z))...)), z)
     end
     op1 = Plots.process_clims((1.0, 2.0))
     op2 = Plots.process_clims((1, 2.0))