File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ def pytest_sessionstart(session):
3939 if not session .config .getoption ("julia" ):
4040 return
4141
42- from .core import LibJulia , enable_debug
42+ from .core import LibJulia , JuliaInfo , Julia , enable_debug
4343
4444 options = JuliaOptions ()
4545 for desc in JuliaOptions .supported_options ():
@@ -52,8 +52,14 @@ def pytest_sessionstart(session):
5252 _USING_DEFAULT_SETUP = not (julia_runtime or options .as_args ())
5353
5454 enable_debug ()
55- api = LibJulia .load (julia = julia_runtime )
56- api .init_julia (options )
55+ info = JuliaInfo .load (julia = julia_runtime )
56+ if (info .version_major , info .version_minor ) < (0 , 7 ):
57+ # In Julia 0.6, we have to load PyCall.jl here to do the
58+ # fake-julia setup.
59+ Julia (runtime = julia_runtime )
60+ else :
61+ api = LibJulia .from_juliainfo (info )
62+ api .init_julia (options )
5763
5864
5965# Initialize Julia runtime as soon as possible (or more precisely
You can’t perform that action at this time.
0 commit comments