Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ julia = "1.10"
CanonicalMoments = "0.1"
DiscreteMeasures = "0.1"
OUQBase = "0.1"
Pkg = "1.10"
Reexport = "1.2.2"
SafeTestsets = "0.1"
Test = "1.10"
SciMLTesting = "1"

[extras]
Expand Down
4 changes: 3 additions & 1 deletion lib/CanonicalMoments/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ForwardDiff = "0.10, 1"
InteractiveUtils = "1.10"
IntervalArithmetic = "0.18 - 0.20, =0.20.9"
LinearAlgebra = "1.10"
Pkg = "1.10"
PolynomialRoots = "1.0"
Polynomials = "4"
Random = "1.10"
Expand All @@ -49,6 +50,7 @@ DiscreteMeasures = { path = "../DiscreteMeasures" }
[extras]
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
PolynomialRoots = "3a141323-8675-5d76-9d11-e1df1406c778"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
Expand All @@ -57,4 +59,4 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["InteractiveUtils", "IntervalArithmetic", "PolynomialRoots", "Random", "SafeTestsets", "SpecialFunctions", "StaticArrays", "Test"]
test = ["InteractiveUtils", "IntervalArithmetic", "Pkg", "PolynomialRoots", "Random", "SafeTestsets", "SpecialFunctions", "StaticArrays", "Test"]
18 changes: 18 additions & 0 deletions lib/CanonicalMoments/test/qa/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
CanonicalMoments = "58d2c334-1a3c-4862-bb37-9012b9e58a38"
DiscreteMeasures = "7766d772-2108-41ee-a4bd-11c51440a39b"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
CanonicalMoments = {path = "../.."}
DiscreteMeasures = {path = "../../../DiscreteMeasures"}

[compat]
Aqua = "0.8"
CanonicalMoments = "0.1"
DiscreteMeasures = "0.1"
JET = "0.9, 0.10, 0.11"
Test = "1"
julia = "1.10"
12 changes: 12 additions & 0 deletions lib/CanonicalMoments/test/qa/qa.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using CanonicalMoments
using Aqua
using JET
using Test

@testset "Aqua" begin
Aqua.test_all(CanonicalMoments)
end

@testset "JET" begin
JET.test_package(CanonicalMoments; target_defined_modules = true)
end
21 changes: 21 additions & 0 deletions lib/CanonicalMoments/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
using Pkg
using SafeTestsets
using Test

const TEST_GROUP = get(ENV, "OPTIMALUNCERTAINTYQUANTIFICATION_TEST_GROUP", "All")

function activate_qa_env()
Pkg.activate(joinpath(@__DIR__, "qa"))
# On Julia < 1.11, the [sources] section in Project.toml is not honored.
# Manually Pkg.develop the local path dependencies so QA tests the PR branch code.
if VERSION < v"1.11.0-DEV.0"
Pkg.develop(
[
Pkg.PackageSpec(path = joinpath(@__DIR__, "..")),
Pkg.PackageSpec(path = joinpath(@__DIR__, "..", "..", "DiscreteMeasures"))
]
)
end
return Pkg.instantiate()
end

if TEST_GROUP == "Core" || TEST_GROUP == "All"
@safetestset "Orthogonal Polynomial Roots" include("Core/orthopoly_roots.jl")
@safetestset "Moment Sequence" include("Core/moment_sequence.jl")
end

if (TEST_GROUP == "QA" || TEST_GROUP == "All") && isempty(VERSION.prerelease)
activate_qa_env()
@safetestset "Quality Assurance" include("qa/qa.jl")
end

# @safetestset "Root Domain Restriction" begin
# using IntervalArithmetic
# import OptimalUncertaintyQuantification.CanonicalMoments: clamp_domain
Expand Down
3 changes: 3 additions & 0 deletions lib/CanonicalMoments/test/test_groups.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Core]
versions = ["lts", "1", "pre"]

[QA]
versions = ["lts", "1"]
4 changes: 3 additions & 1 deletion lib/DiscreteMeasures/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ IntervalArithmeticExt = "IntervalArithmetic"
[compat]
julia = "1.10"
IntervalArithmetic = "0.16 - 0.20, =0.20.9"
Pkg = "1.10"
SafeTestsets = "0.1"
Test = "1.10"

