Skip to content

Commit 2017b82

Browse files
Bump compat for OrdinaryDiffEq v7 / SciMLBase v3 ecosystem
- Bump OrdinaryDiffEq compat from "6.87" to "6, 7" - Bump OrdinaryDiffEqDefault compat from "1.1" to "1, 2" - Add OrdinaryDiffEqRosenbrock and OrdinaryDiffEqBDF as test dependencies with compat "1, 2" (needed because OrdinaryDiffEq v7 no longer exports Rodas4/Rodas5/DFBDF from the main package; add explicit sub-package imports in all affected test files) - Update docs/Project.toml OrdinaryDiffEq compat to "6, 7" Refs SciML/OrdinaryDiffEq.jl#3562 and #3565. Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>
1 parent f2f5faf commit 2017b82

15 files changed

Lines changed: 23 additions & 4 deletions

Project.toml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@ IfElse = "0.1"
2525
LinearAlgebra = "1.10"
2626
ModelingToolkit = "11"
2727
ModelingToolkitBase = "1"
28-
OrdinaryDiffEq = "6.87"
29-
OrdinaryDiffEqDefault = "1.1"
28+
OrdinaryDiffEq = "6, 7"
29+
OrdinaryDiffEqBDF = "1, 2"
30+
OrdinaryDiffEqDefault = "1, 2"
31+
OrdinaryDiffEqRosenbrock = "1, 2"
3032
PreallocationTools = "0.4.27, 1"
3133
SafeTestsets = "0.1"
3234
SciCompDSL = "1"
@@ -46,12 +48,14 @@ ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
4648
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
4749
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
4850
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
51+
OrdinaryDiffEqBDF = "6ad6398a-0878-4a85-9266-38940aa047c8"
4952
OrdinaryDiffEqDefault = "50262376-6c5a-4cf5-baba-aaf4f84d72d7"
53+
OrdinaryDiffEqRosenbrock = "43230ef6-c299-4910-a778-202eb28ce4ce"
5054
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
5155
SciCompDSL = "91a8cdf1-4ca6-467b-a780-87fda3fff15e"
5256
SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
5357
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
5458
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5559

5660
[targets]
57-
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]
61+
test = ["ADTypes", "Aqua", "LinearAlgebra", "OrdinaryDiffEqBDF", "OrdinaryDiffEqDefault", "OrdinaryDiffEq", "OrdinaryDiffEqRosenbrock", "SafeTestsets", "Test", "ControlSystemsBase", "DataFrames", "DataInterpolations", "SciMLStructures", "SymbolicIndexingInterface", "ForwardDiff", "SciCompDSL", "ModelingToolkit"]

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ DataInterpolations = "6.4, 7, 8"
1616
Documenter = "1"
1717
IfElse = "0.1"
1818
ModelingToolkit = "10"
19-
OrdinaryDiffEq = "6.31"
19+
OrdinaryDiffEq = "6, 7"
2020
Plots = "1.36"

test/Blocks/continuous.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ using SciCompDSL
33
using ModelingToolkitStandardLibrary.Blocks
44
using ModelingToolkit: t_nounits as t
55
using OrdinaryDiffEq: ReturnCode.Success
6+
using OrdinaryDiffEqRosenbrock: Rodas4
67
using Test
78

89
#=

test/Blocks/math.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ using ModelingToolkit, OrdinaryDiffEq, Test
44
using ModelingToolkitStandardLibrary.Blocks: _clamp, _dead_zone
55
using ModelingToolkit: inputs, unbound_inputs, bound_inputs, t_nounits as t
66
using OrdinaryDiffEq: ReturnCode.Success
7+
using OrdinaryDiffEqRosenbrock: Rodas4
78

89
@testset "Gain" begin
910
@named c = Constant(; k = 1)

test/Blocks/nonlinear.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ using ModelingToolkitStandardLibrary.Blocks
44
using ModelingToolkit: t_nounits as t
55
using ModelingToolkitStandardLibrary.Blocks: _dead_zone
66
using OrdinaryDiffEq: ReturnCode.Success
7+
using OrdinaryDiffEqRosenbrock: Rodas4
78

89
@testset "Limiter" begin
910
@testset "Constant" begin

test/Blocks/sources.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ using ModelingToolkitStandardLibrary.Blocks: smooth_sin, smooth_cos, smooth_damp
66
smooth_square, smooth_step, smooth_ramp,
77
smooth_triangular, triangular, square
88
using OrdinaryDiffEq: ReturnCode.Success
9+
using OrdinaryDiffEqRosenbrock: Rodas4
910
using DataInterpolations
1011
using DataFrames
1112
using SymbolicIndexingInterface

test/Blocks/test_analysis_points.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ using SciCompDSL
33
using ModelingToolkit
44
using ModelingToolkitStandardLibrary.Blocks
55
using OrdinaryDiffEq
6+
using OrdinaryDiffEqRosenbrock: Rodas5
67
using ModelingToolkit: t_nounits as t
78
using ControlSystemsBase
89

test/Electrical/analog.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ using ModelingToolkitStandardLibrary.Blocks: Step,
77
using ModelingToolkitStandardLibrary.Blocks: square, triangular
88
using ModelingToolkitStandardLibrary.Thermal: FixedTemperature
99
using OrdinaryDiffEq: ReturnCode.Success
10+
using OrdinaryDiffEqRosenbrock: Rodas4
1011

1112
# using Plots
1213

test/Magnetic/magnetic.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import ModelingToolkitStandardLibrary.Magnetic
77
using ModelingToolkit, OrdinaryDiffEq, Test
88
using ModelingToolkit: t_nounits as t
99
using OrdinaryDiffEq: ReturnCode.Success
10+
using OrdinaryDiffEqRosenbrock: Rodas4
1011
# using Plots
1112

1213
@testset "Inductor" begin

test/Mechanical/rotational.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ using SciCompDSL
55
using ModelingToolkit: t_nounits as t, D_nounits as D
66
import ModelingToolkitStandardLibrary.Blocks
77
using OrdinaryDiffEq: ReturnCode.Success
8+
using OrdinaryDiffEqRosenbrock: Rodas4
9+
using OrdinaryDiffEqBDF: DFBDF
810

911
# using Plots
1012

0 commit comments

Comments
 (0)