Skip to content

Commit 4f4d8ed

Browse files
authored
Install Aqua in the right place (#357)
1 parent d99fcfe commit 4f4d8ed

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
1414
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
1515
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
1616
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
17+
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1718
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1819
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1920

2021
[targets]
21-
test = ["Aqua", "Dates", "InteractiveUtils", "Printf", "Test"]
22+
test = ["Aqua", "Dates", "InteractiveUtils", "Pkg", "Printf", "Test"]

test/ambiguous.jl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
11
# This file is a part of Julia. License is MIT: https://julialang.org/license
2+
3+
import Pkg
4+
5+
# Because julia CI doesn't run stdlib tests via `Pkg.test` test deps must be manually installed if missing
6+
if Base.find_package("Aqua") === nothing
7+
@debug "Installing Aqua.jl for SparseArrays.jl tests"
8+
iob = IOBuffer()
9+
try
10+
Pkg.add("Aqua", io=iob) # Needed for custom julia version resolve tests
11+
catch
12+
println(String(take!(iob)))
13+
rethrow()
14+
end
15+
end
16+
217
using Test, LinearAlgebra, SparseArrays, Aqua
318

419
@testset "code quality" begin

test/runtests.jl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
11
# This file is a part of Julia. License is MIT: https://julialang.org/license
22
using Test, LinearAlgebra, SparseArrays
33

4-
# Because julia CI doesn't run stdlib tests via `Pkg.test` test deps must be manually installed if missing
5-
if Base.find_package("Aqua") === nothing
6-
@debug "Installing Aqua.jl for SparseArrays.jl tests"
7-
iob = IOBuffer()
8-
try
9-
Pkg.add("Aqua", io=iob) # Needed for custom julia version resolve tests
10-
catch
11-
println(String(take!(iob)))
12-
rethrow()
13-
end
14-
end
15-
164
for file in readlines(joinpath(@__DIR__, "testgroups"))
175
file == "" && continue # skip empty lines
186
include(file * ".jl")

0 commit comments

Comments
 (0)