From adab86918f4bb0a2c874b7518a89c6492aa8cc2c Mon Sep 17 00:00:00 2001
From: = <=>
Date: Sun, 17 Jan 2021 11:54:05 +0100
Subject: [PATCH 1/3] fix NamedTuple syntax for julia <v1.5

---
 src/conversions.jl    | 2 +-
 src/figureplotting.jl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conversions.jl b/src/conversions.jl
index d9c54bedd..19944f2b1 100644
--- a/src/conversions.jl
+++ b/src/conversions.jl
@@ -764,7 +764,7 @@ function convert_gaps(gaps)
   else
       throw(ArgumentError(error_msg))
   end
-  (; dot_gap, dash_gap)
+  (dot_gap = dot_gap, dash_gap = dash_gap)
 end
 
 function convert_attribute(f::Symbol, ::key"frames")
diff --git a/src/figureplotting.jl b/src/figureplotting.jl
index 21e94c647..d6dbeb696 100644
--- a/src/figureplotting.jl
+++ b/src/figureplotting.jl
@@ -13,7 +13,7 @@ Base.show(io::IO, ::MIME"text/plain", fap::FigureAxisPlot) = print(io, "FigureAx
 Base.iterate(fap::FigureAxisPlot, args...) = iterate((fap.figure, fap.axis, fap.plot), args...)
 Base.iterate(ap::AxisPlot, args...) = iterate((ap.axis, ap.plot), args...)
 
-function plot(P::PlotFunc, args...; axis = (;), figure = (;), kw_attributes...)
+function plot(P::PlotFunc, args...; axis = NamedTuple(), figure = NamedTuple(), kw_attributes...)
     # scene_attributes = extract_scene_attributes!(attributes)
     fig = Figure(; figure...)
 
@@ -39,7 +39,7 @@ function plot!(P::PlotFunc, args...; kw_attributes...)
     plot!(P, ax, args...; kw_attributes...)
 end
 
-function plot(P::PlotFunc, fp::FigurePosition, args...; axis = (;), kwargs...)
+function plot(P::PlotFunc, fp::FigurePosition, args...; axis = NamedTuple(), kwargs...)
 
     @assert isempty(contents(fp.gp, exact = true))
 
@@ -67,7 +67,7 @@ function plot!(P::PlotFunc, fp::FigurePosition, args...; kwargs...)
     plot!(P, ax, args...; kwargs...)
 end
 
-function plot(P::PlotFunc, fsp::FigureSubposition, args...; axis = (;), kwargs...)
+function plot(P::PlotFunc, fsp::FigureSubposition, args...; axis = NamedTuple(), kwargs...)
 
     fig = get_figure(fsp)
 

From c5984f35339c6ec813b3bb3a38b1799d025ec06c Mon Sep 17 00:00:00 2001
From: Frederic Freyer <frederic481994@hotmail.de>
Date: Sun, 17 Jan 2021 12:14:00 +0100
Subject: [PATCH 2/3] add julia 1.4 test target

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b4a7f2b7..ebd0fd93a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         version:
           - '1' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
+          - '1.4'
           - 'nightly'
         os:
           - ubuntu-latest

From 2b70bccf74a776ccc2412c13d524ce42755aab1c Mon Sep 17 00:00:00 2001
From: = <=>
Date: Sun, 17 Jan 2021 13:35:39 +0100
Subject: [PATCH 3/3] change tuples to Vec3f0/Vec4f0 for <v1.5 compat

---
 src/basic_recipes/error_and_rangebars.jl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/basic_recipes/error_and_rangebars.jl b/src/basic_recipes/error_and_rangebars.jl
index 71967298a..3f55b0678 100644
--- a/src/basic_recipes/error_and_rangebars.jl
+++ b/src/basic_recipes/error_and_rangebars.jl
@@ -57,48 +57,48 @@ end
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, x, y, error_both)
     xyerr = broadcast(x, y, error_both) do x, y, e
-        (x, y, e, e)
+        Vec4f0(x, y, e, e)
     end
     (xyerr,)
 end
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, x, y, error_low, error_high)
-    xyerr = broadcast(tuple, x, y, error_low, error_high)
+    xyerr = broadcast(Vec4f0, x, y, error_low, error_high)
     (xyerr,)
 end
 
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, x, y, error_low_high::AbstractVector{<:VecTypes{2}})
     xyerr = broadcast(x, y, error_low_high) do x, y, (el, eh)
-        (x, y, el, eh)
+        Vec4f0(x, y, el, eh)
     end
     (xyerr,)
 end
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, xy::AbstractVector{<:VecTypes{2}}, error_both)
     xyerr = broadcast(xy, error_both) do (x, y), e
-        (x, y, e, e)
+        Vec4f0(x, y, e, e)
     end
     (xyerr,)
 end
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, xy::AbstractVector{<:VecTypes{2}}, error_low, error_high)
     xyerr = broadcast(xy, error_low, error_high) do (x, y), el, eh
-        (x, y, el, eh)
+        Vec4f0(x, y, el, eh)
     end
     (xyerr,)
 end
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, xy::AbstractVector{<:VecTypes{2}}, error_low_high::AbstractVector{<:VecTypes{2}})
     xyerr = broadcast(xy, error_low_high) do (x, y), (el, eh)
-        (x, y, el, eh)
+        Vec4f0(x, y, el, eh)
     end
     (xyerr,)
 end
 
 function AbstractPlotting.convert_arguments(::Type{<:Errorbars}, xy_error_both::AbstractVector{<:VecTypes{3}})
     xyerr = broadcast(xy_error_both) do (x, y, e)
-        (x, y, e, e)
+        Vec4f0(x, y, e, e)
     end
     (xyerr,)
 end
@@ -106,13 +106,13 @@ end
 ### conversions for rangebars
 
 function AbstractPlotting.convert_arguments(::Type{<:Rangebars}, val, low, high)
-    val_low_high = broadcast(tuple, val, low, high) 
+    val_low_high = broadcast(Vec3f0, val, low, high) 
     (val_low_high,)
 end
 
 function AbstractPlotting.convert_arguments(::Type{<:Rangebars}, val, low_high)
     val_low_high = broadcast(val, low_high) do val, (low, high)
-        (val, low, high)
+        Vec3f0(val, low, high)
     end
     (val_low_high,)
 end