Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

get docs to build again #1283

Merged
merged 7 commits into from
May 18, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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"
Expand All @@ -50,7 +49,6 @@ KernelDensity = "0.5"
Loess = "0.5"
Measures = "0.3"
Showoff = "0.2"
StatsBase = "0.29.0"
julia = "0.7, 1"
CSV ="0.4"
Cairo = "0.5"
Expand All @@ -67,4 +65,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"

[targets]
test = ["CSV", "Cairo", "DataFrames", "RDatasets", "Test", "Unitful"]
test = ["CSV", "Cairo", "DataFrames", "RDatasets", "Test", "Unitful"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I understand it, for the line_linestyle test script you could have moved StatsBase into [extras] and [targets], and the docs will build as long as StatsBase is not in [deps]and [compat]. However, I'm ok with removing StatsBase in the line_linestyle testscript, because it simplifies things.

3 changes: 1 addition & 2 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
RDatasets = "ce6b1742-4840-55fa-b093-852dadbb1d8b"
Showoff = "992d4aef-0814-514b-bc4d-f2e9a6c4116f"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"

[compat]
Documenter = "~0.20"
Documenter = "~0.22"
2 changes: 1 addition & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Documenter, Gadfly, Compose
using Documenter, Gadfly, Compose, Cairo

makedocs(
modules = [Gadfly],
Expand Down
2 changes: 1 addition & 1 deletion docs/src/gallery/geometries.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/src/gallery/scales.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions docs/src/gallery/statistics.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]]
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion docs/src/man/compositing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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")
```
Expand Down
1 change: 1 addition & 0 deletions docs/src/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 3 additions & 4 deletions test/testscripts/line_linestyle.jl
Original file line number Diff line number Diff line change
@@ -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)