Skip to content

Commit 50b997a

Browse files
dlfivefiftydlfivefifty
committed
Drop support for Julia <v1.10
1 parent 5710d1a commit 50b997a

File tree

4 files changed

+27
-43
lines changed

4 files changed

+27
-43
lines changed

‎Project.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ version = "0.14.3"
44

55
[deps]
66
ArrayLayouts = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
7-
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
87
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
98
Infinities = "e1ba4f0e-776d-440f-acd9-e1d2e9742647"
109
LazyArrays = "5078a376-72f3-5289-bfd5-ec5146d43c02"
1110
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11+
12+
[weakdeps]
13+
DSP = "717857b8-e6f2-59f4-9121-6e50c889abd2"
1214
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1315

1416
[compat]

‎src/InfiniteArrays.jl‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ import Base: *, +, -, /, <, ==, >, \, ≤, ≥, (:), @propagate_inbounds,
1616
to_shape, transpose, unaliascopy, union, unitrange_last, unsafe_convert, unsafe_indices, unsafe_length,
1717
vcat, zeros
1818

19-
if VERSION < v"1.8-"
20-
import Base: _rangestyle
21-
else
22-
import Base: range_start_step_length
23-
end
19+
20+
import Base: range_start_step_length
21+
2422
if VERSION ≥ v"1.11.0-DEV.21"
2523
using LinearAlgebra: UpperOrLowerTriangular
2624
else
@@ -210,10 +208,5 @@ end
210208

211209
collect(G::Base.Generator{<:InfRanges}) = BroadcastArray(G.f, G.iter)
212210

213-
if !isdefined(Base, :get_extension)
214-
include("../ext/InfiniteArraysStatisticsExt.jl")
215-
include("../ext/InfiniteArraysDSPExt.jl")
216-
end
217-
218211

219212
end # module

‎src/infrange.jl‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,12 @@ _range(a::Real, ::Nothing, ::Nothing, len::InfiniteCardinal{0})
2929
_range(a::AbstractFloat, ::Nothing, ::Nothing, len::InfiniteCardinal{0}) = _range(a, oftype(a, 1), nothing, len)
3030
_range(a::T, st::T, ::Nothing, ::InfiniteCardinal{0}) where T<:IEEEFloat = InfStepRange{T,T}(a, st)
3131
_range(a::T, st::T, ::Nothing, ::InfiniteCardinal{0}) where T<:AbstractFloat = InfStepRange{T,T}(a, st)
32-
if VERSION < v"1.8-"
33-
_rangestyle(::Ordered, ::ArithmeticWraps, a::T, step::S, len::InfiniteCardinal{0}) where {T,S} = InfStepRange{T,S}(a, step)
34-
_rangestyle(::Ordered, ::ArithmeticUnknown, a::T, step::S, len::InfiniteCardinal{0}) where {T,S} = InfStepRange{T,S}(a, step)
35-
_rangestyle(::Any, ::Any, a::T, step::S, len::InfiniteCardinal{0}) where {T,S} = InfStepRange{T,S}(a, step)
36-
else
37-
range_start_step_length(a, st, ::InfiniteCardinal{0}) = InfStepRange(a, st)
38-
range_start_step_length(a::Real, st::IEEEFloat, len::InfiniteCardinal{0}) = range_start_step_length(promote(a, st)..., len)
39-
range_start_step_length(a::IEEEFloat, st::Real, len::InfiniteCardinal{0}) = range_start_step_length(promote(a, st)..., len)
40-
range_start_step_length(a::IEEEFloat, st::IEEEFloat, len::InfiniteCardinal{0}) = range_start_step_length(promote(a, st)..., len)
41-
range_start_step_length(a::T, st::T, ::InfiniteCardinal{0}) where T<:IEEEFloat = InfStepRange{T,T}(a, st)
42-
end
32+
range_start_step_length(a, st, ::InfiniteCardinal{0}) = InfStepRange(a, st)
33+
range_start_step_length(a::Real, st::IEEEFloat, len::InfiniteCardinal{0}) = range_start_step_length(promote(a, st)..., len)
34+
range_start_step_length(a::IEEEFloat, st::Real, len::InfiniteCardinal{0}) = range_start_step_length(promote(a, st)..., len)
35+
range_start_step_length(a::IEEEFloat, st::IEEEFloat, len::InfiniteCardinal{0}) = range_start_step_length(promote(a, st)..., len)
36+
range_start_step_length(a::T, st::T, ::InfiniteCardinal{0}) where T<:IEEEFloat = InfStepRange{T,T}(a, st)
37+
4338

4439

