diff --git a/.github/workflows/Documentation.yml b/.github/workflows/Documentation.yml index 04b586607..5ef9d54ec 100644 --- a/.github/workflows/Documentation.yml +++ b/.github/workflows/Documentation.yml @@ -31,14 +31,6 @@ jobs: using Pkg Pkg.develop(PackageSpec(path=pwd())) Pkg.instantiate() - println("--- Adding OrdinaryDiffEq from master") - # Drop any stale dev checkout a previous run left in ~/.julia/dev so the - # current master is cloned fresh; a stale checkout can pin an old version - # that conflicts with the docs [compat] (e.g. OrdinaryDiffEq 6.x vs "7"). - let p = joinpath(Pkg.devdir(), "OrdinaryDiffEq") - isdir(p) && rm(p; recursive = true, force = true) - end - Pkg.develop("OrdinaryDiffEq") env: DATADEPS_ALWAYS_ACCEPT: true JULIA_PKG_PRECOMPILE_AUTO: 0 diff --git a/docs/make.jl b/docs/make.jl index a90214ed4..d028f1869 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -25,10 +25,11 @@ import ODEProblemLibrary, SDEProblemLibrary, DDEProblemLibrary, DAEProblemLibrary, BVProblemLibrary using Sundials, DASKR, LSODA, DASSL, SimpleDiffEq, ODEInterfaceDiffEq -# Use development versions for API documentation -import Pkg -Pkg.develop("OrdinaryDiffEq") -Pkg.develop("StochasticDiffEq") +# OrdinaryDiffEq, StochasticDiffEq and the solver subpackages are resolved from the +# registry at their released versions — their docs/ ship in the released packages, +# so the API docs below are copied from the installed (stable) packages with no +# Pkg.develop of master (which would pin the docs to unreleased code and risk +# monorepo version skew against the registered subpackages). cp("./docs/Manifest.toml", "./docs/src/assets/Manifest.toml", force = true) cp("./docs/Project.toml", "./docs/src/assets/Project.toml", force = true) diff --git a/docs/src/features/low_dep.md b/docs/src/features/low_dep.md index 8fb1526a0..49959e3d7 100644 --- a/docs/src/features/low_dep.md +++ b/docs/src/features/low_dep.md @@ -121,6 +121,7 @@ the old `using DifferentialEquations` shape: import OrdinaryDiffEq as ODE import OrdinaryDiffEqLowOrderRK as ODELow # Euler import DiffEqCallbacks as CB # ProbIntsUncertainty +import SciMLBase # EnsembleProblem function fitz(du, u, p, t) V, R = u a, b, c = p @@ -132,7 +133,7 @@ tspan = (0.0, 20.0) p = (0.2, 0.2, 3.0) prob = ODE.ODEProblem(fitz, u0, tspan, p) cb = CB.ProbIntsUncertainty(0.2, 1) -ensemble_prob = ODE.EnsembleProblem(prob) +ensemble_prob = SciMLBase.EnsembleProblem(prob) sim = ODE.solve(ensemble_prob, ODELow.Euler(), trajectories = 100, callback = cb, dt = 1 / 10) ```