Migrate to SciMLTesting v1.2 (off ReTestItems)

Project.toml

@@ -112,6 +112,7 @@ Reexport = "1.2.2"
 SIAMFANLEquations = "1.0.1"
 SafeTestsets = "0.1"
 SciMLBase = "3.19"
+SciMLTesting = "1"
 Setfield = "1.1.2"
 SciMLLogging = "1.10.1, 2"
 SimpleNonlinearSolve = "2.10"
@@ -134,9 +135,10 @@ PolyesterForwardDiff = "98d1487c-24ca-40b6-b7ab-df2af84e126b"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
 SciMLLogging = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["InteractiveUtils", "NaNMath", "NonlinearProblemLibrary", "Pkg", "PolyesterForwardDiff", "Random", "SafeTestsets", "SciMLLogging", "StableRNGs", "StaticArrays", "Test"]
+test = ["InteractiveUtils", "NaNMath", "NonlinearProblemLibrary", "Pkg", "PolyesterForwardDiff", "Random", "SafeTestsets", "SciMLLogging", "SciMLTesting", "StableRNGs", "StaticArrays", "Test"]

lib/BracketingNonlinearSolve/Project.toml

@@ -29,7 +29,6 @@ ConcreteStructs = "0.2.3"
 ForwardDiff = "0.10.36, 1"
 InteractiveUtils = "<0.0.1, 1"
 NonlinearSolveBase = "2.1"
-Pkg = "1.10"
 PrecompileTools = "1.2"
 Reexport = "1.2.2"
 SciMLBase = "2.153, 3"
@@ -38,13 +37,14 @@ Zygote = "0.7"
 julia = "1.10"
 
 SafeTestsets = "0.1"
+SciMLTesting = "1"
 [extras]
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f"
 
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 [targets]
-test = ["ForwardDiff", "InteractiveUtils", "Pkg", "Test", "Zygote", "SafeTestsets"]
+test = ["ForwardDiff", "InteractiveUtils", "Test", "Zygote", "SafeTestsets", "SciMLTesting"]

lib/BracketingNonlinearSolve/test/runtests.jl

@@ -1,44 +1,34 @@
-using Pkg
 using SafeTestsets, Test, InteractiveUtils
+using SciMLTesting
 
 @info sprint(InteractiveUtils.versioninfo)
 
-# Group dispatch: SublibraryCI sets NONLINEARSOLVE_TEST_GROUP; fall back to GROUP.
-const GROUP = get(ENV, "NONLINEARSOLVE_TEST_GROUP", get(ENV, "GROUP", "All"))
-
-@info "Running tests for group: $(GROUP)"
-
-# QA tooling (Aqua/ExplicitImports) lives in an isolated sub-environment under
-# test/qa so its compat bounds don't constrain the main test resolve. Develop
-# the in-repo path deps so [sources] also works on Julia < 1.11 (where the
-# Project.toml [sources] table is ignored), then instantiate.
-function activate_qa_env()
-    Pkg.activate(joinpath(@__DIR__, "qa"))
-    if VERSION < v"1.11.0-DEV.0"
-        Pkg.develop([
-            Pkg.PackageSpec(path = joinpath(@__DIR__, "..")),
-            Pkg.PackageSpec(path = joinpath(@__DIR__, "..", "..", "NonlinearSolveBase")),
-        ])
-    end
-    return Pkg.instantiate()
+# SublibraryCI sets NONLINEARSOLVE_TEST_GROUP; fall back to GROUP for local runs.
+if !haskey(ENV, "NONLINEARSOLVE_TEST_GROUP") && haskey(ENV, "GROUP")
+    ENV["NONLINEARSOLVE_TEST_GROUP"] = ENV["GROUP"]
 end
 
-if GROUP == "All" || GROUP == "Core"
-    include("muller_tests.jl")
-end
-
-if GROUP == "All" || GROUP == "Adjoint"
-    include("adjoint_tests.jl")
-end
-
-if GROUP == "All" || GROUP == "Core"
-    include("rootfind_tests.jl")
-end
-
-# QA (Aqua/ExplicitImports) is a dep-adding group: it runs in its own isolated
-# sub-env under test/qa (excluded from the base/Core/All run).
-if GROUP == "QA"
-    activate_qa_env()
-    @safetestset "Aqua" include("qa/qa.jl")
-    @safetestset "Explicit Imports" include("qa/explicit_imports.jl")
-end
+run_tests(;
+    env = "NONLINEARSOLVE_TEST_GROUP",
+    core = function ()
+        include("muller_tests.jl")
+        return include("rootfind_tests.jl")
+    end,
+    groups = Dict(
+        # Adjoint runs in the base test env (Zygote is a base test dep) and is part
+        # of the "All" run.
+        "Adjoint" => function ()
+            return include("adjoint_tests.jl")
+        end,
+    ),
+    # QA (Aqua/ExplicitImports) is a dep-adding group: it runs in its own isolated
+    # sub-env under test/qa (excluded from the base/Core/All run).
+    qa = (;
+        env = joinpath(@__DIR__, "qa"),
+        body = function ()
+            @safetestset "Aqua" include("qa/qa.jl")
+            return @safetestset "Explicit Imports" include("qa/explicit_imports.jl")
+        end,
+    ),
+    all = ["Core", "Adjoint"],
+)

lib/NonlinearSolveBase/Project.toml

@@ -87,7 +87,6 @@ LogExpFunctions = "0.3.29, 1"
 Markdown = "1.10"
 MaybeInplace = "0.1.4"
 Mooncake = "0.4, 0.5"
-Pkg = "1.10"
 PreallocationTools = "1.1.2"
 PrecompileTools = "1.2"
 Preferences = "1.4"
@@ -110,18 +109,19 @@ Tracker = "0.2.35"
 julia = "1.10"
 
 SafeTestsets = "0.1"
+SciMLTesting = "1"
 [extras]
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 SciMLStructures = "53ae85a6-f571-4167-b2af-e1d143709226"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
+SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283"
 [targets]
-test = ["BandedMatrices", "ChainRulesCore", "Enzyme", "ForwardDiff", "InteractiveUtils", "LinearAlgebra", "Pkg", "SciMLStructures", "SparseArrays", "Test", "SafeTestsets"]
+test = ["BandedMatrices", "ChainRulesCore", "Enzyme", "ForwardDiff", "InteractiveUtils", "LinearAlgebra", "SciMLStructures", "SparseArrays", "Test", "SafeTestsets", "SciMLTesting"]