4540
# Construct range for rational start=start_n/den, step=step_n/den
@@ -101,16 +96,14 @@ AbstractMatrix{T}(ac::Transpose{<:Any,<:InfRanges}) where T<:Real = transpose(Ab
10196
copy(ac::AdjOrTrans{<:Any,<:InfRanges}) = ac
10297
reverse(a::InfRanges) = throw(ArgumentError("Cannot reverse infinite range"))
10398

104-
if VERSION ≥ v"1.7-"
105-
Base.range_start_step_length(a::T, st::T, len::PosInfinity) where T<:Union{Float16,Float32,Float64} = InfStepRange(a, st)
106-
for op in (:+, :-)
107-
@eval $op(a::InfRanges, b::InfRanges) = InfStepRange($op(first(a),first(b)), $op(step(a),step(b)))
108-
end
109-
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::Number, r::InfRanges) = InfStepRange(x*first(r), x*step(r))
110-
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::InfRanges, x::Number) = InfStepRange(first(r)*x, step(r)*x)
111-
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::AbstractFloat, r::InfRanges) = InfStepRange(x*first(r), x*step(r))
112-
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::InfRanges, x::AbstractFloat) = InfStepRange(first(r)*x, step(r)*x)
99+
Base.range_start_step_length(a::T, st::T, len::PosInfinity) where T<:Union{Float16,Float32,Float64} = InfStepRange(a, st)
100+
for op in (:+, :-)
101+
@eval $op(a::InfRanges, b::InfRanges) = InfStepRange($op(first(a),first(b)), $op(step(a),step(b)))
113102
end
103+
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::Number, r::InfRanges) = InfStepRange(x*first(r), x*step(r))
104+
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::InfRanges, x::Number) = InfStepRange(first(r)*x, step(r)*x)
105+
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), x::AbstractFloat, r::InfRanges) = InfStepRange(x*first(r), x*step(r))
106+
broadcasted(::DefaultArrayStyle{1}, ::typeof(*), r::InfRanges, x::AbstractFloat) = InfStepRange(first(r)*x, step(r)*x)
114107

115108

116109
"""
@@ -154,9 +147,7 @@ isempty(r::InfRanges) = false
154147
step(r::InfStepRange) = r.step
155148

156149
length(r::InfRanges) = ℵ₀
157-
if VERSION >= v"1.7"
158-
Base.checked_length(r::InfRanges) = ℵ₀
159-
end
150+
Base.checked_length(r::InfRanges) = ℵ₀
160151
unsafe_length(r::InfRanges) = ℵ₀
161152

162153
first(r::OneToInf{T}) where {T} = oneunit(T)
@@ -604,9 +595,7 @@ findfirst(::typeof(iszero), r::InfRanges{T}) where {T} = findfirst(==(zero(T)),
604595

605596
FillArrays._range_convert(::Type{AbstractVector{T}}, r::InfRanges) where T = convert(AbstractVector{T}, r)
606597

607-
if VERSION <= v"1.9"
608-
permutedims(D::Diagonal{<:Any,<:InfRanges}) = D
609-
end
598+
permutedims(D::Diagonal{<:Any,<:InfRanges}) = D
610599
copy(D::Diagonal{<:Any,<:InfRanges}) = D
611600
broadcasted(::LazyArrayStyle{2}, ::typeof(*), a::Number, D::Diagonal{<:Any,<:InfRanges}) = a*D
612601
broadcasted(::LazyArrayStyle{2}, ::typeof(*), D::Diagonal{<:Any,<:InfRanges}, a::Number) = D*a
@@ -630,3 +619,7 @@ end
630619
function Base.checkindex(::Type{Bool}, inds::NTuple{N, AbstractInfUnitRange}, i::AbstractRange{CartesianIndex{N}}) where {N}
631620
isempty(i) | checkindex(Bool, inds, first(i))
632621
end
622+
623+
624+
LinearAlgebra._cut_B(x::AbstractVector, ::InfUnitRange) = x
625+
LinearAlgebra._cut_B(X::AbstractMatrix, ::InfUnitRange) = X

‎test/runtests.jl‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,7 @@ end
167167
@test length(2:-.2:-∞) == ℵ₀
168168
@test length(2.:-.2:-∞) == ℵ₀
169169

170-
if VERSION >= v"1.7"
171-
@test Base.checked_length(1:∞) == length(1:∞)
172-
end
170+
@test Base.checked_length(1:∞) == length(1:∞)
173171

174172
@testset "IteratorSize" begin
175173
@test Base.IteratorSize(1:2:∞) == Base.IsInfinite()
@@ -621,9 +619,7 @@ end
621619
@test D[:,5][1:10] == D[1:10,5]
622620
@test D[5,:][1:10] == D[5,1:10]
623621

624-
if VERSION ≥ v"1.7-"
625-
@test D^2 isa Diagonal
626-
end
622+
@test D^2 isa Diagonal
627623
@test D*D isa Diagonal
628624
@test MemoryLayout(typeof(D.diag)) == LazyLayout()
629625
@test MemoryLayout(typeof(D)) == DiagonalLayout{LazyLayout}()

0 commit comments

Comments
 (0)