Add Reexport and Compat dependencies. Some julia 0.7 deprecation fixes

REQUIRE

@@ -4,3 +4,5 @@ Blink 0.3.3
 DocStringExtensions
 Requires
 PlotlyBase 0.1.2
+Reexport 0.2.0
+Compat 0.69

deps/find_attr_groups.jl

@@ -1,17 +1,18 @@
 module AttrGroups
 
 using JSON
+using Compat: AbstractDict
 
 _symbol_dict(x) = x
-_symbol_dict(d::Associative) =
+_symbol_dict(d::AbstractDict) =
     Dict{Symbol,Any}([(Symbol(k), _symbol_dict(v)) for (k, v) in d])
 
 function main()
 
     data = _symbol_dict(JSON.parsefile(joinpath(@__DIR__, "plotschema.json")))
 
     nms = Set{Symbol}()
-    function add_to_names!(d::Associative)
+    function add_to_names!(d::AbstractDict)
         map(add_to_names!, keys(d))
         map(add_to_names!, values(d))
         nothing

deps/make_schema_docs.jl

@@ -1,11 +1,12 @@
 module PlotlyJSSchemaDocsGenerator
 
-using Base.Markdown: MD
+using Markdown: MD
 using JSON
+using Compat: AbstractDict
 
 # methods to re-construct a plot from JSON
 _symbol_dict(x) = x
-_symbol_dict(d::Associative) =
+_symbol_dict(d::AbstractDict) =
     Dict{Symbol,Any}([(Symbol(k), _symbol_dict(v)) for (k, v) in d])
 
 struct SchemaAttribute
@@ -16,10 +17,10 @@ struct SchemaAttribute
     children::Nullable{Dict{Symbol,SchemaAttribute}}
 end
 
-function SchemaAttribute(d::Associative)
+function SchemaAttribute(d::AbstractDict)
     role = pop!(d, :role, "")
 
-    if role == "object" || any(_x->isa(_x, Associative), values(d))
+    if role == "object" || any(_x->isa(_x, AbstractDict), values(d))
         # description and valtype ire empty, but children is not
         _desc = pop!(d, :description, "")
         desc = isempty(_desc) ? Nullable{MD}() : Nullable{MD}(MD(_desc))
@@ -29,7 +30,7 @@ function SchemaAttribute(d::Associative)
         end
         kids = Dict{Symbol,SchemaAttribute}()
         for (a_k, v) in d
-            isa(v, Associative) || continue
+            isa(v, AbstractDict) || continue
             kids[a_k] = SchemaAttribute(v)
         end
         children = Nullable{Dict{Symbol,SchemaAttribute}}(kids)
@@ -58,11 +59,11 @@ struct TraceSchema
     attributes::Dict{Symbol,SchemaAttribute}
 end
 
-function TraceSchema(nm::Symbol, d::Associative, attrs_key=:attributes)
+function TraceSchema(nm::Symbol, d::AbstractDict, attrs_key=:attributes)
     _attrs = filter!((k, v) -> k != :uid && k != :type, d[attrs_key])
     attrs = Dict{Symbol,SchemaAttribute}()
     for (k, v) in _attrs
-        isa(v, Associative) || continue
+        isa(v, AbstractDict) || continue
         attrs[k] = SchemaAttribute(v)
     end
     desc = get(d, :description, "")

docs/basics.md

@@ -32,12 +32,12 @@ two abstract types):
 abstract AbstractTrace
 abstract AbstractLayout
 
-type GenericTrace{T<:Associative{Symbol,Any}} <: AbstractTrace
+type GenericTrace{T<:AbstractDict{Symbol,Any}} <: AbstractTrace
     kind::ASCIIString
     fields::T
 end
 
-type Layout{T<:Associative{Symbol,Any}} <: AbstractLayout
+type Layout{T<:AbstractDict{Symbol,Any}} <: AbstractLayout
     fields::T
 end
 

docs/building_traces_layouts.md

@@ -9,13 +9,13 @@ A `Plot` instance will have a vector of `trace`s. These should each be a subtype
 PlotlyJS.jl defines one such subtype:
 
 ```julia
-type GenericTrace{T<:Associative{Symbol,Any}} <: AbstractTrace
+type GenericTrace{T<:AbstractDict{Symbol,Any}} <: AbstractTrace
     kind::ASCIIString
     fields::T
 end
 ```
 
