Skip to content

Commit db3ea4e

Browse files
Rik HuijzerDilumAluthgegiordanodlfivefifty
authored
Fix tests on Julia 1.8-beta1 (#205)
* Fix tests on Julia 1.8-beta1 * Avoid double runs on PR * Apply suggestions from code review Co-authored-by: Dilum Aluthge <dilum@aluthge.com> Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com> * Fix typo? * Fix CI * Oops. Fix copy paste error * Revert removal of egal * Update Project.toml * Update LazyArrays.jl Co-authored-by: Dilum Aluthge <dilum@aluthge.com> Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com> Co-authored-by: Sheehan Olver <solver@mac.com>
1 parent 983fad9 commit db3ea4e

5 files changed

Lines changed: 16 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: CI
22
on:
3-
- push
4-
- pull_request
3+
push:
4+
branches:
5+
- master
6+
pull_request:
57
jobs:
68
test:
79
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
@@ -11,7 +13,8 @@ jobs:
1113
matrix:
1214
version:
1315
- '1.6'
14-
- '^1.7.0-0'
16+
- '1' # Latest stable release
17+
- '^1.8.0-0'
1518
os:
1619
- ubuntu-latest
1720
- macOS-latest

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1212
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1313

1414
[compat]
15-
ArrayLayouts = "0.7.7"
15+
ArrayLayouts = "0.8"
1616
FillArrays = "0.12, 0.13"
1717
MacroTools = "0.5"
1818
MatrixFactorizations = "0.8.2"

test/applytests.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ import ArrayLayouts: StridedLayout
5858
@test copyto!(b, a) == a == b
5959
@test copyto!(c, a) == a == c
6060
@test copyto!(similar(a), a) == a
61-
@test_throws ErrorException copyto!(c, Array(a))
61+
if VERSION < v"1.8.0-"
62+
@test_throws ErrorException copyto!(c, Array(a))
63+
else
64+
@test_throws Base.CanonicalIndexError copyto!(c, Array(a))
65+
end
6266
end
6367

6468
@testset "view" begin
@@ -95,4 +99,4 @@ import ArrayLayouts: StridedLayout
9599
@test arguments(R) == (rot180(A), rot180(B))
96100
@test R rot180(A*B)
97101
end
98-
end
102+
end

test/multests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,4 +1161,4 @@ end
11611161
A = ApplyArray(*, [1 2; 3 4], [1 2; 3 4], [1 2; 3 4])
11621162
@test A[:,1] == Matrix(A)[:,1]
11631163
end
1164-
end
1164+
end

test/paddedtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ paddeddata(a::PaddedPadded) = a
207207
@test a .* v == v .* a
208208

209209
@test n .+ n Vcat(2,Zeros{Int}(3))
210+
@test n .+ v n .+ v
210211
@test n .+ v v .+ n Vcat(2,1:3)
211212
@test n .+ b == b .+ n
212213
@test n .+ a == a .+ n
@@ -314,4 +315,4 @@ paddeddata(a::PaddedPadded) = a
314315
c = cache(Zeros(4)); c[1] = 1
315316
@test norm(a) LinearAlgebra.normInf(c) LinearAlgebra.norm2(c) LinearAlgebra.norm1(c) LinearAlgebra.normp(c,2) 1.0
316317
end
317-
end
318+
end

0 commit comments

Comments
 (0)