From ac71ec4b57728b67f986dec197da309357b98aa4 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 2 Jul 2019 12:53:07 +0200 Subject: [PATCH 1/3] Fix namespacing issue in doctests --- docs/src/gettingstarted.md | 6 +++--- docs/src/linqquerycommands.md | 20 ++++++++++---------- docs/src/sinks.md | 2 +- docs/src/sources.md | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/src/gettingstarted.md b/docs/src/gettingstarted.md index 0d56a8cb..a803406c 100644 --- a/docs/src/gettingstarted.md +++ b/docs/src/gettingstarted.md @@ -20,7 +20,7 @@ println(x) # output -1×2 DataFrames.DataFrame +1×2 DataFrame │ Row │ name │ children │ │ │ String │ Int64 │ ├─────┼────────┼──────────┤ @@ -54,7 +54,7 @@ println(x) # output -1×2 DataFrames.DataFrame +1×2 DataFrame │ Row │ name │ children │ │ │ String │ Int64 │ ├─────┼────────┼──────────┤ @@ -102,7 +102,7 @@ println(x) # output -1×2 DataFrames.DataFrame +1×2 DataFrame │ Row │ name │ children │ ├─────┼────────┼──────────┤ │ 1 │ "Kirk" │ 2 │ diff --git a/docs/src/linqquerycommands.md b/docs/src/linqquerycommands.md index 57efdb7c..a96d3a3c 100644 --- a/docs/src/linqquerycommands.md +++ b/docs/src/linqquerycommands.md @@ -21,7 +21,7 @@ println(x) # output -6×2 DataFrames.DataFrame +6×2 DataFrame │ Row │ a │ b │ │ │ Int64 │ Int64 │ ├─────┼───────┼───────┤ @@ -54,7 +54,7 @@ println(x) # output -1×3 DataFrames.DataFrame +1×3 DataFrame │ Row │ name │ age │ children │ │ │ String │ Float64 │ Int64 │ ├─────┼────────┼─────────┼──────────┤ @@ -101,7 +101,7 @@ println(x) # output -3×2 DataFrames.DataFrame +3×2 DataFrame │ Row │ name │ Age │ │ │ String │ Float64 │ ├─────┼────────┼─────────┤ @@ -133,7 +133,7 @@ println(q) # output -5×2 DataFrames.DataFrame +5×2 DataFrame │ Row │ Key │ Value │ │ │ Symbol │ Int64 │ ├─────┼────────┼───────┤ @@ -170,7 +170,7 @@ println(x) # output -2×4 DataFrames.DataFrame +2×4 DataFrame │ Row │ a │ b │ c │ d │ │ │ Int64 │ Float64 │ Int64 │ String │ ├─────┼───────┼─────────┼───────┼────────┤ @@ -200,7 +200,7 @@ println(x) # output -3×2 DataFrames.DataFrame +3×2 DataFrame │ Row │ t1 │ t2 │ │ │ Int64 │ Int64 │ ├─────┼───────┼───────┤ @@ -231,7 +231,7 @@ println(q) # output -4×4 DataFrames.DataFrame +4×4 DataFrame │ Row │ a │ b │ c │ d │ │ │ Int64 │ Float64 │ Int64⍰ │ String⍰ │ ├─────┼───────┼─────────┼─────────┼─────────┤ @@ -283,7 +283,7 @@ println(x) # output -2×2 DataFrames.DataFrame +2×2 DataFrame │ Row │ Key │ Count │ │ │ Int64 │ Int64 │ ├─────┼───────┼───────┤ @@ -314,7 +314,7 @@ println(x) # output -2×4 DataFrames.DataFrame +2×4 DataFrame │ Row │ group │ mage │ oldest │ youngest │ │ │ Symbol │ Float64 │ Float64 │ Float64 │ ├─────┼────────┼─────────┼─────────┼──────────┤ @@ -345,7 +345,7 @@ println(x) # output -1×3 DataFrames.DataFrame +1×3 DataFrame │ Row │ Name │ Count │ KidsPerYear │ │ │ String │ Int64 │ Float64 │ ├─────┼────────┼───────┼─────────────┤ diff --git a/docs/src/sinks.md b/docs/src/sinks.md index 980ad6ae..aff86b2c 100644 --- a/docs/src/sinks.md +++ b/docs/src/sinks.md @@ -45,7 +45,7 @@ println(x) # output -3×3 DataFrames.DataFrame +3×3 DataFrame │ Row │ name │ age │ Children │ │ │ String │ Float64 │ Int64 │ ├─────┼────────┼─────────┼──────────┤ diff --git a/docs/src/sources.md b/docs/src/sources.md index 285734b6..4480a240 100644 --- a/docs/src/sources.md +++ b/docs/src/sources.md @@ -22,7 +22,7 @@ println(x) # output -3×3 DataFrames.DataFrame +3×3 DataFrame │ Row │ name │ age │ children │ │ │ String │ Float64 │ Int64 │ ├─────┼────────┼─────────┼──────────┤ @@ -51,7 +51,7 @@ println(x) # output -3×3 DataFrames.DataFrame +3×3 DataFrame │ Row │ name │ age │ children │ │ │ String │ Float64 │ Int64 │ ├─────┼────────┼─────────┼──────────┤ From 78703a4c4fc3ad4e48ad7e0ce0f11e1652003428 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 2 Jul 2019 12:53:15 +0200 Subject: [PATCH 2/3] Add a missing output to a doctest --- docs/src/standalonequerycommands.md | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/docs/src/standalonequerycommands.md b/docs/src/standalonequerycommands.md index ad1eda07..a0b634ae 100644 --- a/docs/src/standalonequerycommands.md +++ b/docs/src/standalonequerycommands.md @@ -14,6 +14,15 @@ df2 = df |> @filter(_.b > 5) |> @orderby_descending(_.b) |> DataFrame + +# output + +2×2 DataFrame +│ Row │ a │ b │ +│ │ Int64 │ Float64 │ +├─────┼───────┼─────────┤ +│ 1 │ 3 │ 8.0 │ +│ 2 │ 2 │ 6.0 │ ``` ## Standalone query operators @@ -56,7 +65,7 @@ println(x) # output -1×3 DataFrames.DataFrame +1×3 DataFrame │ Row │ name │ age │ children │ │ │ String │ Float64 │ Int64 │ ├─────┼────────┼─────────┼──────────┤ @@ -87,7 +96,7 @@ println(x) # output -2×2 DataFrames.DataFrame +2×2 DataFrame │ Row │ Key │ Count │ │ │ Int64 │ Int64 │ ├─────┼───────┼───────┤ @@ -114,7 +123,7 @@ println(x) # output -6×2 DataFrames.DataFrame +6×2 DataFrame │ Row │ a │ b │ │ │ Int64 │ Int64 │ ├─────┼───────┼───────┤ @@ -144,7 +153,7 @@ println(x) # output -3×2 DataFrames.DataFrame +3×2 DataFrame │ Row │ t1 │ t2 │ │ │ Int64 │ Int64 │ ├─────┼───────┼───────┤ @@ -171,7 +180,7 @@ println(x) # output -2×4 DataFrames.DataFrame +2×4 DataFrame │ Row │ a │ b │ c │ d │ │ │ Int64 │ Float64 │ Int64 │ String │ ├─────┼───────┼─────────┼───────┼────────┤ @@ -196,7 +205,7 @@ println(q) # output -5×2 DataFrames.DataFrame +5×2 DataFrame │ Row │ Key │ Value │ │ │ Symbol │ Int64 │ ├─────┼────────┼───────┤ @@ -282,7 +291,7 @@ println(q1) # output -3×2 DataFrames.DataFrame +3×2 DataFrame │ Row │ price │ fruit │ │ │ Float64 │ String │ ├─────┼─────────┼────────┤ @@ -302,7 +311,7 @@ println(q2) # output -3×3 DataFrames.DataFrame +3×3 DataFrame │ Row │ price │ isyellow │ fruit │ │ │ Float64 │ Bool │ String │ ├─────┼─────────┼──────────┼────────┤ @@ -326,7 +335,7 @@ println(q) # output -3×4 DataFrames.DataFrame +3×4 DataFrame │ Row │ name │ amount │ cost │ isyellow │ │ │ String │ Int64 │ Float64 │ Bool │ ├─────┼────────┼────────┼─────────┼──────────┤ @@ -348,7 +357,7 @@ println(q) # output -3×4 DataFrames.DataFrame +3×4 DataFrame │ Row │ fruit │ amount │ price │ isyellow │ │ │ String │ Int64 │ Float64 │ Bool │ ├─────┼────────┼────────┼─────────┼──────────┤ From d45c66fc1eda584770331e0de055d67e6856a29c Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 2 Jul 2019 14:12:44 +0200 Subject: [PATCH 3/3] Work around type printing problems in tests --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index f32451f5..a3739b11 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -1,4 +1,4 @@ -using Documenter, Query +using Documenter, Query, DataFrames makedocs( modules = [Query],