diff --git a/lib/OptimizationAuglag/Project.toml b/lib/OptimizationAuglag/Project.toml index 4937cf583..3d9f8267c 100644 --- a/lib/OptimizationAuglag/Project.toml +++ b/lib/OptimizationAuglag/Project.toml @@ -10,6 +10,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -23,6 +24,7 @@ OptimizationBase = {path = "../OptimizationBase"} OptimizationOptimisers = {path = "../OptimizationOptimisers"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" ForwardDiff = "1.0.1" @@ -37,4 +39,4 @@ Test = "1.10.0" julia = "1.10" [targets] -test = ["Test", "ForwardDiff", "MLUtils", "OptimizationOptimisers", "Random", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "ForwardDiff", "MLUtils", "OptimizationOptimisers", "Random", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationAuglag/test/qa/Project.toml b/lib/OptimizationAuglag/test/qa/Project.toml index c99a701a8..b445da2c2 100644 --- a/lib/OptimizationAuglag/test/qa/Project.toml +++ b/lib/OptimizationAuglag/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationAuglag = "2ea93f80-9333-43a1-a68d-1f53b957a421" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationAuglag = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationAuglag/test/runtests.jl b/lib/OptimizationAuglag/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationAuglag/test/runtests.jl +++ b/lib/OptimizationAuglag/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationBBO/Project.toml b/lib/OptimizationBBO/Project.toml index 5294254e1..75952e93a 100644 --- a/lib/OptimizationBBO/Project.toml +++ b/lib/OptimizationBBO/Project.toml @@ -12,6 +12,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" @@ -21,6 +22,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" BlackBoxOptim = "0.6.3" LogExpFunctions = "0.3.28" OptimizationBase = "5" @@ -33,4 +35,4 @@ Test = "1.10" julia = "1.10" [targets] -test = ["Random", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Random", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationBBO/test/qa/Project.toml b/lib/OptimizationBBO/test/qa/Project.toml index 7e114dcf3..04e17bf58 100644 --- a/lib/OptimizationBBO/test/qa/Project.toml +++ b/lib/OptimizationBBO/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationBBO = "3e6eede4-6085-4f62-9a71-46d9bc1eb92b" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationBBO = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationBBO/test/runtests.jl b/lib/OptimizationBBO/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationBBO/test/runtests.jl +++ b/lib/OptimizationBBO/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationBase/test/qa/Project.toml b/lib/OptimizationBase/test/qa/Project.toml index a7120a912..36124adc6 100644 --- a/lib/OptimizationBase/test/qa/Project.toml +++ b/lib/OptimizationBase/test/qa/Project.toml @@ -6,9 +6,6 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[sources] -OptimizationBase = {path = "../.."} - [compat] Aqua = "0.8" JET = "0.9, 0.10, 0.11" diff --git a/lib/OptimizationCMAEvolutionStrategy/Project.toml b/lib/OptimizationCMAEvolutionStrategy/Project.toml index 1885a0a32..8c9c1336c 100644 --- a/lib/OptimizationCMAEvolutionStrategy/Project.toml +++ b/lib/OptimizationCMAEvolutionStrategy/Project.toml @@ -9,6 +9,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -17,6 +18,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" Test = "1" @@ -27,4 +29,4 @@ SciMLBase = "2.122.1, 3" Reexport = "1.2" [targets] -test = ["Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationCMAEvolutionStrategy/test/qa/Project.toml b/lib/OptimizationCMAEvolutionStrategy/test/qa/Project.toml index 410099d0f..f13ca96f1 100644 --- a/lib/OptimizationCMAEvolutionStrategy/test/qa/Project.toml +++ b/lib/OptimizationCMAEvolutionStrategy/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationCMAEvolutionStrategy = "bd407f91-200f-4536-9381-e4ba712f53f8" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationCMAEvolutionStrategy = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationCMAEvolutionStrategy/test/runtests.jl b/lib/OptimizationCMAEvolutionStrategy/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationCMAEvolutionStrategy/test/runtests.jl +++ b/lib/OptimizationCMAEvolutionStrategy/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationEvolutionary/Project.toml b/lib/OptimizationEvolutionary/Project.toml index 6ce43ad1c..76bacbf1f 100644 --- a/lib/OptimizationEvolutionary/Project.toml +++ b/lib/OptimizationEvolutionary/Project.toml @@ -12,6 +12,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -21,6 +22,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Evolutionary = "0.11" LogExpFunctions = "0.3.28" OptimizationBase = "5" @@ -33,4 +35,4 @@ Test = "1.10" julia = "1.10" [targets] -test = ["Random", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Random", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationEvolutionary/test/qa/Project.toml b/lib/OptimizationEvolutionary/test/qa/Project.toml index b74471af1..0faee410f 100644 --- a/lib/OptimizationEvolutionary/test/qa/Project.toml +++ b/lib/OptimizationEvolutionary/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationEvolutionary = "cb963754-43f6-435e-8d4b-99009ff27753" @@ -7,9 +8,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationEvolutionary = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationEvolutionary/test/runtests.jl b/lib/OptimizationEvolutionary/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationEvolutionary/test/runtests.jl +++ b/lib/OptimizationEvolutionary/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationGCMAES/Project.toml b/lib/OptimizationGCMAES/Project.toml index eea4fd017..9c3e2e413 100644 --- a/lib/OptimizationGCMAES/Project.toml +++ b/lib/OptimizationGCMAES/Project.toml @@ -9,6 +9,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" GCMAES = "4aa9d100-eb0f-11e8-15f1-25748831eb3b" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -18,6 +19,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" ForwardDiff = "0.10, 1" GCMAES = "0.1.34" OptimizationBase = "5.1" @@ -29,4 +31,4 @@ Test = "1.10" julia = "1.10" [targets] -test = ["ForwardDiff", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ForwardDiff", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationGCMAES/test/qa/Project.toml b/lib/OptimizationGCMAES/test/qa/Project.toml index dbb408f5f..caab42d43 100644 --- a/lib/OptimizationGCMAES/test/qa/Project.toml +++ b/lib/OptimizationGCMAES/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationGCMAES = "6f0a0517-dbc2-4a7a-8a20-99ae7f27e911" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationGCMAES = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationGCMAES/test/runtests.jl b/lib/OptimizationGCMAES/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationGCMAES/test/runtests.jl +++ b/lib/OptimizationGCMAES/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationIpopt/Project.toml b/lib/OptimizationIpopt/Project.toml index b260146fb..21baa813f 100644 --- a/lib/OptimizationIpopt/Project.toml +++ b/lib/OptimizationIpopt/Project.toml @@ -12,6 +12,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" [compat] +SciMLTesting = "2.1" Aqua = "0.8" Ipopt = "1.10.3" LinearAlgebra = "1.10.0" @@ -34,6 +35,7 @@ julia = "1.10" OptimizationBase = {path = "../OptimizationBase"} [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" @@ -45,4 +47,4 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["Aqua", "ModelingToolkit", "Random", "ReverseDiff", "Test", "Symbolics", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Aqua", "ModelingToolkit", "Random", "ReverseDiff", "Test", "Symbolics", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationIpopt/test/qa/Project.toml b/lib/OptimizationIpopt/test/qa/Project.toml index 6eac0c726..002eab905 100644 --- a/lib/OptimizationIpopt/test/qa/Project.toml +++ b/lib/OptimizationIpopt/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationIpopt = "43fad042-7963-4b32-ab19-e2a4f9a67124" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationIpopt = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationIpopt/test/runtests.jl b/lib/OptimizationIpopt/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationIpopt/test/runtests.jl +++ b/lib/OptimizationIpopt/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationLBFGSB/Project.toml b/lib/OptimizationLBFGSB/Project.toml index ec3ca162d..6daf03a06 100644 --- a/lib/OptimizationLBFGSB/Project.toml +++ b/lib/OptimizationLBFGSB/Project.toml @@ -10,6 +10,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -21,6 +22,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" DocStringExtensions = "0.9.5" @@ -35,4 +37,4 @@ Zygote = "0.7.10" julia = "1.10" [targets] -test = ["Test", "ForwardDiff", "MLUtils", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "ForwardDiff", "MLUtils", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationLBFGSB/test/qa/Project.toml b/lib/OptimizationLBFGSB/test/qa/Project.toml index 416b32854..fc721b197 100644 --- a/lib/OptimizationLBFGSB/test/qa/Project.toml +++ b/lib/OptimizationLBFGSB/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationLBFGSB = "22f7324a-a79d-40f2-bebe-3af60c77bd15" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationLBFGSB = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationLBFGSB/test/runtests.jl b/lib/OptimizationLBFGSB/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationLBFGSB/test/runtests.jl +++ b/lib/OptimizationLBFGSB/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationMOI/Project.toml b/lib/OptimizationMOI/Project.toml index 99b21b810..fedd2d402 100644 --- a/lib/OptimizationMOI/Project.toml +++ b/lib/OptimizationMOI/Project.toml @@ -23,6 +23,7 @@ ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" AmplNLWriter = "1" @@ -49,6 +50,7 @@ Zygote = "0.6, 0.7" julia = "1.10" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" AmplNLWriter = "7c4d4715-977e-5154-bfe0-e096adeac482" @@ -62,4 +64,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["AmplNLWriter", "HiGHS", "Ipopt", "Ipopt_jll", "Juniper", "NLopt", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "AmplNLWriter", "HiGHS", "Ipopt", "Ipopt_jll", "Juniper", "NLopt", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationMOI/test/qa/Project.toml b/lib/OptimizationMOI/test/qa/Project.toml index 31a3568d7..9d738d100 100644 --- a/lib/OptimizationMOI/test/qa/Project.toml +++ b/lib/OptimizationMOI/test/qa/Project.toml @@ -9,7 +9,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] OptimizationBase = {path = "../../../OptimizationBase"} -OptimizationMOI = {path = "../.."} [compat] Aqua = "0.8" diff --git a/lib/OptimizationMOI/test/qa/qa.jl b/lib/OptimizationMOI/test/qa/qa.jl index 0a41a128b..df446ff7e 100644 --- a/lib/OptimizationMOI/test/qa/qa.jl +++ b/lib/OptimizationMOI/test/qa/qa.jl @@ -53,6 +53,14 @@ run_qa( :AutoSparsePolyesterForwardDiff, :AutoSparseReverseDiff, :AutoSparseZygote, + :DEFAULT_CALLBACK, + :DEFAULT_DATA, + :IncompatibleOptimizerError, + :MaxSense, + :MinSense, + :ObjSense, + :OptimizationCache, + :OptimizerMissingError, ), ), ei_broken = (:no_implicit_imports,), diff --git a/lib/OptimizationMOI/test/runtests.jl b/lib/OptimizationMOI/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationMOI/test/runtests.jl +++ b/lib/OptimizationMOI/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationMadNLP/Project.toml b/lib/OptimizationMadNLP/Project.toml index f20a56725..553b9b4f3 100644 --- a/lib/OptimizationMadNLP/Project.toml +++ b/lib/OptimizationMadNLP/Project.toml @@ -14,6 +14,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5" [compat] +SciMLTesting = "2.1" ADTypes = "1.14" Aqua = "0.8" DifferentiationInterface = "0.7.13" @@ -42,6 +43,7 @@ OptimizationBase = {path = "../OptimizationBase"} OptimizationNLPModels = {path = "../OptimizationNLPModels"} [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b" @@ -57,4 +59,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["ADTypes", "Aqua", "DifferentiationInterface", "ForwardDiff", "ModelingToolkit", "Random", "ReverseDiff", "Test", "SparseArrays", "Symbolics", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ADTypes", "Aqua", "DifferentiationInterface", "ForwardDiff", "ModelingToolkit", "Random", "ReverseDiff", "Test", "SparseArrays", "Symbolics", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationMadNLP/test/qa/Project.toml b/lib/OptimizationMadNLP/test/qa/Project.toml index c293c363f..ebd81a049 100644 --- a/lib/OptimizationMadNLP/test/qa/Project.toml +++ b/lib/OptimizationMadNLP/test/qa/Project.toml @@ -1,4 +1,6 @@ [deps] +OptimizationNLPModels = "064b21be-54cf-11ef-1646-cdfee32b588f" +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationMadNLP = "5d9c809f-c847-4062-9fba-1793bbfef577" @@ -6,9 +8,12 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationMadNLP = {path = "../.."} +OptimizationNLPModels = {path = "../../../OptimizationNLPModels"} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationNLPModels = "1" +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationMadNLP/test/runtests.jl b/lib/OptimizationMadNLP/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationMadNLP/test/runtests.jl +++ b/lib/OptimizationMadNLP/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationManopt/Project.toml b/lib/OptimizationManopt/Project.toml index 194d478a7..b24a31bdd 100644 --- a/lib/OptimizationManopt/Project.toml +++ b/lib/OptimizationManopt/Project.toml @@ -14,6 +14,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63" Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9" @@ -33,6 +34,7 @@ Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Aqua = "0.8" Pkg = "1" QuadraticModels = "0.9" @@ -59,4 +61,4 @@ Reexport = "1.2" SciMLBase = "2.122.1, 3" [targets] -test = ["DifferentiationInterface", "Enzyme", "ForwardDiff", "FiniteDiff", "QuadraticModels", "Random", "ReverseDiff", "RipQP", "Test", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "DifferentiationInterface", "Enzyme", "ForwardDiff", "FiniteDiff", "QuadraticModels", "Random", "ReverseDiff", "RipQP", "Test", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationManopt/test/qa/Project.toml b/lib/OptimizationManopt/test/qa/Project.toml index 9da1ade91..31d2f072a 100644 --- a/lib/OptimizationManopt/test/qa/Project.toml +++ b/lib/OptimizationManopt/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationManopt = "e57b7fff-7ee7-4550-b4f0-90e9476e9fb6" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationManopt = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationManopt/test/runtests.jl b/lib/OptimizationManopt/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationManopt/test/runtests.jl +++ b/lib/OptimizationManopt/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationMetaheuristics/Project.toml b/lib/OptimizationMetaheuristics/Project.toml index 87079f181..21d3f5992 100644 --- a/lib/OptimizationMetaheuristics/Project.toml +++ b/lib/OptimizationMetaheuristics/Project.toml @@ -9,6 +9,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -18,6 +19,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" julia = "1.10" @@ -29,4 +31,4 @@ Random = "1.10" Test = "1.10" [targets] -test = ["Random", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Random", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationMetaheuristics/test/qa/Project.toml b/lib/OptimizationMetaheuristics/test/qa/Project.toml index 442c6bab3..0b6a26662 100644 --- a/lib/OptimizationMetaheuristics/test/qa/Project.toml +++ b/lib/OptimizationMetaheuristics/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationMetaheuristics = "3aafef2f-86ae-4776-b337-85a36adf0b55" @@ -7,9 +8,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationMetaheuristics = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationMetaheuristics/test/runtests.jl b/lib/OptimizationMetaheuristics/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationMetaheuristics/test/runtests.jl +++ b/lib/OptimizationMetaheuristics/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationMultistartOptimization/Project.toml b/lib/OptimizationMultistartOptimization/Project.toml index 59e13751d..a22a6bebb 100644 --- a/lib/OptimizationMultistartOptimization/Project.toml +++ b/lib/OptimizationMultistartOptimization/Project.toml @@ -9,6 +9,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -21,6 +22,7 @@ OptimizationBase = {path = "../OptimizationBase"} OptimizationNLopt = {path = "../OptimizationNLopt"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" julia = "1.10" @@ -34,4 +36,4 @@ ReverseDiff = "1" Test = "1.10" [targets] -test = ["ForwardDiff", "OptimizationNLopt", "ReverseDiff", "Pkg", "Test", "SafeTestsets"] +test = ["SciMLTesting", "ForwardDiff", "OptimizationNLopt", "ReverseDiff", "Pkg", "Test", "SafeTestsets"] diff --git a/lib/OptimizationMultistartOptimization/test/qa/Project.toml b/lib/OptimizationMultistartOptimization/test/qa/Project.toml index ab9d585f0..1d2c74daa 100644 --- a/lib/OptimizationMultistartOptimization/test/qa/Project.toml +++ b/lib/OptimizationMultistartOptimization/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationMultistartOptimization = "e4316d97-8bbb-4fd3-a7d8-3851d2a72823" @@ -7,9 +8,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationMultistartOptimization = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationMultistartOptimization/test/runtests.jl b/lib/OptimizationMultistartOptimization/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationMultistartOptimization/test/runtests.jl +++ b/lib/OptimizationMultistartOptimization/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationNLPModels/Project.toml b/lib/OptimizationNLPModels/Project.toml index 0b1ec8c04..ddb73a32d 100644 --- a/lib/OptimizationNLPModels/Project.toml +++ b/lib/OptimizationNLPModels/Project.toml @@ -18,6 +18,7 @@ OptimizationMOI = {path = "../OptimizationMOI"} OptimizationOptimJL = {path = "../OptimizationOptimJL"} [compat] +SciMLTesting = "2.1" ADTypes = "1.18" Ipopt = "1" NLPModels = "0.21" @@ -37,6 +38,7 @@ Zygote = "0.6, 0.7" julia = "1.10" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9" @@ -49,4 +51,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["Test", "NLPModelsTest", "OptimizationOptimJL", "ReverseDiff", "Zygote", "Ipopt", "OptimizationMOI", "OptimizationLBFGSB", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "NLPModelsTest", "OptimizationOptimJL", "ReverseDiff", "Zygote", "Ipopt", "OptimizationMOI", "OptimizationLBFGSB", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationNLPModels/test/qa/Project.toml b/lib/OptimizationNLPModels/test/qa/Project.toml index 4eda8662b..9f10cb680 100644 --- a/lib/OptimizationNLPModels/test/qa/Project.toml +++ b/lib/OptimizationNLPModels/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationNLPModels = "064b21be-54cf-11ef-1646-cdfee32b588f" @@ -7,9 +8,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationNLPModels = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationNLPModels/test/runtests.jl b/lib/OptimizationNLPModels/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationNLPModels/test/runtests.jl +++ b/lib/OptimizationNLPModels/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationNLopt/Project.toml b/lib/OptimizationNLopt/Project.toml index 6226e85b4..2f1f89d16 100644 --- a/lib/OptimizationNLopt/Project.toml +++ b/lib/OptimizationNLopt/Project.toml @@ -11,6 +11,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" @@ -21,6 +22,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" julia = "1.10" @@ -34,4 +36,4 @@ Test = "1.10" Zygote = "0.6, 0.7" [targets] -test = ["ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationNLopt/test/qa/Project.toml b/lib/OptimizationNLopt/test/qa/Project.toml index 690ffac8f..bec2f234a 100644 --- a/lib/OptimizationNLopt/test/qa/Project.toml +++ b/lib/OptimizationNLopt/test/qa/Project.toml @@ -9,7 +9,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] OptimizationBase = {path = "../../../OptimizationBase"} -OptimizationNLopt = {path = "../.."} [compat] Aqua = "0.8" diff --git a/lib/OptimizationNLopt/test/qa/qa.jl b/lib/OptimizationNLopt/test/qa/qa.jl index 3f58fc4b5..ba2b695bf 100644 --- a/lib/OptimizationNLopt/test/qa/qa.jl +++ b/lib/OptimizationNLopt/test/qa/qa.jl @@ -50,6 +50,14 @@ run_qa( :AutoSparsePolyesterForwardDiff, :AutoSparseReverseDiff, :AutoSparseZygote, + :DEFAULT_CALLBACK, + :DEFAULT_DATA, + :IncompatibleOptimizerError, + :MaxSense, + :MinSense, + :ObjSense, + :OptimizationCache, + :OptimizerMissingError, :ForcedStop, :NLOPT_VERSION, :Opt, diff --git a/lib/OptimizationNLopt/test/runtests.jl b/lib/OptimizationNLopt/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationNLopt/test/runtests.jl +++ b/lib/OptimizationNLopt/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationNOMAD/Project.toml b/lib/OptimizationNOMAD/Project.toml index b5667cd2c..5934199b3 100644 --- a/lib/OptimizationNOMAD/Project.toml +++ b/lib/OptimizationNOMAD/Project.toml @@ -12,6 +12,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -20,6 +21,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" LogExpFunctions = "0.3.28" SafeTestsets = "0.1" @@ -31,4 +33,4 @@ Reexport = "1.2" Test = "1.10" [targets] -test = ["Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationNOMAD/test/qa/Project.toml b/lib/OptimizationNOMAD/test/qa/Project.toml index 8c2d05f40..78a5daafb 100644 --- a/lib/OptimizationNOMAD/test/qa/Project.toml +++ b/lib/OptimizationNOMAD/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationNOMAD = "2cab0595-8222-4775-b714-9828e6a9e01b" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationNOMAD = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationNOMAD/test/runtests.jl b/lib/OptimizationNOMAD/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationNOMAD/test/runtests.jl +++ b/lib/OptimizationNOMAD/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationODE/Project.toml b/lib/OptimizationODE/Project.toml index 955bcfa70..d7b9db4d1 100644 --- a/lib/OptimizationODE/Project.toml +++ b/lib/OptimizationODE/Project.toml @@ -21,12 +21,14 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" [compat] +SciMLTesting = "2.1" ADTypes = "1.18" DiffEqBase = "7" ForwardDiff = "0.10, 1" @@ -49,7 +51,7 @@ Test = "1.10" julia = "1.10" [targets] -test = ["Sundials", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Sundials", "Test", "SafeTestsets", "Pkg"] [sources.OptimizationBase] path = "../OptimizationBase" diff --git a/lib/OptimizationODE/test/qa/Project.toml b/lib/OptimizationODE/test/qa/Project.toml index 38a5a8461..89bdfe096 100644 --- a/lib/OptimizationODE/test/qa/Project.toml +++ b/lib/OptimizationODE/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationODE = "dfa73e59-e644-4d8a-bf84-188d7ecb34e4" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationODE = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationODE/test/runtests.jl b/lib/OptimizationODE/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationODE/test/runtests.jl +++ b/lib/OptimizationODE/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationOptimJL/Project.toml b/lib/OptimizationOptimJL/Project.toml index 2aad94f4a..262cfa387 100644 --- a/lib/OptimizationOptimJL/Project.toml +++ b/lib/OptimizationOptimJL/Project.toml @@ -10,6 +10,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -20,6 +21,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" julia = "1.10" @@ -39,4 +41,4 @@ Zygote = "0.6, 0.7" OptimizationBase = {path = "../OptimizationBase"} [targets] -test = ["ForwardDiff", "ModelingToolkit", "Random", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ForwardDiff", "ModelingToolkit", "Random", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationOptimJL/test/qa/Project.toml b/lib/OptimizationOptimJL/test/qa/Project.toml index 827566e1f..5487b2c90 100644 --- a/lib/OptimizationOptimJL/test/qa/Project.toml +++ b/lib/OptimizationOptimJL/test/qa/Project.toml @@ -9,7 +9,6 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] OptimizationBase = {path = "../../../OptimizationBase"} -OptimizationOptimJL = {path = "../.."} [compat] Aqua = "0.8" diff --git a/lib/OptimizationOptimJL/test/runtests.jl b/lib/OptimizationOptimJL/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationOptimJL/test/runtests.jl +++ b/lib/OptimizationOptimJL/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationOptimisers/Project.toml b/lib/OptimizationOptimisers/Project.toml index 816ec2d73..ea725d095 100644 --- a/lib/OptimizationOptimisers/Project.toml +++ b/lib/OptimizationOptimisers/Project.toml @@ -14,6 +14,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" OptimizationBase = {path = "../OptimizationBase"} [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" Logging = "1.10" @@ -33,6 +34,7 @@ Test = "1.10" Zygote = "0.6, 0.7" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" @@ -46,4 +48,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [targets] -test = ["ComponentArrays", "ForwardDiff", "Lux", "MLDataDevices", "MLUtils", "Random", "Test", "Zygote", "Printf", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ComponentArrays", "ForwardDiff", "Lux", "MLDataDevices", "MLUtils", "Random", "Test", "Zygote", "Printf", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationOptimisers/test/qa/Project.toml b/lib/OptimizationOptimisers/test/qa/Project.toml index 1f25ac4c1..eae021ca2 100644 --- a/lib/OptimizationOptimisers/test/qa/Project.toml +++ b/lib/OptimizationOptimisers/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1" @@ -7,9 +8,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationOptimisers = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationOptimisers/test/runtests.jl b/lib/OptimizationOptimisers/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationOptimisers/test/runtests.jl +++ b/lib/OptimizationOptimisers/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationPRIMA/Project.toml b/lib/OptimizationPRIMA/Project.toml index 4b5081636..1ec7ad0a7 100644 --- a/lib/OptimizationPRIMA/Project.toml +++ b/lib/OptimizationPRIMA/Project.toml @@ -9,6 +9,7 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -17,6 +18,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" [compat] +SciMLTesting = "2.1" ForwardDiff = "0.10, 1" ModelingToolkit = "11" OptimizationBase = "5.1" @@ -33,4 +35,4 @@ julia = "1.10" OptimizationBase = {path = "../OptimizationBase"} [targets] -test = ["Test", "ForwardDiff", "ModelingToolkit", "ReverseDiff", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "ForwardDiff", "ModelingToolkit", "ReverseDiff", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationPRIMA/test/qa/Project.toml b/lib/OptimizationPRIMA/test/qa/Project.toml index 792eb4ae5..558bdc520 100644 --- a/lib/OptimizationPRIMA/test/qa/Project.toml +++ b/lib/OptimizationPRIMA/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationPRIMA = "72f8369c-a2ea-4298-9126-56167ce9cbc2" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationPRIMA = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationPRIMA/test/runtests.jl b/lib/OptimizationPRIMA/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationPRIMA/test/runtests.jl +++ b/lib/OptimizationPRIMA/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationPolyalgorithms/Project.toml b/lib/OptimizationPolyalgorithms/Project.toml index b7b23c385..8c1ecb0bf 100644 --- a/lib/OptimizationPolyalgorithms/Project.toml +++ b/lib/OptimizationPolyalgorithms/Project.toml @@ -10,6 +10,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -21,6 +22,7 @@ OptimizationOptimisers = {path = "../OptimizationOptimisers"} OptimizationOptimJL = {path = "../OptimizationOptimJL"} [compat] +SciMLTesting = "2.1" ForwardDiff = "0.10, 1" OptimizationBase = "5" OptimizationOptimisers = "0.3.16" @@ -33,4 +35,4 @@ Test = "1.10" julia = "1.10" [targets] -test = ["ForwardDiff", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ForwardDiff", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationPolyalgorithms/test/qa/Project.toml b/lib/OptimizationPolyalgorithms/test/qa/Project.toml index 4bcb0a433..2d2127511 100644 --- a/lib/OptimizationPolyalgorithms/test/qa/Project.toml +++ b/lib/OptimizationPolyalgorithms/test/qa/Project.toml @@ -1,4 +1,7 @@ [deps] +OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1" +OptimizationOptimJL = "36348300-93cb-4f02-beb5-3c3902f8871e" +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationPolyalgorithms = "500b13db-7e66-49ce-bda4-eed966be6282" @@ -6,9 +9,14 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationPolyalgorithms = {path = "../.."} +OptimizationOptimisers = {path = "../../../OptimizationOptimisers"} +OptimizationOptimJL = {path = "../../../OptimizationOptimJL"} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationOptimisers = "0.3" +OptimizationOptimJL = "0.4" +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationPolyalgorithms/test/runtests.jl b/lib/OptimizationPolyalgorithms/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationPolyalgorithms/test/runtests.jl +++ b/lib/OptimizationPolyalgorithms/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationPyCMA/Project.toml b/lib/OptimizationPyCMA/Project.toml index e4d3c36c4..5f85df741 100644 --- a/lib/OptimizationPyCMA/Project.toml +++ b/lib/OptimizationPyCMA/Project.toml @@ -10,6 +10,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" [compat] +SciMLTesting = "2.1" Pkg = "1" julia = "1.10" OptimizationBase = "5" @@ -24,9 +25,10 @@ PythonCall = "0.9" OptimizationBase = {path = "../OptimizationBase"} [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["SafeTestsets", "Pkg", "Test"] +test = ["SciMLTesting", "SafeTestsets", "Pkg", "Test"] diff --git a/lib/OptimizationPyCMA/test/qa/Project.toml b/lib/OptimizationPyCMA/test/qa/Project.toml index 7fa717224..860713a11 100644 --- a/lib/OptimizationPyCMA/test/qa/Project.toml +++ b/lib/OptimizationPyCMA/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationPyCMA = "fb0822aa-1fe5-41d8-99a6-e7bf6c238d3b" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationPyCMA = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationPyCMA/test/runtests.jl b/lib/OptimizationPyCMA/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationPyCMA/test/runtests.jl +++ b/lib/OptimizationPyCMA/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationQuadDIRECT/Project.toml b/lib/OptimizationQuadDIRECT/Project.toml index 34de5029d..302b93739 100644 --- a/lib/OptimizationQuadDIRECT/Project.toml +++ b/lib/OptimizationQuadDIRECT/Project.toml @@ -10,11 +10,13 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" [compat] +SciMLTesting = "2.1" Pkg = "1" julia = "1.10" OptimizationBase = "5" @@ -25,7 +27,7 @@ Reexport = "1.2" Test = "1.10" [targets] -test = ["Pkg", "Test", "SafeTestsets"] +test = ["SciMLTesting", "Pkg", "Test", "SafeTestsets"] [sources.OptimizationBase] path = "../OptimizationBase" diff --git a/lib/OptimizationQuadDIRECT/test/qa/Project.toml b/lib/OptimizationQuadDIRECT/test/qa/Project.toml index 3a79561ab..ce03b744b 100644 --- a/lib/OptimizationQuadDIRECT/test/qa/Project.toml +++ b/lib/OptimizationQuadDIRECT/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationQuadDIRECT = "842ac81e-713d-465f-80f7-84eddaced298" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationQuadDIRECT = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationQuadDIRECT/test/runtests.jl b/lib/OptimizationQuadDIRECT/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationQuadDIRECT/test/runtests.jl +++ b/lib/OptimizationQuadDIRECT/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationSciPy/Project.toml b/lib/OptimizationSciPy/Project.toml index 08410204b..9416c3b0a 100644 --- a/lib/OptimizationSciPy/Project.toml +++ b/lib/OptimizationSciPy/Project.toml @@ -9,6 +9,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" @@ -19,6 +20,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78" [compat] +SciMLTesting = "2.1" ForwardDiff = "0.10, 1" ModelingToolkit = "11" OptimizationBase = "5.1" @@ -37,4 +39,4 @@ julia = "1.10" OptimizationBase = {path = "../OptimizationBase"} [targets] -test = ["ForwardDiff", "ModelingToolkit", "Random", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ForwardDiff", "ModelingToolkit", "Random", "ReverseDiff", "Test", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationSciPy/test/qa/Project.toml b/lib/OptimizationSciPy/test/qa/Project.toml index 8445c57f6..d5e2855ae 100644 --- a/lib/OptimizationSciPy/test/qa/Project.toml +++ b/lib/OptimizationSciPy/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationSciPy = "cce07bd8-c79b-4b00-aee8-8db9cce22837" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationSciPy = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationSciPy/test/runtests.jl b/lib/OptimizationSciPy/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationSciPy/test/runtests.jl +++ b/lib/OptimizationSciPy/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationSophia/Project.toml b/lib/OptimizationSophia/Project.toml index e7d06e1cc..27e66dfa3 100644 --- a/lib/OptimizationSophia/Project.toml +++ b/lib/OptimizationSophia/Project.toml @@ -9,6 +9,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66" @@ -20,6 +21,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" Zygote = "e88e6eb3-aa80-5325-afca-941959d7151f" [compat] +SciMLTesting = "2.1" Pkg = "1" SafeTestsets = "0.1" ComponentArrays = "0.15.29" @@ -39,4 +41,4 @@ julia = "1.10" OptimizationBase = {path = "../OptimizationBase"} [targets] -test = ["Test", "ComponentArrays", "Lux", "MLUtils", "OrdinaryDiffEqTsit5", "SciMLSensitivity", "Zygote", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "ComponentArrays", "Lux", "MLUtils", "OrdinaryDiffEqTsit5", "SciMLSensitivity", "Zygote", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationSophia/test/qa/Project.toml b/lib/OptimizationSophia/test/qa/Project.toml index 69ca9bfa0..98d7e4510 100644 --- a/lib/OptimizationSophia/test/qa/Project.toml +++ b/lib/OptimizationSophia/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationSophia = "892fee11-dca1-40d6-b698-84ba0d87399a" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationSophia = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationSophia/test/runtests.jl b/lib/OptimizationSophia/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationSophia/test/runtests.jl +++ b/lib/OptimizationSophia/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/OptimizationSpeedMapping/Project.toml b/lib/OptimizationSpeedMapping/Project.toml index 0d1a93245..642a384e4 100644 --- a/lib/OptimizationSpeedMapping/Project.toml +++ b/lib/OptimizationSpeedMapping/Project.toml @@ -9,12 +9,14 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462" Reexport = "189a3867-3050-52da-a836-e630ba90ab69" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] +SciMLTesting = "2.1" ForwardDiff = "0.10, 1" OptimizationBase = "5" Pkg = "1" @@ -29,4 +31,4 @@ julia = "1.10" OptimizationBase = {path = "../OptimizationBase"} [targets] -test = ["ForwardDiff", "Test", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "ForwardDiff", "Test", "SafeTestsets", "Pkg"] diff --git a/lib/OptimizationSpeedMapping/test/qa/Project.toml b/lib/OptimizationSpeedMapping/test/qa/Project.toml index 6521e1822..3d7a869d1 100644 --- a/lib/OptimizationSpeedMapping/test/qa/Project.toml +++ b/lib/OptimizationSpeedMapping/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" OptimizationSpeedMapping = "3d669222-0d7d-4eb9-8a9f-d8528b0d9b91" @@ -6,9 +7,10 @@ SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -OptimizationSpeedMapping = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/OptimizationSpeedMapping/test/runtests.jl b/lib/OptimizationSpeedMapping/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/OptimizationSpeedMapping/test/runtests.jl +++ b/lib/OptimizationSpeedMapping/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All" diff --git a/lib/SimpleOptimization/Project.toml b/lib/SimpleOptimization/Project.toml index e28daa605..326bca70b 100644 --- a/lib/SimpleOptimization/Project.toml +++ b/lib/SimpleOptimization/Project.toml @@ -17,6 +17,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69" SimpleNonlinearSolve = "727e6d20-b764-4bd8-a329-72de5adea6c7" [extras] +SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" @@ -30,6 +31,7 @@ SimpleOptimizationEnzymeExt = "Enzyme" SimpleOptimizationForwardDiffExt = "ForwardDiff" [compat] +SciMLTesting = "2.1" ADTypes = "1.18" DifferentiationInterface = "0.7.13" Enzyme = "0.13" @@ -45,4 +47,4 @@ Test = "1.10" julia = "1.10" [targets] -test = ["Test", "ForwardDiff", "SafeTestsets", "Pkg"] +test = ["SciMLTesting", "Test", "ForwardDiff", "SafeTestsets", "Pkg"] diff --git a/lib/SimpleOptimization/test/qa/Project.toml b/lib/SimpleOptimization/test/qa/Project.toml index 62ca106ba..a8f4f6590 100644 --- a/lib/SimpleOptimization/test/qa/Project.toml +++ b/lib/SimpleOptimization/test/qa/Project.toml @@ -1,4 +1,5 @@ [deps] +OptimizationBase = "bca83a33-5cc9-4baa-983d-23429ab6bcbb" Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b" SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" @@ -6,9 +7,10 @@ SimpleOptimization = "510db2f7-4254-4e34-bbda-04240c91ca8f" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [sources] -SimpleOptimization = {path = "../.."} +OptimizationBase = {path = "../../../OptimizationBase"} [compat] +OptimizationBase = "5" Aqua = "0.8" JET = "0.9, 0.10, 0.11" julia = "1.10" diff --git a/lib/SimpleOptimization/test/runtests.jl b/lib/SimpleOptimization/test/runtests.jl index 89b4c9bae..93f1ade43 100644 --- a/lib/SimpleOptimization/test/runtests.jl +++ b/lib/SimpleOptimization/test/runtests.jl @@ -1,17 +1,14 @@ using Pkg using SafeTestsets +using SciMLTesting const TEST_GROUP = get(ENV, "OPTIMIZATION_TEST_GROUP", "All") -# QA (Aqua + JET) runs in an isolated environment (test/qa) so its tooling deps -# never enter the main test target's resolve. On Julia < 1.11 the [sources] table -# is ignored, so develop the package by path to test the PR branch code. +# QA (Aqua + JET) runs in an isolated environment (test/qa). activate_group_env +# develops the package under test (via `parent`) plus its in-repo `[sources]` siblings +# by path — native `[sources]` on Julia >= 1.11, the develop_sources! backport on 1.10. function activate_qa_env() - Pkg.activate(joinpath(@__DIR__, "qa")) - if VERSION < v"1.11.0-DEV.0" - Pkg.develop(PackageSpec(path = dirname(@__DIR__))) - end - return Pkg.instantiate() + return activate_group_env(joinpath(@__DIR__, "qa")) end if TEST_GROUP == "Core" || TEST_GROUP == "All"