diff --git a/NEWS.md b/NEWS.md index 75c4cc5a1..3b74a91e2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -31,6 +31,11 @@ * Correctly handle non-standard integers when converting them to `BigInt` ([#3419](https://github.com/JuliaData/DataFrames.jl/issues/3419)) +## Removed deprecations + +* The `by` and `aggregate` functions that were deprecated before 1.0 + release are now removed. + ([#3422](https://github.com/JuliaData/DataFrames.jl/issues/3422)) # DataFrames.jl v1.6.1 Release Notes diff --git a/Project.toml b/Project.toml index df31d9fb6..f76100bdf 100644 --- a/Project.toml +++ b/Project.toml @@ -31,7 +31,7 @@ Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" CategoricalArrays = "0.10.0" Combinatorics = "1.0.2" Compat = "4.2" -DataAPI = "1.15.0" +DataAPI = "1.16.0" DataStructures = "0.18" DataValues = "0.4.13" InlineStrings = "1.3.0" diff --git a/src/DataFrames.jl b/src/DataFrames.jl index 57809cbdb..debd309f5 100644 --- a/src/DataFrames.jl +++ b/src/DataFrames.jl @@ -20,6 +20,7 @@ import DataAPI, DataAPI.Between, DataAPI.Cols, DataAPI.describe, + DataAPI.groupby, DataAPI.innerjoin, DataAPI.outerjoin, DataAPI.rightjoin, diff --git a/src/deprecated.jl b/src/deprecated.jl index 19839c54a..c93bc70d5 100644 --- a/src/deprecated.jl +++ b/src/deprecated.jl @@ -1,11 +1,3 @@ -export by, aggregate - -# TODO: remove definitions in 2.0 release -by(args...; kwargs...) = throw(ArgumentError("by function was removed from DataFrames.jl. " * - "Use the `combine(groupby(...), ...)` or `combine(f, groupby(...))` instead.")) -aggregate(args...; kwargs...) = throw(ArgumentError("aggregate function was removed from DataFrames.jl. " * - "Use the `combine` function instead.")) - # TODO: remove deprecation in 2.0 release import Base.delete! @deprecate delete!(df::DataFrame, inds) deleteat!(df::DataFrame, inds) \ No newline at end of file diff --git a/test/deprecated.jl b/test/deprecated.jl index beaba2770..7a09015b7 100644 --- a/test/deprecated.jl +++ b/test/deprecated.jl @@ -4,11 +4,6 @@ using Test, DataFrames, CategoricalArrays const ≅ = isequal -@testset "by and aggregate" begin - @test_throws ArgumentError by() - @test_throws ArgumentError aggregate() -end - @testset "indicator in joins" begin name = DataFrame(ID=[1, 2, 3], Name=["John Doe", "Jane Doe", "Joe Blogs"]) job = DataFrame(ID=[1, 2, 4], Job=["Lawyer", "Doctor", "Farmer"])