Skip to content

Commit 9e74072

Browse files
authored
Maintenance update to minimum of Julia v1.10 (#200)
1 parent 66de0df commit 9e74072

6 files changed

Lines changed: 26 additions & 29 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
version: ['1.6', '1'] # Test against current minor release
18+
version: ['1.10', '1'] # Test against LTS and current minor release
1919
os: [ubuntu-latest, macOS-latest, windows-latest]
2020
arch: [x64]
2121
include:
22-
# Also test against 32-bit Linux
23-
- version: '1'
22+
# Also test against 32-bit Linux on LTS.
23+
- version: '1.10'
2424
os: ubuntu-latest
2525
arch: x86
26+
# Test against Apple M-series
27+
- version: '1'
28+
os: macos-14
29+
arch: aarch64
2630
steps:
2731
- uses: actions/checkout@v4
2832
- uses: julia-actions/setup-julia@v2

.github/workflows/format_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
shell: julia --color=yes {0}
1919
run: |
2020
using Pkg
21-
Pkg.add(PackageSpec(name="JuliaFormatter", version="1"))
21+
Pkg.add(PackageSpec(name="JuliaFormatter", version="2"))
2222
using JuliaFormatter
2323
format("src", verbose=true)
2424
format("test", verbose=true)

Project.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@ uuid = "7c4d4715-977e-5154-bfe0-e096adeac482"
33
version = "1.2.3"
44

55
[deps]
6+
Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7"
67
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
78
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
89
OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2"
910

1011
[compat]
11-
Ipopt_jll = "=300.1400.400, =300.1400.1400, =300.1400.1600"
12-
LinearAlgebra = "<0.0.1, 1.6"
12+
Ipopt_jll = "300.1400"
13+
LinearAlgebra = "1"
1314
MathOptInterface = "1.18"
14-
OpenBLAS32_jll = "0.3.12, 0.3.24"
15-
Test = "<0.0.1, 1.6"
16-
julia = "1.6"
15+
OpenBLAS32_jll = "0.3.12"
16+
Test = "1"
17+
julia = "1.10"
1718

1819
[extras]
1920
Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7"

src/AmplNLWriter.jl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,16 @@ import MathOptInterface as MOI
1010
import OpenBLAS32_jll
1111

1212
function __init__()
13-
if VERSION >= v"1.8"
14-
config = LinearAlgebra.BLAS.lbt_get_config()
15-
if !any(lib -> lib.interface == :lp64, config.loaded_libs)
16-
LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path)
17-
end
13+
config = LinearAlgebra.BLAS.lbt_get_config()
14+
if !any(lib -> lib.interface == :lp64, config.loaded_libs)
15+
LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path)
1816
end
1917
return
2018
end
2119

2220
function _get_blas_loaded_libs()
23-
if VERSION >= v"1.8"
24-
config = LinearAlgebra.BLAS.lbt_get_config()
25-
return join([lib.libname for lib in config.loaded_libs], ";")
26-
end
27-
return ""
21+
config = LinearAlgebra.BLAS.lbt_get_config()
22+
return join([lib.libname for lib in config.loaded_libs], ";")
2823
end
2924

3025
"""

test/MINLPTests/Project.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1010
Uno_jll = "396d5378-14f1-5ab1-981d-48acd51740ed"
1111

1212
[compat]
13-
Bonmin_jll = "100.800.801"
14-
Couenne_jll = "0.500.801"
15-
Ipopt_jll = "=300.1400.1600"
13+
Bonmin_jll = "100.800.901"
14+
Couenne_jll = "0.500.802"
15+
Ipopt_jll = "300.1400.1900"
1616
JuMP = "1"
1717
MathOptInterface = "1.33"
1818
MINLPTests = "0.6"
1919
SHOT_jll = "100.100.0"
20-
Uno_jll = "1.1.0"
21-
julia = "1.6"
20+
Uno_jll = "1"
21+
julia = "1.10"

test/MOI_wrapper.jl

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ function test_ipopt_runtests()
6868
"test_conic_NormInfinityCone_INFEASIBLE",
6969
"test_conic_NormOneCone_INFEASIBLE",
7070
"test_conic_linear_VectorOfVariables_2",
71+
# Bug on macOS
72+
r"^test_linear_transform$",
7173
# Ipopt doesn't support integrality
7274
"_ObjectiveBound_",
7375
"_ZeroOne_",
@@ -96,11 +98,6 @@ function test_name()
9698
return
9799
end
98100

99-
function test_show()
100-
@test sprint(show, AmplNLWriter.Optimizer()) == "An AMPL (.nl) model"
101-
return
102-
end
103-
104101
function test_solver_name()
105102
@test MOI.get(ipopt_optimizer(), MOI.SolverName()) == "AmplNLWriter"
106103
return

0 commit comments

Comments
 (0)