Skip to content

Commit

Permalink
Conda.activate seem to interfere with python
Browse files Browse the repository at this point in the history
  • Loading branch information
schlichtanders committed Jul 11, 2024
1 parent 02e908d commit 975f6be
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "JolinPluto"
uuid = "5b0b4ef8-f4e6-4363-b674-3f031f7b9530"
authors = ["Stephan Sahm <[email protected]> and contributors"]
version = "0.1.72"
version = "0.1.73"

[deps]
AbstractPlutoDingetjes = "6e696c72-6542-2067-7265-42206c756150"
Expand All @@ -28,7 +28,7 @@ CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
AWSExt = "AWS"
PlotsExt = "Plots"
PythonCallExt = "PythonCall"
RCallExt = "RCall"
RCallExt = ["RCall", "CondaPkg"]
CondaPkgExt = "CondaPkg"

[compat]
Expand Down
4 changes: 0 additions & 4 deletions ext/CondaPkgExt.jl
Original file line number Diff line number Diff line change
@@ -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
7 changes: 7 additions & 0 deletions ext/RCallExt.jl
Original file line number Diff line number Diff line change
@@ -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...)
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 975f6be

Please sign in to comment.