Skip to content

Commit 6b4b799

Browse files
committed
Rebuild PyCall in install_dependencies.jl for JuliaCIBot
1 parent 74d61a3 commit 6b4b799

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

ci/before_script.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ else
66
end
77
end
88

9-
# Let PyCall.jl use Python interpreter from Conda.jl
10-
# See: https://github.com/JuliaPy/PyCall.jl
11-
ENV["PYTHON"] = ""
12-
139
@info "Pkg.clone(pwd())"
1410
Pkg.clone(pwd())
1511

test/install_dependencies.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
if VERSION >= v"0.7.0-"
2+
# Adding Pkg in test/REQUIRE would be an error in 0.6. Using
3+
# Project.toml still has some gotchas. So:
4+
Pkg = Base.require(Base.PkgId(Base.UUID(0x44cfe95a1eb252eab672e2afdf69b78f), "Pkg"))
5+
end
6+
7+
# Let PyCall.jl use Python interpreter from Conda.jl
8+
# See: https://github.com/JuliaPy/PyCall.jl
9+
ENV["PYTHON"] = ""
10+
Pkg.build("PyCall")
11+
112
using Compat: @info
213
using IPython
314

0 commit comments

Comments
 (0)