From 8e7593dd6915a5e6f96454e9404769bbf97e2300 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 23 Mar 2025 05:54:12 -0100 Subject: [PATCH 1/4] Fully skip Aqua in downstream testing Aqua.jl just doesn't generally do well with downstream tests. So instead of disabling one test, it should just disable them all. This will fix https://github.com/SciML/OrdinaryDiffEq.jl/actions/runs/13932593014/job/38997101429#step:5:1605 --- test/runtests.jl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 587f6ea02..485ec3490 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -227,17 +227,16 @@ end # of OrdinaryDiffEq.jl but not in our regular CI - we just # skip it there. if !isempty(get(ENV, "GROUP", "")) - @info "Skipping stale_deps tests from Aqua.jl" - stale_deps = false + @info "Skipping tests from Aqua.jl" else - @info "Running stale_deps tests from Aqua.jl" - stale_deps = true - end - Aqua.test_all(PositiveIntegrators; + @info "Running tests from Aqua.jl" + Aqua.test_all(PositiveIntegrators; ambiguities = ambiguities, piracies = (; treat_as_own = [RecipesBase.apply_recipe],), persistent_tasks = persistent_tasks, stale_deps = stale_deps,) + end + end @testset "ExplicitImports.jl" begin From f432b11fb7ab3915e880ef8d3d7718c82682abc5 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 23 Mar 2025 16:57:45 -0100 Subject: [PATCH 2/4] Update test/runtests.jl Co-authored-by: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com> --- test/runtests.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 485ec3490..891776634 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -233,8 +233,7 @@ end Aqua.test_all(PositiveIntegrators; ambiguities = ambiguities, piracies = (; treat_as_own = [RecipesBase.apply_recipe],), - persistent_tasks = persistent_tasks, - stale_deps = stale_deps,) + persistent_tasks = persistent_tasks) end end From db79ac7386e1940af89678a30cdbefaeee1d1f8a Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 24 Mar 2025 05:55:54 +0100 Subject: [PATCH 3/4] update comment --- test/runtests.jl | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 891776634..27c2446bd 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -212,30 +212,29 @@ function linear_advection_fd_upwind_D!(D, u, p, t) end @testset "PositiveIntegrators.jl tests" begin - @testset "Aqua.jl" begin - # We do not test ambiguities since we get a lot of - # false positives from dependencies. - ambiguities = false - # The persistent_tasks test fails in the Downgrade CI - # action but not in regular CI - we just skip it there. - if !isempty(get(ENV, "POSITIVEINTEGRATORS_DOWNGRADE_CI", "")) - persistent_tasks = false - else - persistent_tasks = true - end - # The stale_deps test fails in the Downstream CI action + @testset "Aqua.jl" begin + # The Aqua.jl tests fails in the Downstream CI action # of OrdinaryDiffEq.jl but not in our regular CI - we just # skip it there. if !isempty(get(ENV, "GROUP", "")) @info "Skipping tests from Aqua.jl" else @info "Running tests from Aqua.jl" + # We do not test ambiguities since we get a lot of + # false positives from dependencies. + ambiguities = false + # The persistent_tasks test fails in the Downgrade CI + # action but not in regular CI - we just skip it there. + if !isempty(get(ENV, "POSITIVEINTEGRATORS_DOWNGRADE_CI", "")) + persistent_tasks = false + else + persistent_tasks = true + end Aqua.test_all(PositiveIntegrators; ambiguities = ambiguities, piracies = (; treat_as_own = [RecipesBase.apply_recipe],), persistent_tasks = persistent_tasks) end - end @testset "ExplicitImports.jl" begin From a691bdafde7f09e5b48d6dfb50f862dc6ec2144c Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Mon, 24 Mar 2025 08:23:42 +0100 Subject: [PATCH 4/4] format --- test/runtests.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index 27c2446bd..519c97469 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -212,7 +212,7 @@ function linear_advection_fd_upwind_D!(D, u, p, t) end @testset "PositiveIntegrators.jl tests" begin - @testset "Aqua.jl" begin + @testset "Aqua.jl" begin # The Aqua.jl tests fails in the Downstream CI action # of OrdinaryDiffEq.jl but not in our regular CI - we just # skip it there. @@ -231,9 +231,9 @@ end persistent_tasks = true end Aqua.test_all(PositiveIntegrators; - ambiguities = ambiguities, - piracies = (; treat_as_own = [RecipesBase.apply_recipe],), - persistent_tasks = persistent_tasks) + ambiguities = ambiguities, + piracies = (; treat_as_own = [RecipesBase.apply_recipe],), + persistent_tasks = persistent_tasks) end end