[extras]
IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["IntervalArithmetic", "SafeTestsets", "Test"]
test = ["IntervalArithmetic", "Pkg", "SafeTestsets", "Test"]
15 changes: 15 additions & 0 deletions lib/DiscreteMeasures/test/qa/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
DiscreteMeasures = "7766d772-2108-41ee-a4bd-11c51440a39b"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
DiscreteMeasures = {path = "../.."}

[compat]
Aqua = "0.8"
DiscreteMeasures = "0.1"
JET = "0.9, 0.10, 0.11"
Test = "1"
julia = "1.10"
12 changes: 12 additions & 0 deletions lib/DiscreteMeasures/test/qa/qa.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using DiscreteMeasures
using Aqua
using JET
using Test

@testset "Aqua" begin
Aqua.test_all(DiscreteMeasures)
end

@testset "JET" begin
JET.test_package(DiscreteMeasures; target_defined_modules = true)
end
16 changes: 16 additions & 0 deletions lib/DiscreteMeasures/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,24 @@
using Pkg
using SafeTestsets
using Test

const TEST_GROUP = get(ENV, "OPTIMALUNCERTAINTYQUANTIFICATION_TEST_GROUP", "All")

function activate_qa_env()
Pkg.activate(joinpath(@__DIR__, "qa"))
# On Julia < 1.11, the [sources] section in Project.toml is not honored.
# Manually Pkg.develop the local path dependency so QA tests the PR branch code.
if VERSION < v"1.11.0-DEV.0"
Pkg.develop(Pkg.PackageSpec(path = joinpath(@__DIR__, "..")))
end
return Pkg.instantiate()
end

if TEST_GROUP == "Core" || TEST_GROUP == "All"
@safetestset "Discrete Measures" include("Core/discrete_measures_tests.jl")
end

if (TEST_GROUP == "QA" || TEST_GROUP == "All") && isempty(VERSION.prerelease)
activate_qa_env()
@safetestset "Quality Assurance" include("qa/qa.jl")
end
3 changes: 3 additions & 0 deletions lib/DiscreteMeasures/test/test_groups.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Core]
versions = ["lts", "1", "pre"]

[QA]
versions = ["lts", "1"]
4 changes: 3 additions & 1 deletion lib/OUQBase/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ NaNMath = "1.1.3"
Optimization = "5"
OptimizationBBO = "0.4"
OrderedCollections = "1.7.0"
Pkg = "1.10"
PolynomialRoots = "1"
Polynomials = "4.0.13"
Reexport = "1.2.2"
Expand All @@ -45,8 +46,9 @@ DiscreteMeasures = { path = "../DiscreteMeasures" }

[extras]
OptimizationBBO = "3e6eede4-6085-4f62-9a71-46d9bc1eb92b"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["OptimizationBBO", "SafeTestsets", "Test"]
test = ["OptimizationBBO", "Pkg", "SafeTestsets", "Test"]
21 changes: 21 additions & 0 deletions lib/OUQBase/test/qa/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
CanonicalMoments = "58d2c334-1a3c-4862-bb37-9012b9e58a38"
DiscreteMeasures = "7766d772-2108-41ee-a4bd-11c51440a39b"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
OUQBase = "01930cae-99d2-7439-8f4f-ace2ece9f1b9"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
CanonicalMoments = {path = "../../../CanonicalMoments"}
DiscreteMeasures = {path = "../../../DiscreteMeasures"}
OUQBase = {path = "../.."}

[compat]
Aqua = "0.8"
CanonicalMoments = "0.1"
DiscreteMeasures = "0.1"
JET = "0.9, 0.10, 0.11"
OUQBase = "0.1"
Test = "1"
julia = "1.10"
12 changes: 12 additions & 0 deletions lib/OUQBase/test/qa/qa.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using OUQBase
using Aqua
using JET
using Test

@testset "Aqua" begin
Aqua.test_all(OUQBase)
end

@testset "JET" begin
JET.test_package(OUQBase; target_defined_modules = true)
end
22 changes: 22 additions & 0 deletions lib/OUQBase/test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
using Pkg
using SafeTestsets
using Test

