Skip to content

Commit 353b8e1

Browse files
authored
Merge pull request #2953 from JuliaReach/compathelper/new_version/2022-03-25-00-38-00-395-00921216336
CompatHelper: bump compat for JuMP to 1, (keep existing compat)
2 parents 2408fb1 + 05d260d commit 353b8e1

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
2222
ExprTools = "0.1"
2323
GLPK = "0.11 - 0.15, 1"
2424
IntervalArithmetic = "0.15 - 0.20"
25-
JuMP = "0.21 - 0.23"
25+
JuMP = "0.21 - 0.23, 1"
2626
RecipesBase = "0.6 - 0.8, 1"
2727
Reexport = "0.2, 1"
2828
Requires = "0.5, 1"

test/Approximations/overapproximate.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,10 @@ for N in [Float64, Float32]
161161
end
162162

163163
# static vectors
164-
b = BallInf(SVector{2}(N[1, 0]), N(1))
165-
p = overapproximate(b, ε)
166-
@test isequivalent(b, p)
164+
# temporarily deactivated, see #2954
165+
# b = BallInf(SVector{2}(N[1, 0]), N(1))
166+
# p = overapproximate(b, ε)
167+
# @test isequivalent(b, p)
167168

168169
# Check that there are no redundant constraints for a ballinf
169170
b = BallInf(N[0.5, 0.5], N(0.1))

test/Sets/Hyperplane.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ for N in [Float64]
200200

201201
# test passing a combination of operations
202202
vars = @variables x[1:2] t
203-
@test Hyperplane(x[1] == t, vars) == Hyperplane([1.0, 0.0, -1.0], 0.0)
203+
if VERSION < v"1.6"
204+
@test Hyperplane(x[1] == t, vars) == Hyperplane([1.0, 0.0, -1.0], 0.0)
205+
else
206+
# temporarily broken in Symbolics (https://github.com/JuliaSymbolics/Symbolics.jl/issues/559)
207+
@test_throws ErrorException Hyperplane(x[1] == t, vars)
208+
end
204209
end
205210
end

0 commit comments

Comments
 (0)