diff --git a/Project.toml b/Project.toml index 23db658..ef0c078 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "JolinPluto" uuid = "5b0b4ef8-f4e6-4363-b674-3f031f7b9530" authors = ["Stephan Sahm and contributors"] -version = "0.1.72" +version = "0.1.73" [deps] AbstractPlutoDingetjes = "6e696c72-6542-2067-7265-42206c756150" @@ -28,7 +28,7 @@ CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab" AWSExt = "AWS" PlotsExt = "Plots" PythonCallExt = "PythonCall" -RCallExt = "RCall" +RCallExt = ["RCall", "CondaPkg"] CondaPkgExt = "CondaPkg" [compat] diff --git a/ext/CondaPkgExt.jl b/ext/CondaPkgExt.jl index e522bd2..db8316a 100644 --- a/ext/CondaPkgExt.jl +++ b/ext/CondaPkgExt.jl @@ -1,9 +1,5 @@ module CondaPkgExt import CondaPkg function __init__() - # this is crucial so that the path is set correctly - # while PythonCall does this by itself, RCall needs this manual help, - # which effects both plain Julia with RCall as well as PlutoR - CondaPkg.activate!(ENV) end end \ No newline at end of file diff --git a/ext/RCallExt.jl b/ext/RCallExt.jl index a9b6a0f..fea8baa 100644 --- a/ext/RCallExt.jl +++ b/ext/RCallExt.jl @@ -1,4 +1,5 @@ module RCallExt +import CondaPkg # only needed for initialization import RCall, JolinPluto function JolinPluto.ChannelWithRepeatedFill(get_next_value::RCall.RObject, args...; sleep_seconds=0.0, skip_value=JolinPluto.NoPut, kwargs...) @@ -45,6 +46,12 @@ end function __init__() + + # this is crucial so that the path is set correctly + # while PythonCall does this by itself, RCall needs this manual help, + # which effects both plain Julia with RCall as well as PlutoR + CondaPkg.activate!(ENV) + _r_module_where_plutoscript_is_included[] = RCall.Const.GlobalEnv end