From 3d586922b21617e80f66ca51237ce5ba28134252 Mon Sep 17 00:00:00 2001 From: Spencer Lyon Date: Fri, 16 Jul 2021 14:01:15 +0000 Subject: [PATCH] remove Base.vect overload --- .devcontainer/devcontainer.json | 10 ++++++++++ Project.toml | 6 +++--- src/util.jl | 7 +++---- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..bb8eaaf8 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,10 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/microsoft/vscode-dev-containers/tree/v0.187.0/containers/julia +// See https://github.com/julia-vscode/julia-devcontainer/blob/master/Dockerfile for image contents +{ + "name": "Julia (Community)", + "image": "ghcr.io/julia-vscode/julia-devcontainer", + "extensions": ["julialang.language-julia"], + "postCreateCommand": "/julia-devcontainer-scripts/postcreate.jl", + "remoteUser": "vscode" +} diff --git a/Project.toml b/Project.toml index c946df98..b61515e4 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PlotlyJS" uuid = "f0f68f2c-4968-5e81-91da-67840de0976a" authors = ["Spencer Lyon "] -version = "0.16.4" +version = "0.17.0" [deps] Blink = "ad839575-38b3-5650-b840-f874b8c74a25" @@ -20,11 +20,11 @@ WebIO = "0f1e0344-ec1d-5b48-a673-e5cf874b6c29" Blink = "0.12" JSExpr = "0.5" JSON = "0.20, 0.21" -PlotlyBase = "0.6" +PlotlyBase = "0.6, 0.7" Reexport = "0.2, 1" Requires = "1.0" WebIO = "0.8" -julia = "1.3, 1.4, 1.5" +julia = "1.3, 1.4, 1.5, 1.6" [extras] Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/src/util.jl b/src/util.jl index d1371940..0f7a16f8 100644 --- a/src/util.jl +++ b/src/util.jl @@ -4,11 +4,10 @@ JSON.lower(sp::SyncPlot) = sp.plot PlotlyBase._is3d(p::SyncPlot) = _is3d(p.plot) # subplot methods on syncplot -Base.hcat(sps::SyncPlot...) = SyncPlot(hcat([sp.plot for sp in sps]...)) -Base.vcat(sps::SyncPlot...) = SyncPlot(vcat([sp.plot for sp in sps]...)) -Base.vect(sps::SyncPlot...) = vcat(sps...) +Base.hcat(sps::SyncPlot...) = SyncPlot(hcat(Plot[sp.plot for sp in sps]...)) +Base.vcat(sps::SyncPlot...) = SyncPlot(vcat(Plot[sp.plot for sp in sps]...)) Base.hvcat(rows::Tuple{Vararg{Int}}, sps::SyncPlot...) = - SyncPlot(hvcat(rows, [sp.plot for sp in sps]...)) + SyncPlot(hvcat(rows, Plot[sp.plot for sp in sps]...)) function PlotlyBase.add_recession_bands!(p::SyncPlot; kwargs...) new_shapes = add_recession_bands!(p.plot; kwargs...)