Merge pull request GiovineItalia#1283 from bjarthur/bja/docs

get docs to build again

Project.toml

@@ -20,7 +20,6 @@ IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Juno = "e5e0dc1b-0480-54bc-9374-aad01c23163d"
 KernelDensity = "5ab0869b-81aa-558d-bb23-cbf5423bbe9b"
-LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Loess = "4345ca2d-374a-55d4-8d30-97f9976e7612"
 Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e"
@@ -29,7 +28,6 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 
 [compat]
 CategoricalArrays = "0.5"
@@ -38,33 +36,33 @@ Compat = "2"
 Compose = "0.7"
 Contour = "0.5"
 CoupledFields = "0.1"
-DataStructures = "0.15"
-Distributions = "0.18"
+DataStructures = "0.11, 0.12, 0.13, 0.14, 0.15"
+Distributions = "0.16, 0.17, 0.18, 0.19"
 DocStringExtensions = "0.7"
 Hexagons = "0.2"
 IndirectArrays = "0.5"
 IterTools = "1"
-JSON = "0.20"
+JSON = "0.18, 0.19, 0.20"
 Juno = "0.7"
 KernelDensity = "0.5"
-Loess = "0.5"
+Loess = "0.4, 0.5"
 Measures = "0.3"
 Showoff = "0.2"
-StatsBase = "0.29.0"
 julia = "0.7, 1"
-CSV ="0.4"
-Cairo = "0.5"
-DataFrames = "0.17"
+CSV = "0.4, 0.5"
+Cairo = "0.5, 0.6"
+DataFrames = "0.15, 0.16, 0.17, 0.18"
 RDatasets = "0.6"
 Unitful = "0.15"
 
 [extras]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
+LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [targets]
-test = ["CSV", "Cairo", "DataFrames", "RDatasets", "Test", "Unitful"]
+test = ["CSV", "Cairo", "DataFrames", "LibGit2", "RDatasets", "Test", "Unitful"]

docs/Project.toml

@@ -1,13 +1,15 @@
 [deps]
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Compose = "a81c6b42-2e10-5240-aca2-a61377ecd94b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+Gadfly = "c91e804a-d5a3-530f-b6f0-dfbca275c004"
 RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
 Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
-StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 
 [compat]
-Documenter = "~0.20"
+CSV = "0.4, 0.5"
+Documenter = "~0.22"

docs/make.jl

