Skip to content

Commit e8ae6a8

Browse files
authored
Update to v2.7.4 (#33)
1 parent f3941df commit e8ae6a8

File tree

5 files changed

+4
-30
lines changed

5 files changed

+4
-30
lines changed

Artifacts.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

Project.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ version = "0.2.1"
55

66
[deps]
77
Chuffed_jll = "77125aae-c893-5498-99e3-e30470bfa328"
8-
LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
98
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
109
MiniZinc_jll = "3677d96b-3d39-5184-a844-8e8b2839af35"
1110
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1211

1312
[compat]
1413
Chuffed_jll = "=0.10.4"
1514
MathOptInterface = "1.8"
16-
MiniZinc_jll = "2.6.2"
15+
MiniZinc_jll = "=2.7.4"
1716
julia = "1.6"
1817

1918
[extras]

src/MiniZinc.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
module MiniZinc
77

88
import Chuffed_jll
9-
import LazyArtifacts
10-
import MathOptInterface
9+
import MathOptInterface as MOI
1110
import MiniZinc_jll
1211

13-
const MOI = MathOptInterface
14-
1512
const ReifiedLessThan{T} = MOI.Reified{MOI.LessThan{T}}
1613
const ReifiedGreaterThan{T} = MOI.Reified{MOI.GreaterThan{T}}
1714
const ReifiedEqualTo{T} = MOI.Reified{MOI.EqualTo{T}}

src/optimize.jl

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ function run_flatzinc(solver_cmd::F, filename, args = String[]) where {F}
1515
end
1616
end
1717

18-
function _artifact_path()
19-
return joinpath(
20-
LazyArtifacts.artifact"minizinc",
21-
"MiniZinc.x86_64-apple-darwin",
22-
"bin",
23-
"minizinc",
24-
)
25-
end
26-
2718
"""
2819
Optimizer{T}(solver_cmd) where {T}
2920
@@ -51,10 +42,8 @@ function _minizinc_exe(f::F) where {F}
5142
else
5243
return f(joinpath(user_dir, "minizinc"))
5344
end
54-
elseif Sys.islinux()
45+
elseif Sys.islinux() || Sys.isapple()
5546
return MiniZinc_jll.minizinc(f)
56-
elseif Sys.isapple()
57-
return f(_artifact_path())
5847
end
5948
return error(
6049
"Unable to call libminizinc. Please manually install a copy and set " *

test/runtests.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ module TestMiniZinc
77

88
using Test
99
import Chuffed_jll
10-
import MathOptInterface
10+
import MathOptInterface as MOI
1111
import MiniZinc
1212

13-
const MOI = MathOptInterface
14-
1513
function runtests()
1614
for name in names(@__MODULE__; all = true)
1715
if startswith("$(name)", "test_")

0 commit comments

Comments
 (0)