Skip to content

Commit bdc2dc4

Browse files
committed
Add IPython.install_dependency("ipython-dev")
1 parent e8575c7 commit bdc2dc4

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

ci/before_script.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,12 @@ Pkg.clone(pwd())
1717
Pkg.build("IPython")
1818

1919
using IPython
20-
IPython.install_dependency("ipython"; force=true)
2120
IPython.install_dependency("pytest"; force=true)
21+
IPython.install_dependency("ipython"; force=true)
22+
if get(ENV, "CONDA_JL_VERSION", "") != "2"
23+
# Use regular IPython when 7.0 is out.
24+
IPython.install_dependency("ipython-dev"; force=true)
25+
end
2226

2327
@info "show_versions.jl"
2428
include("show_versions.jl")

src/convenience.jl

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

113113
function pip_installation(package)
114-
if package in (conda_packages..., "julia")
114+
if package in (conda_packages..., "ipython-dev", "julia")
115+
if package == "ipython-dev"
116+
package = "git+git://github.com/ipython/ipython#egg=ipython"
117+
end
115118
command = `$(PyCall.pyprogramname) -m pip install $package`
116119
message = """
117120
Installing $package for $(PyCall.pyprogramname)

src/replhelper/core.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,15 @@ def ipython_options(**kwargs):
154154
cause segmentation fault with tab completion. For segfault-free
155155
IPython, upgrade to version 7 or above (which may still be in
156156
development stage depending on the time you read this message).
157+
158+
If you need to install development version of IPython and understand
159+
what would happen to your Python environment by doing so, executing
160+
the following command in Julia may help:
161+
162+
IPython.install_dependency("ipython-dev")
163+
164+
It prints the installation command to be executed and prompts your
165+
input (yes/no) before really executing it.
157166
"""
158167

159168
segfault_warned = False

0 commit comments

Comments
 (0)