@@ -83,12 +83,15 @@ NOT_INSTALLABLE = (false, "", Nothing)
83
83
84
84
function condajl_installation (package)
85
85
if PyCall. conda && package in conda_packages
86
+ args = ` install -y -c conda-forge $package `
86
87
message = """
87
88
Installing $package via Conda.jl
88
89
Execute?:
89
- Conda.add( $package )
90
+ Conda.runconda( $args )
90
91
"""
91
- install = () -> Conda. add (package)
92
+ install = () -> Conda. runconda (args)
93
+ # `Conda.add_channel` overwrites user's ~/.condarc so let's
94
+ # not use it.
92
95
return (true , message, install)
93
96
end
94
97
return NOT_INSTALLABLE
@@ -98,7 +101,7 @@ function conda_installation(package)
98
101
conda = joinpath (dirname (PyCall. pyprogramname), " conda" )
99
102
if isfile (conda) && package in conda_packages
100
103
prefix = dirname (dirname (PyCall. pyprogramname))
101
- command = ` $conda install --prefix $prefix $package `
104
+ command = ` $conda install --prefix $prefix -c conda-forge $package `
102
105
message = """
103
106
Installing $package with $conda
104
107
Execute?:
@@ -115,11 +118,11 @@ function pip_installation(package)
115
118
" mock" , " ipython-dev" , " ipython-pre" , " julia" )
116
119
args = package
117
120
if package == " ipython-dev"
118
- args = ` --upgrade "git+git://github.com/ipython/ipython#egg=ipython"`
121
+ args = ` "git+git://github.com/ipython/ipython#egg=ipython"`
119
122
elseif package == " ipython-pre"
120
- args = ` --upgrade -- pre ipython`
123
+ args = ` --pre ipython`
121
124
end
122
- command = ` $(PyCall. pyprogramname) -m pip install $args `
125
+ command = ` $(PyCall. pyprogramname) -m pip install --upgrade $args `
123
126
message = """
124
127
Installing $package for $(PyCall. pyprogramname)
125
128
Execute?:
0 commit comments