Skip to content

Commit 74d61a3

Browse files
committed
Install Python dependencies in install_dependencies.jl
This is required for the test to work in JuliaCIBot.
1 parent 91de79b commit 74d61a3

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

ci/before_script.jl

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,5 @@ if VERSION >= v"0.7.0-"
2525
String))
2626
end
2727

28-
IPython.install_dependency("pytest"; force=true)
29-
IPython.install_dependency("ipython"; force=true)
30-
if get(ENV, "CONDA_JL_VERSION", "") == "2"
31-
# For IPython.testing.globalipapp
32-
IPython.install_dependency("mock"; force=true)
33-
end
34-
3528
@info "show_versions.jl"
3629
include("show_versions.jl")
37-
38-
@info "Pkg.build(IPython) since conda might have re-installed different Python"
39-
Pkg.build("IPython")
40-
41-
if VERSION >= v"0.7.0-"
42-
@info "PyCall/deps/build.log:"
43-
print(read(
44-
joinpath(dirname(dirname(pathof(IPython.PyCall))), "deps", "build.log"),
45-
String))
46-
end

test/install_dependencies.jl

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using Compat: @info
2+
using IPython
3+
4+
if VERSION >= v"0.7.0-"
5+
@info "PyCall/deps/build.log:"
6+
print(read(
7+
joinpath(dirname(dirname(pathof(IPython.PyCall))), "deps", "build.log"),
8+
String))
9+
end
10+
11+
IPython.install_dependency("pytest"; force=true)
12+
IPython.install_dependency("ipython"; force=true)
13+
if get(ENV, "CONDA_JL_VERSION", "") == "2"
14+
# For IPython.testing.globalipapp
15+
IPython.install_dependency("mock"; force=true)
16+
end

test/runtests.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# module TestIPython
22

3+
if lowercase(get(ENV, "CI", "false")) == "true"
4+
include("install_dependencies.jl")
5+
end
6+
37
include("preamble.jl")
48

59
IPython.envinfo()

0 commit comments

Comments
 (0)