fixes for julia 1.0

GiovineItalia · Sep 8, 2018 · 2e0d0da · 2e0d0da
1 parent 57728d3
commit 2e0d0da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/Gadfly.jl b/src/Gadfly.jl
@@ -16,7 +16,7 @@ import IterTools
 import IterTools: distinct, drop, chain
 import Compose: draw, hstack, vstack, gridstack, parse_colorant
 import Base: +, -, /, *,
-             copy, push!, start, next, done, show, getindex, cat,
+             copy, push!, show, getindex, cat,
              show, isfinite, display
 import Distributions: Distribution
 

diff --git a/src/aesthetics.jl b/src/aesthetics.jl
@@ -97,7 +97,8 @@ function show(io::IO, data::Aesthetics)
     maxlen = 0
     print(io, "Aesthetics(")
     for name in fieldnames(Aesthetics)
-        if getfield(data, name) != nothing
+        val = getfield(data, name)
+        if !ismissing(val) && val != nothing
             print(io, "\n  ", string(name), "=")
             show(io, getfield(data, name))
         end

diff --git a/src/geom/subplot.jl b/src/geom/subplot.jl
@@ -224,7 +224,7 @@ function render(geom::SubplotGrid, theme::Gadfly.Theme,
             Gadfly.inherit!(col_aes, geom_aes)
             Stat.apply_statistic(Stat.xticks(), scales, coord, col_aes)
 
-            aes_grid[:, j] .= col_aes
+            aes_grid[:, j] .= [col_aes]
         end
     end
 

diff --git a/test/REQUIRE b/test/REQUIRE
@@ -1,3 +1,4 @@
 RDatasets
 Cairo
 Fontconfig
+CSV
diff --git a/test/testscripts/density_dark.jl b/test/testscripts/density_dark.jl
@@ -11,16 +11,16 @@ end
 # prevent these tests from running more than once
 if ! @isdefined density_dark_tested
     svg_str_dark = stringmime(MIME("image/svg+xml"), p)
-    @test occursin(hex(Gadfly.dark_theme.default_color), svg_str_dark)
-    @test occursin(hex(Gadfly.dark_theme.background_color), svg_str_dark)
-    @test occursin(hex(Gadfly.dark_theme.panel_fill), svg_str_dark)
+    @test occursin(Base.hex(Gadfly.dark_theme.default_color), svg_str_dark)
+    @test occursin(Base.hex(Gadfly.dark_theme.background_color), svg_str_dark)
+    @test occursin(Base.hex(Gadfly.dark_theme.panel_fill), svg_str_dark)
 
     # Test reset.
     p2 = plot(dataset("ggplot2", "diamonds"), x="Price", color="Cut", Geom.density)
     svg_str_light = stringmime(MIME("image/svg+xml"), p2)
-    @test !occursin(hex(Gadfly.dark_theme.default_color), svg_str_light)
-    @test !occursin(hex(Gadfly.dark_theme.background_color), svg_str_light)
-    @test !occursin(hex(Gadfly.dark_theme.panel_fill), svg_str_light)
+    @test !occursin(Base.hex(Gadfly.dark_theme.default_color), svg_str_light)
+    @test !occursin(Base.hex(Gadfly.dark_theme.background_color), svg_str_light)
+    @test !occursin(Base.hex(Gadfly.dark_theme.panel_fill), svg_str_light)
 
     density_dark_tested=true
 end