From 8dbdabb811b056f51985341cc85059d7f0d16b38 Mon Sep 17 00:00:00 2001 From: raphasampaio Date: Fri, 8 Dec 2023 13:51:07 -0300 Subject: [PATCH 1/4] Updates --- .github/workflows/aqua.yml | 23 ----------------------- Project.toml | 8 +++++++- test/runtests.jl | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 24 deletions(-) delete mode 100644 .github/workflows/aqua.yml diff --git a/.github/workflows/aqua.yml b/.github/workflows/aqua.yml deleted file mode 100644 index 52b05da..0000000 --- a/.github/workflows/aqua.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: aqua-lint -on: - push: - branches: - - master - pull_request: - types: [opened, synchronize, reopened] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: julia-actions/setup-julia@latest - with: - version: '1' - - uses: actions/checkout@v1 - - name: Aqua - shell: julia --color=yes {0} - run: | - using Pkg - Pkg.add(PackageSpec(name="Aqua")) - Pkg.develop(PackageSpec(path=pwd())) - using LoggingPolyglot, Aqua - Aqua.test_all(LoggingPolyglot; unbound_args = false) \ No newline at end of file diff --git a/Project.toml b/Project.toml index 38703c3..774d3de 100644 --- a/Project.toml +++ b/Project.toml @@ -9,11 +9,17 @@ LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] +Aqua = "0.8.4" +Dates = "1" +Logging = "1" LoggingExtras = "1" +Test = "1" +TOML = "1" julia = "1.7" [extras] +Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Test"] +test = ["Aqua", "Test"] diff --git a/test/runtests.jl b/test/runtests.jl index 4a983d5..e678e3a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,5 +1,16 @@ +import LoggingPolyglot + +using Aqua using Test +function testall() +@testset "Aqua.jl" begin + @testset "Ambiguities" begin + Aqua.test_ambiguities(LoggingPolyglot, recursive = false) + end + Aqua.test_all(LoggingPolyglot, ambiguities = false) +end + for file in readdir(@__DIR__) if file in ["runtests.jl"] continue @@ -10,3 +21,6 @@ for file in readdir(@__DIR__) include(file) end end +end + +testall() \ No newline at end of file From 99d84ccc3131a4be6dc21f95b97f54bb3617b482 Mon Sep 17 00:00:00 2001 From: raphasampaio Date: Fri, 8 Dec 2023 13:53:49 -0300 Subject: [PATCH 2/4] Updates --- test/runtests.jl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index e678e3a..a2d9297 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -5,10 +5,7 @@ using Test function testall() @testset "Aqua.jl" begin - @testset "Ambiguities" begin - Aqua.test_ambiguities(LoggingPolyglot, recursive = false) - end - Aqua.test_all(LoggingPolyglot, ambiguities = false) + Aqua.test_all(LoggingPolyglot) end for file in readdir(@__DIR__) From 74459dde9e848a2092e30a408bd6096718f244f0 Mon Sep 17 00:00:00 2001 From: raphasampaio Date: Fri, 8 Dec 2023 14:03:17 -0300 Subject: [PATCH 3/4] Updates --- test/runtests.jl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/runtests.jl b/test/runtests.jl index a2d9297..27eae23 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -4,20 +4,20 @@ using Aqua using Test function testall() -@testset "Aqua.jl" begin - Aqua.test_all(LoggingPolyglot) -end - -for file in readdir(@__DIR__) - if file in ["runtests.jl"] - continue - elseif !endswith(file, ".jl") - continue + @testset "Aqua.jl" begin + Aqua.test_all(LoggingPolyglot) end - @testset "$(file)" begin - include(file) + + for file in readdir(@__DIR__) + if file in ["runtests.jl"] + continue + elseif !endswith(file, ".jl") + continue + end + @testset "$(file)" begin + include(file) + end end end -end -testall() \ No newline at end of file +testall() From 73a47cc20a473a60f1ae061c39caebbce369ead8 Mon Sep 17 00:00:00 2001 From: raphasampaio Date: Fri, 8 Dec 2023 14:17:17 -0300 Subject: [PATCH 4/4] Updates --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 774d3de..d0564a0 100644 --- a/Project.toml +++ b/Project.toml @@ -9,7 +9,7 @@ LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] -Aqua = "0.8.4" +Aqua = "0.8" Dates = "1" Logging = "1" LoggingExtras = "1"