Skip to content

Commit

Permalink
Remove Requires.jl and bump to Julia 1.10+ (#306)
Browse files Browse the repository at this point in the history
  • Loading branch information
odow authored Feb 21, 2025
1 parent f1f771d commit c3e2962
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ['1.6', '1'] # Test against LTS and current minor release
version: ['1.10', '1'] # Test against LTS and current minor release
os: [ubuntu-latest, macOS-latest, windows-latest]
arch: [x64]
include:
# Also test against 32-bit Linux on LTS.
- version: '1.6'
- version: '1.10'
os: ubuntu-latest
arch: x86
# Test against Apple M-series
Expand Down
4 changes: 1 addition & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = "2.0.2"

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

Expand All @@ -20,13 +19,12 @@ SCS_MKL_jll = "3f2553a9-4106-52be-b7dd-865123654657"
[compat]
MathOptInterface = "1.20"
Pkg = "<0.0.1, ^1.6"
Requires = "1"
SCS_GPU_jll = "=3.2.4, =3.2.6, =3.2.7"
SCS_MKL_jll = "=3.2.4, =3.2.6, =3.2.7"
SCS_jll = "=3.2.4, =3.2.6, =3.2.7"
SparseArrays = "<0.0.1, ^1.6"
Test = "<0.0.1, ^1.6"
julia = "1.6"
julia = "1.10"

[extras]
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Expand Down
16 changes: 0 additions & 16 deletions src/SCS.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
module SCS

import MathOptInterface as MOI
import Requires # Remove when Julia 1.9 is the LTS
import SCS_jll
import SparseArrays

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

function __init__()
# Remove when Julia 1.9 is the LTS
@static if !isdefined(Base, :get_extension)
Requires.@require(
SCS_GPU_jll = "af6e375f-46ec-5fa0-b791-491b0dfa44a4",
include("../ext/SCSSCS_GPU_jllExt.jl"),
)
Requires.@require(
SCS_MKL_jll = "3f2553a9-4106-52be-b7dd-865123654657",
include("../ext/SCSSCS_MKL_jllExt.jl"),
)
end
return
end

export scs_solve

end

0 comments on commit c3e2962

Please sign in to comment.