Remove deprecated methods and bump version to v0.7.0 (#107)

* remove deprecated functions and methods * update tests * bump version to v0.7.0
JuliaMath · May 29, 2022 · 42f7855 · 42f7855 · hyrodium · May 29, 2022
1 parent 39b9007
commit 42f7855
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 73 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "IntervalSets"
 uuid = "8197267c-284f-5f27-9208-e0e47529a953"
-version = "0.6.2"
+version = "0.7.0"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/IntervalSets.jl b/src/IntervalSets.jl
@@ -10,7 +10,7 @@ import Statistics: mean
 using Dates
 
 export AbstractInterval, Interval, OpenInterval, ClosedInterval,
-            ⊇, .., ±, ordered, width, duration, leftendpoint, rightendpoint, endpoints,
+            ⊇, .., ±, ordered, width, leftendpoint, rightendpoint, endpoints,
             isopenset, isclosedset, isleftclosed, isrightclosed,
             isleftopen, isrightopen, closedendpoints,
             infimum, supremum
@@ -227,55 +227,7 @@ Clamp the scalar `t` such that the result is in the interval `i`.
 clamp(t, i::TypedEndpointsInterval{:closed,:closed}) =
     clamp(t, leftendpoint(i), rightendpoint(i))
 
-
-"""
-   duration(iv)
-
-calculates the the total number of integers or dates of an integer or date
-valued interval. For example, `duration(0..1)` is 2, while `width(0..1)` is 1.
-"""
-function duration(A::TypedEndpointsInterval{:closed,:closed,T}) where {T<:Integer}
-    # TODO: Remove this method in the next breaking release
-    Base.depwarn("`duration` will be removed in the next breaking release because it is ill-defined concept. " *
-    "If you need 3 from 2..4, replace duration(2..4) with width(2..4)+1", :duration)
-    max(0, Int(A.right - A.left) + 1)
-end
-function duration(A::TypedEndpointsInterval{:closed,:closed,Date})
-    # TODO: Remove this method in the next breaking release
-    Base.depwarn("`duration` will be removed in the next breaking release because it is ill-defined concept. " *
-    "If you need 961 from A=Date(2018,08,08)..Date(2021,03,25), replace duration(A) with Dates.days(width(A))+1", :duration)
-    max(0, Dates.days(A.right - A.left) + 1)
-end
-
 include("interval.jl")
-
-# convert numbers to intervals
-# TODO: These conversions will be removed in the next breaking release (#97)
-function convert(::Type{AbstractInterval}, x::Number)
-    Base.depwarn("`The conversion number to interval will be removed; construct an interval explicitly, e.g., `x..x`.", :convert)
-    x..x
-end
-function convert(::Type{AbstractInterval{T}}, x::Number) where T
-    Base.depwarn("`The conversion number to interval will be removed; construct an interval explicitly, e.g., `x..x`.", :convert)
-    convert(AbstractInterval{T}, convert(AbstractInterval, x))
-end
-function convert(::Type{TypedEndpointsInterval{:closed,:closed}}, x::Number)
-    Base.depwarn("`The conversion number to interval will be removed; construct an interval explicitly, e.g., `x..x`.", :convert)
-    x..x
-end
-function convert(::Type{TypedEndpointsInterval{:closed,:closed,T}}, x::Number) where T
-    Base.depwarn("`The conversion number to interval will be removed; construct an interval explicitly, e.g., `x..x`.", :convert)
-    convert(AbstractInterval{T}, convert(AbstractInterval, x))
-end
-function convert(::Type{ClosedInterval}, x::Number)
-    Base.depwarn("`The conversion number to interval will be removed; construct an interval explicitly, e.g., `x..x`.", :convert)
-    x..x
-end
-function convert(::Type{ClosedInterval{T}}, x::Number) where T
-    Base.depwarn("`The conversion number to interval will be removed; construct an interval explicitly, e.g., `x..x`.", :convert)
-    convert(AbstractInterval{T}, convert(AbstractInterval, x))
-end
-
 include("findall.jl")
 
 end # module
diff --git a/src/interval.jl b/src/interval.jl
@@ -92,12 +92,6 @@ Construct a ClosedInterval `iv` spanning the region from
 `center - halfwidth` to `center + halfwidth`.
 """
 ±(x, y) = ClosedInterval(x - y, x + y)
-function ±(x::CartesianIndex, y)
-    # TODO: Remove this method in the next breaking release
-    Base.depwarn("This method for `CartesianIndex(1,2) ± 1 == (0..2, 1..3)` is not consistent and will be removed because CartesianIndex(1,1) + 1 is not defined. " *
-                 "If you need tuple such as `(0..2, 1..3)` from `CartesianIndex`, just write it in a plain tuple form.", :±)
-    (xy = y * one(x); map(ClosedInterval, (x - xy).I, (x + xy).I))
-end
 ±(x::CartesianIndex, y::CartesianIndex) = ClosedInterval(x-y, x+y)
 
 show(io::IO, I::ClosedInterval) = print(io, leftendpoint(I), "..", rightendpoint(I))

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -49,8 +49,6 @@ struct IncompleteInterval <: AbstractInterval{Int} end
         M = @inferred(ClosedInterval(2, 5.0))
         @test string(M) == "2.0..5.0"
         N = @inferred(ClosedInterval(UInt8(255), 300))
-        O = @inferred(CartesianIndex(1, 2, 3, 4) ± 2)
-        @test O == (-1..3, 0..4, 1..5, 2..6)
 
         x, y = CartesianIndex(1, 2, 3, 4), CartesianIndex(1, 2, 3, 4)
         O = @inferred x±y
@@ -136,10 +134,6 @@ struct IncompleteInterval <: AbstractInterval{Int} end
         @test mean(0..1) == 0.5
 
         @test promote(1..2, 1.0..2.0) === (1.0..2.0, 1.0..2.0)
-
-        @test duration(1..2) == 2
-        # duration deliberately not defined for non-integer intervals
-        @test_throws MethodError duration(1.2..2.4)
     end
 
     @testset "Unitful interval" begin
@@ -154,8 +148,6 @@ struct IncompleteInterval <: AbstractInterval{Int} end
         @test width(ClosedInterval(A, B)) == Dates.Day(59)
         @test width(ClosedInterval(B, A)) == Dates.Day(0)
         @test isempty(ClosedInterval(B, A))
-        @test duration(ClosedInterval(A, B)) ≡ 60
-        @test duration(ClosedInterval(B, A)) ≡ 0
     end
 
     @testset "Convert" begin
@@ -221,15 +213,6 @@ struct IncompleteInterval <: AbstractInterval{Int} end
         @test 1.0..2.0 === 1.0..2 === 1..2.0 === ClosedInterval{Float64}(1..2) ===
                 Interval(1.0,2.0)
 
-        # TODO: Remove this test in the next breaking release (#97)
-        @test convert(AbstractInterval, 1.0) ==
-                convert(AbstractInterval{Float64}, 1) ==
-                convert(TypedEndpointsInterval{:closed,:closed}, 1.0) ==
-                convert(TypedEndpointsInterval{:closed,:closed,Float64}, 1) ==
-                convert(ClosedInterval, 1.0) ==
-                convert(ClosedInterval{Float64}, 1) ==
-                1.0..1.0
-
         @test promote_type(Interval{:closed,:open,Float64}, Interval{:closed,:open,Int}) ===
                         Interval{:closed,:open,Float64}
     end