Skip to content

Commit c3e2962

Browse files
authored
Remove Requires.jl and bump to Julia 1.10+ (#306)
1 parent f1f771d commit c3e2962

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
version: ['1.6', '1'] # Test against LTS and 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:
2222
# Also test against 32-bit Linux on LTS.
23-
- version: '1.6'
23+
- version: '1.10'
2424
os: ubuntu-latest
2525
arch: x86
2626
# Test against Apple M-series

Project.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ version = "2.0.2"
55

66
[deps]
77
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
8-
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
98
SCS_jll = "f4f2fc5b-1d94-523c-97ea-2ab488bedf4b"
109
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1110

@@ -20,13 +19,12 @@ SCS_MKL_jll = "3f2553a9-4106-52be-b7dd-865123654657"
2019
[compat]
2120
MathOptInterface = "1.20"
2221
Pkg = "<0.0.1, ^1.6"
23-
Requires = "1"
2422
SCS_GPU_jll = "=3.2.4, =3.2.6, =3.2.7"
2523
SCS_MKL_jll = "=3.2.4, =3.2.6, =3.2.7"
2624
SCS_jll = "=3.2.4, =3.2.6, =3.2.7"
2725
SparseArrays = "<0.0.1, ^1.6"
2826
Test = "<0.0.1, ^1.6"
29-
julia = "1.6"
27+
julia = "1.10"
3028

3129
[extras]
3230
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

src/SCS.jl

-16
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
module SCS
77

88
import MathOptInterface as MOI
9-
import Requires # Remove when Julia 1.9 is the LTS
109
import SCS_jll
1110
import SparseArrays
1211

@@ -25,21 +24,6 @@ struct GpuIndirectSolver <: LinearSolver end
2524
# Code is contained in /ext/SCSSCS_MKL_jllExt
2625
struct MKLDirectSolver <: LinearSolver end
2726

28-
function __init__()
29-
# Remove when Julia 1.9 is the LTS
30-
@static if !isdefined(Base, :get_extension)
31-
Requires.@require(
32-
SCS_GPU_jll = "af6e375f-46ec-5fa0-b791-491b0dfa44a4",
33-
include("../ext/SCSSCS_GPU_jllExt.jl"),
34-
)
35-
Requires.@require(
36-
SCS_MKL_jll = "3f2553a9-4106-52be-b7dd-865123654657",
37-
include("../ext/SCSSCS_MKL_jllExt.jl"),
38-
)
39-
end
40-
return
41-
end
42-
4327
export scs_solve
4428

4529
end

0 commit comments

Comments
 (0)