Skip to content

Commit ca274b1

Browse files
committed
Fix tests for Python 2
1 parent 9d7c49a commit ca274b1

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

ci/before_script.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ if get(ENV, "CONDA_JL_VERSION", "") != "2"
2323
# Use regular IPython when 7.0 is out.
2424
IPython.install_dependency("ipython-dev"; force=true)
2525
end
26+
if get(ENV, "CONDA_JL_VERSION", "") == "2"
27+
# For IPython.testing.globalipapp
28+
IPython.install_dependency("mock"; force=true)
29+
end
2630

2731
@info "show_versions.jl"
2832
include("show_versions.jl")

src/convenience.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ function conda_installation(package)
111111
end
112112

113113
function pip_installation(package)
114-
if package in (conda_packages..., "ipython-dev", "ipython-pre", "julia")
114+
if package in (conda_packages...,
115+
"mock", "ipython-dev", "ipython-pre", "julia")
115116
args = package
116117
if package == "ipython-dev"
117118
args = `--upgrade "git+git://github.com/ipython/ipython#egg=ipython"`

src/ipython_jl/entrypoints.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
from __future__ import print_function
2+
13
from textwrap import dedent
24

35
from .convenience import with_message

0 commit comments

Comments
 (0)