-The `kind` field specifies the type of trace and the `fields` is an Associative object that maps trace attributes to their values.
+The `kind` field specifies the type of trace and the `fields` is an AbstractDict object that maps trace attributes to their values.
 
 Let's consider an example. Suppose we would like to build the following JSON
 object:
@@ -239,7 +239,7 @@ julia> println(JSON.json(t1, 2))
 The `Layout` type is defined as
 
 ```julia
-type Layout{T<:Associative{Symbol,Any}} <: AbstractLayout
+type Layout{T<:AbstractDict{Symbol,Any}} <: AbstractLayout
     fields::T
 end
 ```

src/PlotlyJS.jl

@@ -6,6 +6,7 @@ using Reexport
 @reexport using PlotlyBase
 using JSON
 using Base.Iterators
+using Compat: AbstractDict
 
 # need to import some functions because methods are meta-generated
 import PlotlyBase:

src/display.jl

@@ -98,7 +98,7 @@ for f in (:extendtraces!, :prependtraces!)
             ($f)(p, [ind], maxpoints; update...)
         end
 
-        function $(f)(p::AbstractPlotlyDisplay, update::Associative, ind::Int,
+        function $(f)(p::AbstractPlotlyDisplay, update::AbstractDict, ind::Int,
                       maxpoints=-1)
             ($f)(p, update, [ind], maxpoints)
         end

src/displays/electron.jl

@@ -241,27 +241,27 @@ Blink.js(p::ElectronPlot, code::JSString; callback=true) =
     Blink.js(p.view, code; callback=callback)
 
 # Methods from javascript API (docstrings found in api.jl)
-function relayout!(p::ElectronDisplay, update::Associative=Dict(); kwargs...)
+function relayout!(p::ElectronDisplay, update::AbstractDict=Dict(); kwargs...)
     @js_ p begin reset_svg(); Plotly.relayout(this, $(merge(update, prep_kwargs(kwargs)))).then(save_svg) end
 end
 
-function restyle!(p::ElectronDisplay, ind::Int, update::Associative=Dict(); kwargs...)
+function restyle!(p::ElectronDisplay, ind::Int, update::AbstractDict=Dict(); kwargs...)
     @js_ p begin reset_svg(); Plotly.restyle(this, $(merge(update, prep_kwargs(kwargs))), $(ind-1)).then(save_svg) end
 end
 
-function restyle!(p::ElectronDisplay, inds::AbstractVector{Int}, update::Associative=Dict(); kwargs...)
+function restyle!(p::ElectronDisplay, inds::AbstractVector{Int}, update::AbstractDict=Dict(); kwargs...)
     @js_ p begin reset_svg(); Plotly.restyle(this, $(merge(update, prep_kwargs(kwargs))), $(inds-1)).then(save_svg) end
 end
 
 function restyle!(p::ElectronDisplay, update=Dict(); kwargs...)
     @js_ p begin reset_svg(); Plotly.restyle(this, $(merge(update, prep_kwargs(kwargs)))).then(save_svg) end
 end
 
-function update!(p::ElectronDisplay, ind::Int, update::Associative=Dict(); layout::Layout=Layout(), kwargs...)
+function update!(p::ElectronDisplay, ind::Int, update::AbstractDict=Dict(); layout::Layout=Layout(), kwargs...)
     @js_ p begin reset_svg(); Plotly.update(this, $(merge(update, prep_kwargs(kwargs))), $(layout), $(ind-1)).then(save_svg) end
 end
 
-function update!(p::ElectronDisplay, inds::AbstractVector{Int}, update::Associative=Dict(); layout::Layout=Layout(), kwargs...)
+function update!(p::ElectronDisplay, inds::AbstractVector{Int}, update::AbstractDict=Dict(); layout::Layout=Layout(), kwargs...)
     @js_ p begin reset_svg(); Plotly.update(this, $(merge(update, prep_kwargs(kwargs))), $(layout), $(inds-1)).then(save_svg) end
 end
 
@@ -306,12 +306,12 @@ function download_image(p::ElectronDisplay; kwargs...)
 end
 
 # unexported (by plotly.js) api methods
-function extendtraces!(ed::ElectronDisplay, update::Associative=Dict(),
+function extendtraces!(ed::ElectronDisplay, update::AbstractDict=Dict(),
               indices::Vector{Int}=[1], maxpoints=-1;)
     @js_ ed begin reset_svg(); Plotly.extendTraces(this, $(prep_kwargs(update)), $(indices-1), $maxpoints).then(save_svg) end
 end
 
-function prependtraces!(ed::ElectronDisplay, update::Associative=Dict(),
+function prependtraces!(ed::ElectronDisplay, update::AbstractDict=Dict(),
                indices::Vector{Int}=[1], maxpoints=-1;)
     @js_ ed begin reset_svg(); Plotly.prependTraces(this, $(prep_kwargs(update)), $(indices-1), $maxpoints).then(save_svg) end
 end

src/displays/ijulia.jl

@@ -148,36 +148,36 @@ end
 # Javascript API methods #
 # ---------------------- #
 
-relayout!(jd::JupyterDisplay, update::Associative=Dict(); kwargs...) =
+relayout!(jd::JupyterDisplay, update::AbstractDict=Dict(); kwargs...) =
     _call_plotlyjs(jd, "relayout", merge(update, prep_kwargs(kwargs)))
 
-restyle!(jd::JupyterDisplay, ind::Int, update::Associative=Dict(); kwargs...) =
+restyle!(jd::JupyterDisplay, ind::Int, update::AbstractDict=Dict(); kwargs...) =
     _call_plotlyjs(jd, "restyle", merge(update, prep_kwargs(kwargs)), ind-1)
 
 function restyle!(jd::JupyterDisplay, inds::AbstractVector{Int},
-                  update::Associative=Dict();  kwargs...)
+                  update::AbstractDict=Dict();  kwargs...)
     _call_plotlyjs(jd, "restyle", merge(update, prep_kwargs(kwargs)), inds-1)
 end
 
-restyle!(jd::JupyterDisplay, update::Associative=Dict(); kwargs...) =
+restyle!(jd::JupyterDisplay, update::AbstractDict=Dict(); kwargs...) =
     _call_plotlyjs(jd, "restyle", merge(update, prep_kwargs(kwargs)))
 
 function update!(
-        jd::JupyterDisplay, ind::Int, update::Associative=Dict();
+        jd::JupyterDisplay, ind::Int, update::AbstractDict=Dict();
         layout::Layout=Layout(), kwargs...
     )
     _call_plotlyjs(jd, "update", merge(update, prep_kwargs(kwargs)), layout, ind-1)
 end
 
 function update!(
         jd::JupyterDisplay, inds::AbstractVector{Int},
-        update::Associative=Dict(); layout::Layout=Layout(), kwargs...
+        update::AbstractDict=Dict(); layout::Layout=Layout(), kwargs...
     )
     _call_plotlyjs(jd, "update", merge(update, prep_kwargs(kwargs)), layout, inds-1)
 end
 
 function update!(
-        jd::JupyterDisplay, update::Associative=Dict();
+        jd::JupyterDisplay, update::AbstractDict=Dict();
         layout::Layout=Layout(),  kwargs...
     )
     _call_plotlyjs(jd, "update", merge(update, prep_kwargs(kwargs)), layout)
@@ -208,11 +208,11 @@ download_image(jd::JupyterDisplay; kwargs...) =
     _call_plotlyjs(jd, "download_image", Dict(kwargs))
 
 # unexported (by plotly.js) api methods
-extendtraces!(jd::JupyterDisplay, update::Associative=Dict(),
+extendtraces!(jd::JupyterDisplay, update::AbstractDict=Dict(),
               indices::Vector{Int}=[1], maxpoints=-1;) =
     _call_plotlyjs(jd, "extendTraces", update, indices-1, maxpoints)
 
-prependtraces!(jd::JupyterDisplay, update::Associative=Dict(),
+prependtraces!(jd::JupyterDisplay, update::AbstractDict=Dict(),
                indices::Vector{Int}=[1], maxpoints=-1;) =
     _call_plotlyjs(jd, "prependTraces", update, indices-1, maxpoints)