@@ -1,4 +1,4 @@
-using Documenter, Gadfly, Compose
+using Documenter, Gadfly, Compose, Cairo
 
 makedocs(
     modules = [Gadfly],

docs/src/gallery/geometries.md

@@ -405,7 +405,7 @@ plot(dataset("Zelig", "macro"), x="Year", y="Country", color="GDP", Geom.rectbin
 ## [`Geom.ribbon`](@ref)
 
 ```@example
-using Gadfly, Colors, DataFrames, Distributions
+using Gadfly, DataFrames, Distributions
 set_default_plot_size(21cm, 8cm)
 X = [cos.(0:0.1:20) sin.(0:0.1:20)]
 x = -4:0.1:4

docs/src/gallery/scales.md

@@ -96,7 +96,7 @@ plot(iris, x=:SepalLength, y=:SepalWidth, color=:Species,
 ```
 
 ```@example
-using Gadfly, Colors, RDatasets, Random
+using Gadfly, Random
 set_default_plot_size(21cm, 8cm)
 Random.seed!(1234)
 xdata, ydata = rand(12), rand(12)
@@ -120,7 +120,7 @@ plot(x=rand(12), y=rand(12), color=repeat(["a","b","c"], outer=[4]),
 using Gadfly, RDatasets, DataFrames
 set_default_plot_size(14cm, 8cm)
 D = by(dataset("datasets","HairEyeColor"), [:Eye,:Sex], d->sum(d[:Freq]))
-rename!(D, :x1, :Frequency)
+rename!(D, :x1 => :Frequency)
 palette = ["brown","blue","tan","green"] # Is there a hazel color?
 pa = plot(D, x=:Sex, y=:Frequency, color=:Eye, Geom.bar(position=:stack),
           Scale.color_discrete_manual(palette...))

docs/src/gallery/statistics.md

@@ -15,7 +15,7 @@ hstack(p1,p2)
 ## [`Stat.density`](@ref)
 
 ```@example
-using Colors, DataFrames, Gadfly, Distributions
+using DataFrames, Gadfly, Distributions
 set_default_plot_size(21cm, 8cm)
 x = -4:0.1:4
 Da = [DataFrame(x=x, ymax=pdf.(Normal(μ),x), ymin=0.0, u="μ=$μ") for μ in [-1,1]]
@@ -74,7 +74,7 @@ hstack(p1,p2)
 ## [`Stat.smooth`](@ref)
 
 ```@example
-using Colors, Compose, Gadfly, RDatasets
+using Compose, Gadfly, RDatasets
 set_default_plot_size(21cm,8cm)
 salaries = dataset("car","Salaries")
 salaries.Salary /= 1000.0

docs/src/index.md

@@ -84,16 +84,16 @@ do so automatically in your `$HOME/.julia/config/startup.jl` file.
 A few caveats:
 
 - PackageCompiler is a work in progress, and the most recent tagged release
-sometimes (currently as of this writing) does not work.  Hence the `dev`
-instead of `add` command to install.
+  sometimes (currently as of this writing) does not work.  Hence the `dev`
+  instead of `add` command to install.
 
 - Updating to the latest versions of compiled packages requires a recompile.
-`]up`ing only works for those that haven't been built into the system image.
+  `]up`ing only works for those that haven't been built into the system image.
 
 - Plots won't be automatically displayed in your default browswer unless you
-tweak `Base.Multimedia.displays` to return the GadflyDisplay to the last entry.
-To do so, add `atreplinit(x->pushdisplay(Gadfly.GadflyDisplay()))` to
-your `startup.jl`, or `pushdisplay` manually.
+  tweak `Base.Multimedia.displays` to return the GadflyDisplay to the last entry.
+  To do so, add `atreplinit(x->pushdisplay(Gadfly.GadflyDisplay()))` to
+  your `startup.jl`, or `pushdisplay` manually.
 
 - JULIA_PROJECT is entirely disregarded--  you'll have to manually `]activate
-...`.  see https://github.com/JuliaLang/PackageCompiler.jl/issues/228.
+  ...`.  see https://github.com/JuliaLang/PackageCompiler.jl/issues/228.

docs/src/man/compositing.md

@@ -86,7 +86,7 @@ title(hstack(p1,p2), "My creative title")
 Draw multiple layers onto the same plot by inputing `Layer` objects to `plot`.
 
 ```@setup layer
-using Gadfly, RDatasets, Distributions, StatsBase
+using Gadfly, RDatasets, Distributions
 set_default_plot_size(14cm, 8cm)
 iris = dataset("datasets", "iris")
 ```

docs/src/tutorial.md

@@ -269,6 +269,7 @@ Building graphics declaratively let's you do some fun things. Like stick two
 plots together:
 
 ```@example 1
+set_default_plot_size(21cm, 8cm) # hide
 fig1a = plot(iris, x=:SepalLength, y=:SepalWidth, Geom.point)
 fig1b = plot(iris, x=:SepalWidth, Geom.bar)
 fig1 = hstack(fig1a, fig1b)

test/testscripts/line_linestyle.jl

@@ -1,13 +1,12 @@
 using DataFrames, Gadfly
-using StatsBase: winsor
 set_default_plot_size(6inch, 3inch)
 
-labs = [ "exp", "sqrt", "log", "winsor", "linear"]
-funcs = [ x->60*(1 .- exp.(-0.2*x)), x->sqrt.(x)*10, x->log.(x)*10, x->winsor(x, prop=0.15), x->x*0.6 ]
+labs = [ "exp", "sqrt", "log", "linear"]
+funcs = [ x->60*(1 .- exp.(-0.2*x)), x->sqrt.(x)*10, x->log.(x)*10, x->x*0.6 ]
 x = [1.0:30;]
 D = vcat([DataFrame(x=x, y=f(x), linev=l) for (f,l) in zip(funcs, labs)]...)
 
 p1 = plot(D, x=:x, y=:y, linestyle=:linev, Geom.line )
 p2 = plot(D, x=:x, y=:y, linestyle=:linev, Geom.line,
-   Scale.linestyle_discrete(levels=["exp", "log", "sqrt", "linear", "winsor"]) )
+   Scale.linestyle_discrete(levels=["exp", "log", "sqrt", "linear"]) )
 hstack(p1,p2)