CompatHelper: bump compat for LazyArrays to 2, (keep existing compat) (#652)

* CompatHelper: bump compat for LazyArrays to 2, (keep existing compat)

* Update BlockArrays and BlockBandedMatrices

BlockArrays v1 and BlockBandedMatrices v0.13

* Support older versions of BlockArrays and BlockBandedMatrices

* Bump InfiniteArrays compat to include v0.14

* Change PseudoBlockArray to BlockedArray

* Import BlockedMatrix

* Require BlockArrays v1

* Bump minimum Julia version to v1.10

* Bump compat bounds for FillArrays and BlockBandedMatrices

* Bump BandedMatrices compat to v1

---------

Co-authored-by: CompatHelper Julia <[email protected]>
Co-authored-by: Jishnu Bhattacharya <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -39,7 +39,7 @@ jobs:
       matrix:
         version:
           - '1'
-          - '1.9'
+          - '1.10'
         os:
           - ubuntu-latest
           - macOS-latest

Project.toml

@@ -1,6 +1,6 @@
 name = "ApproxFunBase"
 uuid = "fbd15aa5-315a-5a7d-a8a4-24992e37be05"
-version = "0.9.27"
+version = "0.9.28"
 
 [deps]
 AbstractFFTs = "621f4979-c628-5d54-868e-fcf4e3e8185c"
@@ -27,29 +27,29 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 [compat]
 AbstractFFTs = "0.5, 1"
 Aqua = "0.8"
-BandedMatrices = "0.17.18, 1"
-BlockArrays = "0.16.26"
-BlockBandedMatrices = "0.12"
+BandedMatrices = "1"
+BlockArrays = "1"
+BlockBandedMatrices = "0.13"
 Calculus = "0.5"
 Combinatorics = "1.0.2"
 DSP = "0.7.4"
 DomainSets = "0.6, 0.7"
 DualNumbers = "0.6.6"
 FFTW = "1.1"
-FillArrays = "1"
-InfiniteArrays = "0.13"
+FillArrays = "1.11"
+InfiniteArrays = "0.13, 0.14"
 Infinities = "0.1.1"
 IntervalSets = "0.7.4"
-LazyArrays = "1"
-LinearAlgebra = "1.9"
+LazyArrays = "1, 2"
+LinearAlgebra = "1"
 LowRankMatrices = "1"
-Random = "1.9"
-SparseArrays = "1.9"
+Random = "1"
+SparseArrays = "1"
 SpecialFunctions = "2"
 StaticArrays = "1.3"
-Statistics = "1.9"
-Test = "1.9"
-julia = "1.9"
+Statistics = "1"
+Test = "1"
+julia = "1.10"
 
 [extras]
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"

src/ApproxFunBase.jl

@@ -87,7 +87,7 @@ import BandedMatrices: bandrange, inbands_setindex!, bandwidth,
               bandwidths, _BandedMatrix, BandedMatrix, isbanded
 
 import BlockArrays: blocksize, block, blockaxes, blockindex, blocklengths,
-                    PseudoBlockMatrix
+                    BlockedMatrix
 import BlockBandedMatrices: blockbandwidth, blockbandwidths, blockcolstop,
               blockcolrange, blockcolstart, blockrowstop, blockrowstart,
               subblockbandwidth, subblockbandwidths, _BlockBandedMatrix,

src/Caching/bandedblockbanded.jl

@@ -24,9 +24,9 @@ function resizedata!(B::CachedOperator{T,<:BandedBlockBandedMatrix{T}}, ::Colon,
         rows = blocklengths(rangespace(B.op))[1:J+l]
         cols = blocklengths(domainspace(B.op))[1:J]
 
-        # B.data = _BandedBlockBandedMatrix(PseudoBlockArray
+        # B.data = _BandedBlockBandedMatrix(BlockedArray
 
-        blocks = PseudoBlockArray(pad(B.data.data.blocks,:,(l+u+1)*sum(cols)), (axes(B.data.data,1), blockedrange(cols)))
+        blocks = BlockedArray(pad(B.data.data.blocks,:,(l+u+1)*sum(cols)), (axes(B.data.data,1), blockedrange(cols)))
         B.data = _BandedBlockBandedMatrix(blocks, rows, cols, (l, u), (λ, μ))
 
         jr=B.datasize[2]+1:col

src/LinearAlgebra/helper.jl

@@ -386,17 +386,17 @@ function interlace(a::AbstractVector, b::AbstractVector, (ncomponents_a, ncompon
     pad_b = pad(b, ncomponents_b * nblk_b)
 
     blksz_a = Fill(ncomponents_a, nblk_a)
-    aPBlk = PseudoBlockArray(pad_a, blksz_a)
+    aPBlk = BlockedArray(pad_a, blksz_a)
     blksz_b = Fill(ncomponents_b, nblk_b)
-    bPBkl = PseudoBlockArray(pad_b, blksz_b)
+    bPBkl = BlockedArray(pad_b, blksz_b)
 
     nblk_ret = nblk_a + nblk_b
     blksz_ret = zeros(Int, nblk_ret)
     blksz_ret[1:2:end] = blksz_a
     blksz_ret[2:2:end] = blksz_b
     nret = sum(blksz_ret)
     ret = initvector(T, nret)
-    retPBlk = PseudoBlockArray(ret, blksz_ret)
+    retPBlk = BlockedArray(ret, blksz_ret)
 
     @views begin
         for (ind, i) in enumerate(1:2:nblk_ret)

src/Operators/Operator.jl

@@ -687,9 +687,9 @@ macro wrappergetindex(Wrap)
                 ApproxFunBase.default_BlockBandedMatrix)
         end
 
-        function ApproxFunBase.PseudoBlockMatrix(S::ApproxFunBase.SubOperator{T,OP}) where {T,OP<:$Wrap}
+        function ApproxFunBase.BlockedMatrix(S::ApproxFunBase.SubOperator{T,OP}) where {T,OP<:$Wrap}
             ApproxFunBase._blockmaybebandedmatrix(S,
-                ApproxFunBase.PseudoBlockMatrix,
+                ApproxFunBase.BlockedMatrix,
                 ApproxFunBase.default_BlockMatrix)
         end
 
@@ -886,18 +886,18 @@ function BlockBandedMatrix(S::Operator)
 end
 
 function default_BlockMatrix(S::Operator)
-    ret = PseudoBlockArray(zeros(eltype(S), size(S)),
+    ret = BlockedArray(zeros(eltype(S), size(S)),
                         AbstractVector{Int}(blocklengths(rangespace(S))),
                         AbstractVector{Int}(blocklengths(domainspace(S))))
     ret .= S
     ret
 end
 
-function PseudoBlockMatrix(S::Operator)
+function BlockedMatrix(S::Operator)
     if isbandedblockbanded(S)
-        PseudoBlockMatrix(BandedBlockBandedMatrix(S))
+        BlockedMatrix(BandedBlockBandedMatrix(S))
     elseif isblockbanded(S)
-        PseudoBlockMatrix(BlockBandedMatrix(S))
+        BlockedMatrix(BlockBandedMatrix(S))
     else
         default_BlockMatrix(S)
     end
@@ -937,7 +937,7 @@ function arraytype(V::SubOperator{T,B,Tuple{KR,JR}}) where {T, B, KR <: Union{Bl
     P = parent(V)
     isbandedblockbanded(P) && return BandedBlockBandedMatrix
     isblockbanded(P) && return BlockBandedMatrix
-    return PseudoBlockMatrix
+    return BlockedMatrix
 end
 
 function arraytype(V::SubOperator{T,B,Tuple{KR,JR}}) where {T, B, KR <: Block, JR <: Block}