From 910d3ab16480e6f86cab0f00337f1072924ee59b Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Thu, 11 Jan 2024 10:13:24 -0500 Subject: [PATCH 1/2] Fix aqua tests --- Project.toml | 1 + test/aqua.jl | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Project.toml b/Project.toml index 7e4e5cf0..21514968 100644 --- a/Project.toml +++ b/Project.toml @@ -12,5 +12,6 @@ RootSolvers = "7181ea78-2dcb-4de3-ab41-2b8ab5a31e74" [compat] DocStringExtensions = "0.8.1, 0.9" KernelAbstractions = "0.7, 0.8, 0.9" +Random = "1" RootSolvers = "0.4" julia = "1.6" diff --git a/test/aqua.jl b/test/aqua.jl index ee4bfc6e..b94fc5f1 100644 --- a/test/aqua.jl +++ b/test/aqua.jl @@ -25,12 +25,8 @@ using Aqua @test length(ambs) ≤ 0 end -@testset "Aqua tests (additional)" begin - Aqua.test_undefined_exports(Thermodynamics) - Aqua.test_stale_deps(Thermodynamics) - Aqua.test_deps_compat(Thermodynamics) - Aqua.test_project_extras(Thermodynamics) - Aqua.test_piracy(Thermodynamics) +@testset "Aqua tests - remaining" begin + Aqua.test_all(Thermodynamics; ambiguities = false, unbound_args = false) end nothing From 6a28bdf74aace11c5ee46501a47bcb0529587671 Mon Sep 17 00:00:00 2001 From: Charles Kawczynski Date: Fri, 12 Jan 2024 10:56:02 -0500 Subject: [PATCH 2/2] Do not dynamically change project --- perf/alloc_per_constructor.jl | 2 -- perf/allocs.jl | 4 ---- test/runtests.jl | 5 ----- test/runtests_gpu.jl | 4 ---- 4 files changed, 15 deletions(-) diff --git a/perf/alloc_per_constructor.jl b/perf/alloc_per_constructor.jl index 01f82183..9f6fbd43 100644 --- a/perf/alloc_per_constructor.jl +++ b/perf/alloc_per_constructor.jl @@ -1,6 +1,4 @@ # Launch with `julia --project --track-allocation=user` -import Pkg -Pkg.develop(path = ".") import Profile include("common.jl") diff --git a/perf/allocs.jl b/perf/allocs.jl index 0f5b8d90..1a815d66 100644 --- a/perf/allocs.jl +++ b/perf/allocs.jl @@ -1,7 +1,3 @@ -if !haskey(ENV, "BUILDKITE") - import Pkg - Pkg.develop(Pkg.PackageSpec(; path = dirname(@__DIR__))) -end import Thermodynamics import RootSolvers import CLIMAParameters diff --git a/test/runtests.jl b/test/runtests.jl index df5c396c..7b6d75d1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,8 +1,3 @@ -if !haskey(ENV, "BUILDKITE") - import Pkg - Pkg.develop(Pkg.PackageSpec(; path = dirname(@__DIR__))) -end - include("aqua.jl") include("TemperatureProfiles.jl") include("relations.jl") diff --git a/test/runtests_gpu.jl b/test/runtests_gpu.jl index f5ff8cf6..fe552dc4 100644 --- a/test/runtests_gpu.jl +++ b/test/runtests_gpu.jl @@ -1,7 +1,3 @@ -if !haskey(ENV, "BUILDKITE") - import Pkg - Pkg.develop(Pkg.PackageSpec(; path = dirname(@__DIR__))) -end using Test using KernelAbstractions