diff --git a/Project.toml b/Project.toml index 87e28cb..1f0ec84 100644 --- a/Project.toml +++ b/Project.toml @@ -29,7 +29,6 @@ CommonSolve = "0.2.6" ConcreteStructs = "0.2.3" DifferentiationInterface = "0.7.13" Distributions = "0.25.122" -ExplicitImports = "1.11.2" FastRationals = "0.3.0" ForwardDiff = "1.3.0" InverseFunctions = "0.1" @@ -38,21 +37,20 @@ LinearSolve = "3.15.0" Markdown = "1.10.0" NonlinearSolveBase = "2.25" NonlinearSolveFirstOrder = "2" -PrecompileTools = "1" +PrecompileTools = "1.1" RecursiveArrayTools = "3.33.0, 4.0" SafeTestsets = "0.1" -SciMLBase = "2.90, 3.1" -SciMLTesting = "1" +SciMLBase = "2.90, 3.27" +SciMLTesting = "1.7" Setfield = "1.1.2" StatsAPI = "1.8.0" Test = "1.10" julia = "1.10" [extras] -ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" SciMLTesting = "09d9d899-5365-40a9-917a-5f67fddea283" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Test", "SafeTestsets", "SciMLTesting", "ExplicitImports"] +test = ["Test", "SafeTestsets", "SciMLTesting"] diff --git a/test/explicit_imports.jl b/test/explicit_imports.jl deleted file mode 100644 index ff17a15..0000000 --- a/test/explicit_imports.jl +++ /dev/null @@ -1,11 +0,0 @@ -using CurveFit -using Test -using ExplicitImports -using StatsAPI - -@testset "Explicit Imports" begin - @test check_no_implicit_imports(CurveFit) === nothing - @test check_no_stale_explicit_imports(CurveFit) === nothing - @test check_no_self_qualified_accesses(CurveFit) === nothing - @test check_all_qualified_accesses_via_owners(CurveFit) === nothing -end diff --git a/test/nopre/aqua.jl b/test/nopre/aqua.jl deleted file mode 100644 index 4f309bf..0000000 --- a/test/nopre/aqua.jl +++ /dev/null @@ -1,7 +0,0 @@ -using CurveFit -using Test -using Aqua - -@testset "Aqua tests" begin - Aqua.test_all(CurveFit) -end diff --git a/test/nopre/Project.toml b/test/qa/Project.toml similarity index 94% rename from test/nopre/Project.toml rename to test/qa/Project.toml index a6376b5..8fcc767 100644 --- a/test/nopre/Project.toml +++ b/test/qa/Project.toml @@ -11,6 +11,6 @@ CurveFit = {path = "../.."} [compat] Aqua = "0.8.12" SafeTestsets = "0.1" -SciMLTesting = "1" +SciMLTesting = "1.7" Test = "1.10" julia = "1.10" diff --git a/test/qa/qa.jl b/test/qa/qa.jl new file mode 100644 index 0000000..fe3b706 --- /dev/null +++ b/test/qa/qa.jl @@ -0,0 +1,18 @@ +using SciMLTesting, CurveFit, Test + +run_qa( + CurveFit; + explicit_imports = true, + ei_kwargs = (; + all_explicit_imports_are_public = (; + ignore = (), + ), + all_qualified_accesses_are_public = (; + ignore = ( + :AutoSpecializeCallable, :NonlinearSolvePolyAlgorithmCache, # NonlinearSolveBase + :Utils, :get_fu, :clean_sprint_struct, # NonlinearSolveBase(.Utils) + :rtoldefault, # Base + ), + ), + ), +) diff --git a/test/test_groups.toml b/test/test_groups.toml index a3ce918..7e41a25 100644 --- a/test/test_groups.toml +++ b/test/test_groups.toml @@ -3,21 +3,17 @@ # --root-matrix, and by SciMLTesting's run_tests() folder-discovery mode in # runtests.jl. Each table key is a GROUP value passed to runtests.jl. # -# "Core" -> the top-level test/*.jl files (the functional fits plus the -# ExplicitImports check). Runs on 1/lts/pre. -# "nopre" -> the test/nopre/ folder (Aqua), which is brittle on prereleases, -# so it runs only on 1/lts. `in_all = false` keeps it out of a -# local GROUP=All aggregate run. -# -# This replaces the former TestItemRunner tag split (GROUP=All ran every -# @testitem except :nopre; GROUP=nopre ran only the :nopre-tagged Aqua item): -# the same tests run under the same two (group x version) CI cells. +# "Core" -> the top-level test/*.jl files (the functional fits). Runs on +# 1/lts/pre. +# "QA" -> the test/qa/ folder (SciMLTesting run_qa: Aqua + ExplicitImports), +# which is brittle on prereleases, so it runs only on 1/lts. +# QA is always excluded from a local GROUP=All aggregate run. [Core] versions = ["1", "lts", "pre"] os = ["ubuntu-latest", "macOS-latest", "windows-latest"] -[nopre] +[QA] in_all = false versions = ["1", "lts"] os = ["ubuntu-latest", "macOS-latest", "windows-latest"]