From 521f4d1015e470bd1d35b02027291d356c6b426c Mon Sep 17 00:00:00 2001 From: Fredrik Bagge Carlson Date: Fri, 29 Aug 2025 18:00:07 +0200 Subject: [PATCH 1/2] fix #1020 --- Project.toml | 4 +++- src/ControlSystems.jl | 1 + src/timeresp.jl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 63c066a04..5be6cdeeb 100644 --- a/Project.toml +++ b/Project.toml @@ -2,11 +2,12 @@ name = "ControlSystems" uuid = "a6e380b2-a6ca-5380-bf3e-84a91bcd477e" authors = ["Dept. Automatic Control, Lund University"] repo = "https://github.com/JuliaControl/ControlSystems.jl.git" -version = "1.15.0" +version = "1.15.1" [deps] ControlSystemsBase = "aaaaaaaa-a6ca-5380-bf3e-84a91bcd477e" DelayDiffEq = "bcd4f6db-9728-5f36-b5f7-82caef46ccdb" +DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -22,6 +23,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Aqua = "0.5" ControlSystemsBase = "1.3" DelayDiffEq = "5.31" +DiffEqBase = "6.183.2" DiffEqCallbacks = "2.16, 3, 4" ForwardDiff = "0.10, 1" OrdinaryDiffEq = "6.60" diff --git a/src/ControlSystems.jl b/src/ControlSystems.jl index c8193499e..426b37729 100644 --- a/src/ControlSystems.jl +++ b/src/ControlSystems.jl @@ -3,6 +3,7 @@ module ControlSystems using Reexport @reexport using ControlSystemsBase using ControlSystemsBase: issiso, ninputs, noutputs, nstates, numeric_type +import DiffEqBase using LinearAlgebra diff --git a/src/timeresp.jl b/src/timeresp.jl index 6756a41d2..c181756b0 100644 --- a/src/timeresp.jl +++ b/src/timeresp.jl @@ -1,4 +1,4 @@ -import OrdinaryDiffEq: ODEProblem, Tsit5, DiffEqBase, solve, BS3 +import OrdinaryDiffEq: ODEProblem, Tsit5, solve, BS3 import ControlSystemsBase: lsim, step, impulse, HammersteinWienerSystem, DelayLtiSystem, PartitionedStateSpace, SimResult import DelayDiffEq: MethodOfSteps # Function for DifferentialEquations lsim From ab4be242eb42f1da955c1e6c5e796d0ca21b65cf Mon Sep 17 00:00:00 2001 From: Fredrik Bagge Carlson Date: Fri, 29 Aug 2025 18:03:46 +0200 Subject: [PATCH 2/2] relax --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 5be6cdeeb..c1bb560ca 100644 --- a/Project.toml +++ b/Project.toml @@ -23,7 +23,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Aqua = "0.5" ControlSystemsBase = "1.3" DelayDiffEq = "5.31" -DiffEqBase = "6.183.2" +DiffEqBase = "6" DiffEqCallbacks = "2.16, 3, 4" ForwardDiff = "0.10, 1" OrdinaryDiffEq = "6.60"