const TEST_GROUP = get(ENV, "OPTIMALUNCERTAINTYQUANTIFICATION_TEST_GROUP", "All")

function activate_qa_env()
Pkg.activate(joinpath(@__DIR__, "qa"))
# On Julia < 1.11, the [sources] section in Project.toml is not honored.
# Manually Pkg.develop the local path dependencies so QA tests the PR branch code.
if VERSION < v"1.11.0-DEV.0"
Pkg.develop(
[
Pkg.PackageSpec(path = joinpath(@__DIR__, "..")),
Pkg.PackageSpec(path = joinpath(@__DIR__, "..", "..", "CanonicalMoments")),
Pkg.PackageSpec(path = joinpath(@__DIR__, "..", "..", "DiscreteMeasures"))
]
)
end
return Pkg.instantiate()
end

if TEST_GROUP == "Core" || TEST_GROUP == "All"
@safetestset "Flood Problem (Q only)" include("Core/FloodProblem/Q_only.jl")

Expand All @@ -14,3 +31,8 @@ if TEST_GROUP == "Core" || TEST_GROUP == "All"
include("Core/FloodProblem/test_canonical_moments.jl")
end
end

if (TEST_GROUP == "QA" || TEST_GROUP == "All") && isempty(VERSION.prerelease)
activate_qa_env()
@safetestset "Quality Assurance" include("qa/qa.jl")
end
3 changes: 3 additions & 0 deletions lib/OUQBase/test/test_groups.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Core]
versions = ["lts", "1", "pre"]

[QA]
versions = ["lts", "1"]
24 changes: 24 additions & 0 deletions test/qa/Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[deps]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
CanonicalMoments = "58d2c334-1a3c-4862-bb37-9012b9e58a38"
DiscreteMeasures = "7766d772-2108-41ee-a4bd-11c51440a39b"
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
OUQBase = "01930cae-99d2-7439-8f4f-ace2ece9f1b9"
OptimalUncertaintyQuantification = "91ab1271-1799-4997-981e-07ad84422b0d"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[sources]
CanonicalMoments = {path = "../../lib/CanonicalMoments"}
DiscreteMeasures = {path = "../../lib/DiscreteMeasures"}
OUQBase = {path = "../../lib/OUQBase"}
OptimalUncertaintyQuantification = {path = "../.."}

[compat]
Aqua = "0.8"
CanonicalMoments = "0.1"
DiscreteMeasures = "0.1"
JET = "0.9, 0.10, 0.11"
OUQBase = "0.1"
OptimalUncertaintyQuantification = "0.1"
Test = "1"
julia = "1.10"
12 changes: 12 additions & 0 deletions test/qa/qa.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using OptimalUncertaintyQuantification
using Aqua
using JET
using Test

@testset "Aqua" begin
Aqua.test_all(OptimalUncertaintyQuantification)
end

@testset "JET" begin
JET.test_package(OptimalUncertaintyQuantification; target_defined_modules = true)
end
10 changes: 8 additions & 2 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,13 @@ const GROUP = get(ENV, "GROUP", "All")
withenv("OPTIMALUNCERTAINTYQUANTIFICATION_TEST_GROUP" => test_group) do
Pkg.test(base_group, julia_args = ["--check-bounds=auto", "--compiled-modules=yes", "--depwarn=yes"], force_latest_compatible_version = false, allow_reresolve = true)
end
elseif GROUP == "All" || GROUP == "Core"
run_tests(; core = () -> @safetestset("Umbrella Load", include("umbrella_load.jl")))
elseif GROUP == "All" || GROUP == "Core" || GROUP == "QA"
run_tests(;
core = () -> @safetestset("Umbrella Load", include("umbrella_load.jl")),
# QA (Aqua/JET): dep-adding group in its own sub-env (test/qa), excluded from "All".
groups = Dict(
"QA" => (; env = joinpath(@__DIR__, "qa"), body = joinpath(@__DIR__, "qa", "qa.jl")),
),
)
end
end # @time
3 changes: 3 additions & 0 deletions test/test_groups.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Core]
versions = ["lts", "1", "pre"]

[QA]
versions = ["lts", "1"]
Loading