Skip to content

Commit

Permalink
including PlutoRunner package extensions here
Browse files Browse the repository at this point in the history
  • Loading branch information
schlichtanders committed Jul 11, 2024
1 parent 5313760 commit f7f2b46
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 2 deletions.
8 changes: 6 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.68"
version = "0.1.69"

[deps]
AbstractPlutoDingetjes = "6e696c72-6542-2067-7265-42206c756150"
Expand All @@ -22,12 +22,16 @@ AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
RCall = "6f49c342-dc21-5d91-9882-a32aef131414"
PlutoRunner = "dc6b355a-2368-4481-ae6d-ae0351418d79"
CondaPkg = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"

[extensions]
AWSExt = "AWS"
PlotsExt = "Plots"
PythonExt = "PythonCall"
PythonCallExt = "PythonCall"
RCallExt = "RCall"
CondaPkgExt = "CondaPkg"
PlutoRunnerPythonCallExt = ["PythonCall", "PlutoRunner"]

[compat]
julia = "1.7"
Expand Down
9 changes: 9 additions & 0 deletions ext/CondaPkgExt.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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
8 changes: 8 additions & 0 deletions ext/PlutoRunnerPythonCallExt.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module PythonExt
import PythonCall
import PlutoRunner

# ignore Python objects in the expr_hash (deserialization is introducing new objectids)
PlutoRunner.expr_hash(::PythonCall.Py) = zero(PlutoRunner.ObjectID)

end # module
File renamed without changes.

0 comments on commit f7f2b46

Please sign in to comment.