Enhance joining and grouping

.travis.yml

@@ -1,7 +1,6 @@
 
 language: julia
 julia:
-  - 0.4
   - 0.5
   - nightly
 os:
@@ -15,6 +14,5 @@ script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
   - julia --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.build("DataFrames"); Pkg.test("DataFrames"; coverage=true)'
 after_success:
-  - julia -e 'cd(Pkg.dir("DataFrames")); Pkg.clone("https://github.com/MichaelHatherly/Documenter.jl"); include(joinpath("docs", "make.jl"))'
+  - julia -e 'cd(Pkg.dir("DataFrames")); Pkg.add("Documenter"); Pkg.add("Query"); include(joinpath("docs", "make.jl"))'
   - julia -e 'cd(Pkg.dir("DataFrames")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-

REQUIRE

@@ -1,8 +1,10 @@
-julia 0.4
-DataArrays 0.3.4
-StatsBase 0.8.3
+julia 0.5
+NullableArrays 0.0.8
+CategoricalArrays 0.0.6
+StatsBase 0.11.0
 GZip
 SortingAlgorithms
 Reexport
 Compat 0.8.4
 FileIO 0.1.2
+Juno 0.2.4

appveyor.yml

@@ -1,7 +1,5 @@
 environment:
   matrix:
-  - JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
-  - JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
   - JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
   - JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
   - JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"

benchmark/runbenchmarks.jl

@@ -5,9 +5,7 @@
 using DataFrames
 using Benchmark
 
-benchmarks = ["datavector.jl",
-              "datamatrix.jl",
-              "io.jl"]
+benchmarks = [ "io.jl"]
 
 # TODO: Print summary to stdout_stream, while printing results
 #       to file with appends.

docs/make.jl

@@ -1,23 +1,47 @@
-using Documenter, DataFrames, DataArrays
+using Documenter, DataFrames
 
 # Build documentation.
 # ====================
 
 makedocs(
     # options
     modules = [DataFrames],
-    doctest = false,
-    clean   = false
+    doctest = true,
+    clean = false,
+    sitename = "DataFrames.jl",
+    format = Documenter.Formats.HTML,
+    pages = Any[
+        "Introduction" => "index.md",
+        "User Guide" => Any[
+            "Getting Started" => "man/getting_started.md",
+            "IO" => "man/io.md",
+            "Joins" => "man/joins.md",
+            "Split-apply-combine" => "man/split_apply_combine.md",
+            "Reshaping" => "man/reshaping_and_pivoting.md",
+            "Sorting" => "man/sorting.md",
+            "Formulas" => "man/formulas.md",
+            "Pooling" => "man/pooling.md",
+            "Querying frameworks" => "man/querying_frameworks.md",
+        ],
+        "API" => Any[
+            "Main types" => "lib/maintypes.md",
+            "Utilities" => "lib/utilities.md",
+            "Data manipulation" => "lib/manipulation.md",
+        ],
+        "About" => Any[
+            "Release Notes" => "NEWS.md",
+            "License" => "LICENSE.md",
+        ]
+    ]
 )
 
 # Deploy built documentation from Travis.
 # =======================================
 
-# Needs to install an additional dep, mkdocs-material, so provide a custom `deps`.
-custom_deps() = run(`pip install --user pygments mkdocs mkdocs-material`)
-
 deploydocs(
     # options
-    deps = custom_deps,
-    repo = "github.com/JuliaStats/DataFrames.jl.git"
+    repo = "github.com/JuliaStats/DataFrames.jl.git",
+    target = "build",
+    deps = nothing,
+    make = nothing,
 )

docs/src/index.md

@@ -2,17 +2,20 @@
 
 ## Package Manual
 
-    {contents}
-    Pages = ["man/getting_started.md", "man/io.md", "man/joins.md", "man/split_apply_combine.md", "man/reshaping_and_pivoting.md", "man/sorting.md", "man/formulas.md", "man/pooling.md"]
-    Depth = 2
+```@contents
+Pages = ["man/getting_started.md", "man/io.md", "man/joins.md", "man/split_apply_combine.md", "man/reshaping_and_pivoting.md", "man/sorting.md", "man/formulas.md", "man/pooling.md", "man/querying_frameworks.md"]
+Depth = 2
+```
 
 ## API
 
-    {contents}
-    Pages = ["lib/maintypes.md", "lib/manipulation.md", "lib/utilities.md"]
-    Depth = 2
+```@contents
+Pages = ["lib/maintypes.md", "lib/manipulation.md", "lib/utilities.md"]
+Depth = 2
+```
 
 ## Documentation Index
 
-    {index}
-    Pages = ["lib/maintypes.md", "lib/manipulation.md", "lib/utilities.md", "man/io.md"]
+```@index
+Pages = ["lib/maintypes.md", "lib/manipulation.md", "lib/utilities.md", "man/io.md"]
+```

docs/src/lib/maintypes.md

@@ -1,16 +1,16 @@
 
-    {meta}
-    CurrentModule = DataFrames
+```@meta
+CurrentModule = DataFrames
+```
 
 # Main Types
 
-    {index}
-    Pages = ["maintypes.md"]
-
-...
-
-    {docs}
-    AbstractDataFrame
-    DataFrame
-    SubDataFrame
+```@index
+Pages = ["maintypes.md"]
+```
 
+```@docs
+AbstractDataFrame
+DataFrame
+SubDataFrame
+```

docs/src/lib/manipulation.md

@@ -1,22 +1,25 @@
-
-    {meta}
-    CurrentModule = DataFrames
+```@meta
+CurrentModule = DataFrames
+```
 
 # Data Manipulation
-
-    {index}
-    Pages = ["manipulation.md"]
+
+```@index
+Pages = ["manipulation.md"]
+```
 
 ## Joins
 
-    {docs}
-    join
-
+```@docs
+join
+```
+
 ## Reshaping
 
-    {docs}
-    melt 
-    stack
-    unstack
-    stackdf
-    meltdf
+```@docs
+melt
+stack
+unstack
+stackdf
+meltdf
+```

docs/src/lib/utilities.md

@@ -1,27 +1,25 @@
-
-    {meta}
-    CurrentModule = DataFrames
+```@meta
+CurrentModule = DataFrames
+```
 
 # Utilities
 
-    {index}
-    Pages = ["utilities.md"]
+```@index
+Pages = ["utilities.md"]
+```
 
-...
-
-    {docs}
-    eltypes
-    head
-    complete_cases
-    complete_cases!
-    describe
-    dump
-    names!
-    nonunique
-    rename
-    rename!
-    tail
-    unique
-    unique!
-
-
+```@docs
+eltypes
+head
+complete_cases
+complete_cases!
+describe
+dump
+names!
+nonunique
+rename
+rename!
+tail
+unique
+unique!
+```