diff --git a/ci/before_script.jl b/ci/before_script.jl index ad6ddc7..0eb2d38 100644 --- a/ci/before_script.jl +++ b/ci/before_script.jl @@ -6,10 +6,6 @@ else end end -# Let PyCall.jl use Python interpreter from Conda.jl -# See: https://github.com/JuliaPy/PyCall.jl -ENV["PYTHON"] = "" - @info "Pkg.clone(pwd())" Pkg.clone(pwd()) diff --git a/test/install_dependencies.jl b/test/install_dependencies.jl index 9aeefa3..5051cfc 100644 --- a/test/install_dependencies.jl +++ b/test/install_dependencies.jl @@ -1,3 +1,14 @@ +if VERSION >= v"0.7.0-" + # Adding Pkg in test/REQUIRE would be an error in 0.6. Using + # Project.toml still has some gotchas. So: + Pkg = Base.require(Base.PkgId(Base.UUID(0x44cfe95a1eb252eab672e2afdf69b78f), "Pkg")) +end + +# Let PyCall.jl use Python interpreter from Conda.jl +# See: https://github.com/JuliaPy/PyCall.jl +ENV["PYTHON"] = "" +Pkg.build("PyCall") + using Compat: @info using IPython