Merge branch 'nl/datatables4' into nl/datatables-backport

JuliaData · Sep 2, 2017 · 51c6f65 · 51c6f65
2 parents da05554 + cb51bb8
commit 51c6f65
Show file tree

Hide file tree

Showing 107 changed files with 3,383 additions and 73,284 deletions.
diff --git a/NEWS.md b/NEWS.md
diff --git a/README.md b/README.md
@@ -17,11 +17,11 @@ For datasets based on `NullableArray`s rather than `DataArray`s, see the [DataTa
 
 **Reporting Issues and Contributing**: See [CONTRIBUTING.md](CONTRIBUTING.md)
 
-**Maintenance**: DataFrames is maintained collectively by the [JuliaStats collaborators](https://github.com/orgs/JuliaStats/people).
+**Maintenance**: DataFrames is maintained collectively by the [JuliaData collaborators](https://github.com/orgs/JuliaData/people).
 Responsiveness to pull requests and issues can vary, depending on the availability of key collaborators.
 
 [docs-latest-img]: https://img.shields.io/badge/docs-latest-blue.svg
-[docs-latest-url]: http://JuliaStats.github.io/DataFrames.jl/latest/
+[docs-latest-url]: http://JuliaData.github.io/DataFrames.jl/latest/
 
 [docs-stable-img]: https://img.shields.io/badge/docs-stable-blue.svg
-[docs-stable-url]: http://JuliaStats.github.io/DataFrames.jl/stable/
+[docs-stable-url]: http://JuliaData.github.io/DataFrames.jl/stable/
diff --git a/REQUIRE b/REQUIRE
@@ -1,7 +1,8 @@
-julia 0.6-
-DataArrays 0.5
+julia 0.6
+Nulls 0.0.6
+CategoricalArrays 0.2.0
 StatsBase 0.11.0
-GZip
 SortingAlgorithms
 Reexport
-FileIO 0.1.2
+WeakRefStrings 0.3.0
+DataStreams 0.2.0
diff --git a/benchmark/datamatrix.jl b/benchmark/datamatrix.jl
diff --git a/benchmark/datavector.jl b/benchmark/datavector.jl
diff --git a/benchmark/io.jl b/benchmark/io.jl