skip importing CondaPkg if not needed (take 3) (#769)

* skip importing CondaPkg if not needed

* remove dependence on Pkg

* apply suggestion

* remove unused arg

---------

Co-authored-by: Christopher Rowley <github.com/cjdoris>

Author: cjdoris

Project.toml

@@ -9,7 +9,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
-Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
@@ -22,7 +21,6 @@ Dates = "1"
 Libdl = "1"
 MacroTools = "0.5"
 Markdown = "1"
-Pkg = "1"
 Preferences = "1"
 PyCall = "1"
 Serialization = "1"

pysrc/juliacall/__init__.py

@@ -135,7 +135,7 @@ def int_option(name, *, accept_auto=False, **kw):
             raise ValueError(f'{s}: expecting an int'+(' or auto' if accept_auto else ""))
 
     def args_from_config(config):
-        argv = [config['exepath']]
+        argv = [config['exepath'], '--project='+config['project']]
         for opt, val in config.items():
             if opt.startswith('opt_'):
                 if val is None:
@@ -264,10 +264,8 @@ def jlstr(x):
     script = '''
     try
         Base.require(Main, :CompilerSupportLibraries_jll)
-        import Pkg
         global __PythonCall_libptr = Ptr{{Cvoid}}(UInt({}))
         ENV["JULIA_PYTHONCALL_EXE"] = {}
-        Pkg.activate({}, io=devnull)
         using PythonCall
     catch err
         print(stderr, "ERROR: ")
@@ -278,7 +276,6 @@ def jlstr(x):
     '''.format(
         hex(c.pythonapi._handle),
         jlstr(sys.executable or ''),
-        jlstr(project),
     )
     res = jl_eval(script.encode('utf8'))
     if res is None:

src/C/C.jl

@@ -9,10 +9,14 @@ using ..Utils
 
 using Base: @kwdef
 using UnsafePointers: UnsafePtr
-using CondaPkg: CondaPkg
-using Pkg: Pkg
 using Libdl:
     dlpath, dlopen, dlopen_e, dlclose, dlsym, dlsym_e, RTLD_LAZY, RTLD_DEEPBIND, RTLD_GLOBAL
+using Preferences: @load_preference
+
+# do not load CondaPkg if the exe preference is set to something else
+if @load_preference("exe", "@CondaPkg") == "@CondaPkg"
+    using CondaPkg: CondaPkg
+end
 
 import ..PythonCall:
     python_executable_path, python_library_path, python_library_handle, python_version

src/JlWrap/JlWrap.jl

@@ -30,7 +30,6 @@ import ..PythonCall:
     PyObjectMatrix,
     PyObjectArray
 
-using Pkg: Pkg
 using Base: @propagate_inbounds, allocatedinline
 
 import ..Core: Py
@@ -70,7 +69,6 @@ function __init__()
     jl.Core = Base.Core
     jl.Base = Base
     jl.Main = Main
-    jl.Pkg = Pkg
     jl.PythonCall = PythonCall
 end