Skip to content

Commit d115bbb

Browse files
committed
Simplify SciPy installation using Conda
1 parent 8db4a99 commit d115bbb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/runtests.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using PyCall
22
using PyCall: hasproperty
33
using Test, Dates, Serialization
4-
import Conda
54

65
filter(f, itr) = collect(Iterators.filter(f, itr))
76
filter(f, d::AbstractDict) = Base.filter(f, d)
@@ -14,8 +13,9 @@ PYTHONEXECUTABLE=get(ENV,"PYTHONEXECUTABLE","")
1413
@testset "CI setup" begin
1514
if lowercase(get(ENV, "CI", "false")) == "true"
1615
@test !ispynull(pyimport_e("numpy"))
17-
if PyCall.conda && ispynull(pyimport_e("scipy.sparse"))
18-
Conda.add("scipy")
16+
try
17+
pyimport_conda("scipy.sparse", "scipy")
18+
catch
1919
end
2020
@test !ispynull(pyimport_e("scipy.sparse"))
2121
end

0 commit comments

Comments
 (0)