[Try PyCall.jl#613] Use PyCall.conda_add to install dependencies in deps/build.jl

.travis.yml

@@ -4,7 +4,6 @@ os:
   - linux
   # - osx
 julia:
-  - 0.6
   - 0.7
   - 1.0
   # - nightly
@@ -29,7 +28,8 @@ git:
 #    - gfortran
 
 before_script:
-  - julia --color=yes ci/before_script.jl
+  - julia --color=yes -e "using Pkg; Pkg.build()"
+  - cat deps/build.log
 #  - if [ $TRAVIS_OS_NAME = osx ]; then brew install gcc; fi
 
 script:

Project.toml

@@ -0,0 +1,10 @@
+name = "IPython"
+uuid = "18364772-b071-5c00-bfd7-ceeaffab630a"
+
+[deps]
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
+Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d"
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
+REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

deps/build.jl

@@ -0,0 +1,38 @@
+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
+
+in_CI = lowercase(get(ENV, "CI", "false")) == "true"
+
+if in_CI
+    # Let PyCall.jl use Python interpreter from Conda.jl
+    # See: https://github.com/JuliaPy/PyCall.jl
+    ENV["PYTHON"] = ""
+    Pkg.build("PyCall")
+end
+
+using PyCall
+
+if get(ENV, "CONDA_JL_VERSION", "") == "3"
+    PyCall.conda_add(["python=3.6"])
+    PyCall.conda_add(["python=3.7"])
+end
+
+packages = ["ipython"]
+if in_CI
+    push!(packages, "pytest")
+    if get(ENV, "CONDA_JL_VERSION", "") == "2"
+        # For IPython.testing.globalipapp
+        push!(packages, "mock")
+    end
+end
+PyCall.conda_add(packages)
+
+if VERSION >= v"0.7.0-"
+    @info "PyCall/deps/build.log:"
+    print(read(
+        joinpath(dirname(dirname(pathof(PyCall))), "deps", "build.log"),
+        String))
+end

src/convenience.jl

@@ -83,15 +83,12 @@ NOT_INSTALLABLE = (false, "", Nothing)
 
 function condajl_installation(package)
     if PyCall.conda && package in conda_packages
-        args = `install -y -c conda-forge $package`
         message = """
         Installing $package via Conda.jl
         Execute?:
-            Conda.runconda($args)
+            Conda.add($package)
         """
-        install = () -> Conda.runconda(args)
-        # `Conda.add_channel` overwrites user's ~/.condarc so let's
-        # not use it.
+        install = () -> Conda.add(package)
         return (true, message, install)
     end
     return NOT_INSTALLABLE

test/runtests.jl

@@ -1,24 +1,5 @@
 # module TestIPython
 
-if lowercase(get(ENV, "CI", "false")) == "true"
-    let
-        if VERSION < v"0.7.0-"
-            setup_code = ""
-        else
-            setup_code = Base.load_path_setup_code()
-        end
-        path = joinpath(@__DIR__, "install_dependencies.jl")
-        code = """
-        $setup_code
-        include("$(escape_string(path))")
-        """
-        run(`$(Base.julia_cmd()) -e $code`)
-        # Run install_dependencies.jl in a separate process since it
-        # may re-build PyCall.  In that case, we need to load
-        # re-precompiled PyCall and IPython.
-    end
-end
-
 include("preamble.jl")
 
 IPython.envinfo()