Merge ca31b82 into ebf8771

tkf · Sep 8, 2020 · d9448f7 · d9448f7
2 parents ebf8771 + ca31b82
commit d9448f7
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 29 deletions.
diff --git a/test/Project.toml b/test/Project.toml
@@ -0,0 +1,13 @@
+[deps]
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+Kaleido = "caafb194-7e8d-11e9-2724-d5981dd0806d"
+Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+StaticNumbers = "c5e4b96a-f99f-5557-8ed2-dc63ef9b5131"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+TransformVariables = "84d833dd-6860-57f9-a1a7-6da5db126cff"
+
+[compat]
+Aqua = "0.4.7"
diff --git a/test/environments/jl10/Manifest.toml b/test/environments/jl10/Manifest.toml
@@ -1,10 +1,8 @@
 [[Aqua]]
-deps = ["Test"]
-git-tree-sha1 = "6d697c372bd1a2b5a3c690113581f98e6b0e2ff5"
-repo-rev = "master"
-repo-url = "https://github.com/tkf/Aqua.jl"
+deps = ["Pkg", "Test"]
+git-tree-sha1 = "2e62f20d7b710034082c82bf03129d208fc479ec"
 uuid = "4c88cf16-eb10-579e-8560-4a9242c79595"
-version = "0.4.0"
+version = "0.4.8"
 
 [[ArgCheck]]
 deps = ["Random"]

diff --git a/test/environments/main/Manifest.toml b/test/environments/main/Manifest.toml
@@ -1,12 +1,10 @@
 # This file is machine-generated - editing it directly is not advised
 
 [[Aqua]]
-deps = ["Test"]
-git-tree-sha1 = "6d697c372bd1a2b5a3c690113581f98e6b0e2ff5"
-repo-rev = "master"
-repo-url = "https://github.com/tkf/Aqua.jl"
+deps = ["Pkg", "Test"]
+git-tree-sha1 = "2e62f20d7b710034082c82bf03129d208fc479ec"
 uuid = "4c88cf16-eb10-579e-8560-4a9242c79595"
-version = "0.4.0"
+version = "0.4.8"
 
 [[ArgCheck]]
 deps = ["Random"]

diff --git a/test/environments/main/Project.toml b/test/environments/main/Project.toml
@@ -8,3 +8,6 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StaticNumbers = "c5e4b96a-f99f-5557-8ed2-dc63ef9b5131"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TransformVariables = "84d833dd-6860-57f9-a1a7-6da5db126cff"
+
+[compat]
+Aqua = "0.4.7"
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -7,23 +7,4 @@ using Test
     include(file)
 end
 
-using Aqua
-using Kaleido
-#=
-Aqua.test_all(Kaleido)
-=#
-@testset "Aqua" begin
-    @testset "Method ambiguity" begin
-        # Not including `Base` due to
-        # https://github.com/JuliaCollections/DataStructures.jl/pull/511
-        Aqua.test_ambiguities(Kaleido)
-    end
-    @testset "Unbound type parameters" begin
-        Aqua.test_unbound_args(Kaleido)
-    end
-    @testset "Undefined exports" begin
-        Aqua.test_undefined_exports(Kaleido)
-    end
-end
-
 end  # module
diff --git a/test/test_aqua.jl b/test/test_aqua.jl
@@ -0,0 +1,27 @@
+module TestAqua
+
+using Aqua
+using Kaleido
+using Test
+
+Aqua.test_all(
+    Kaleido;
+    ambiguities = false,
+    project_extras = true,
+    stale_deps = true,
+    deps_compat = true,
+    project_toml_formatting = true,
+)
+
+@testset "Method ambiguity" begin
+    # Not including `Base` due to
+    # https://github.com/JuliaCollections/DataStructures.jl/pull/511
+    Aqua.test_ambiguities(Kaleido)
+end
+
+@testset "Compare test/Project.toml and test/environments/main/Project.toml" begin
+    @test Text(read(joinpath(@__DIR__, "Project.toml"), String)) ==
+          Text(read(joinpath(@__DIR__, "environments", "main", "Project.toml"), String))
+end
+
+end  # module