Skip to content

Commit afee752

Browse files
authored
Merge pull request #436 from JuliaLang/aa/disable-oa
Temporarily disable the OffsetArrays tests for 0.7
2 parents 7a64c3f + 25515c1 commit afee752

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/Compat.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -775,8 +775,10 @@ if VERSION < v"0.7.0-DEV.2655"
775775
export eigs, svds
776776
end
777777
elseif VERSION < v"0.7.0-DEV.3019"
778-
import IterativeEigenSolvers
779-
const IterativeEigensolvers = IterativeEigenSolvers
778+
@eval module IterativeEigensolvers
779+
using IterativeEigenSolvers: eigs, svds
780+
export eigs, svds
781+
end
780782
else
781783
import IterativeEigensolvers
782784
end

test/runtests.jl

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,11 +630,16 @@ using Compat: StringVector
630630
@test String(fill!(StringVector(5), 0x61)) == "aaaaa"
631631

632632
# collect
633-
using OffsetArrays
634-
a = OffsetArray(1:3, -1:1)
635-
b = Compat.collect(a)
636-
@test indices(b) === (Base.OneTo(3),)
637-
@test b == [1,2,3]
633+
if VERSION < v"0.7.0-"
634+
# Note: This is disabled on 0.7, since the Compat.collect functionality is only
635+
# applicable on 0.5, and OffsetArrays currently has some incompatibilities with
636+
# 0.7. This can be reenabled later if needed.
637+
using OffsetArrays
638+
a = OffsetArray(1:3, -1:1)
639+
b = Compat.collect(a)
640+
@test indices(b) === (Base.OneTo(3),)
641+
@test b == [1,2,3]
642+
end
638643

639644
# PR 22064
640645
module Test22064

0 commit comments

Comments
 (0)