From 36fa4218381e9cd60387d32c66319cde49f4c1e0 Mon Sep 17 00:00:00 2001 From: "Tamas K. Papp" Date: Sun, 15 Jul 2018 08:39:48 +0200 Subject: [PATCH] More deprecation fixes after looking at the docs output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. bring back StatsBase.midpoints now that it is part of the interface again, remove workaround. 2. Use ℯ. --- REQUIRE | 1 + docs/src/examples/axislike.md | 2 +- src/PGFPlotsX.jl | 1 + src/requires.jl | 11 ++++------- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/REQUIRE b/REQUIRE index 3de9ea10..ae8a376f 100644 --- a/REQUIRE +++ b/REQUIRE @@ -6,4 +6,5 @@ MacroTools Missings Parameters Requires 0.5.2 +StatsBase 0.24 Crayons diff --git a/docs/src/examples/axislike.md b/docs/src/examples/axislike.md index 5c990817..88186135 100644 --- a/docs/src/examples/axislike.md +++ b/docs/src/examples/axislike.md @@ -70,7 +70,7 @@ savefigs("groupplot-multiple", ans) # hide ## Polar axis ```@example pgf -angles = [e/50*360*i for i in 1:500] +angles = [ℯ/50*360*i for i in 1:500] radius = [1/(sqrt(i)) for i in range(1; stop = 10, length = 500)] PolarAxis(PlotInc(Coordinates(angles, radius))) savefigs("polar", ans) # hide diff --git a/src/PGFPlotsX.jl b/src/PGFPlotsX.jl index 7264c06d..532da19e 100644 --- a/src/PGFPlotsX.jl +++ b/src/PGFPlotsX.jl @@ -8,6 +8,7 @@ using ArgCheck: @argcheck using DataStructures: OrderedDict using DocStringExtensions: SIGNATURES, TYPEDEF using Parameters: @unpack +using StatsBase: midpoints using Requires: @require using Unicode: lowercase diff --git a/src/requires.jl b/src/requires.jl index b2b2231c..ba675cb0 100644 --- a/src/requires.jl +++ b/src/requires.jl @@ -63,9 +63,6 @@ function __init__() end @require StatsBase="2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" begin - # workaround for https://github.com/JuliaStats/StatsBase.jl/issues/344 - const _midpoints = x -> middle.(x[2:end], x[1:(end-1)]) - function PGFPlotsX.TableData(h::StatsBase.Histogram{T, 1}; kwargs...) where T PGFPlotsX.TableData(hcat(h.edges[1], vcat(h.weights, 0)), @@ -74,14 +71,14 @@ function __init__() function PGFPlotsX.TableData(histogram::StatsBase.Histogram{T, 2}; kwargs...) where T - PGFPlotsX.TableData(_midpoints(histogram.edges[1]), - _midpoints(histogram.edges[2]), + PGFPlotsX.TableData(midpoints(histogram.edges[1]), + midpoints(histogram.edges[2]), histogram.weights; kwargs...) end function PGFPlotsX.Coordinates(histogram::StatsBase.Histogram{T, 2}) where T - PGFPlotsX.Coordinates(_midpoints(histogram.edges[1]), - _midpoints(histogram.edges[2]), + PGFPlotsX.Coordinates(midpoints(histogram.edges[1]), + midpoints(histogram.edges[2]), histogram.weights) end end