Skip to content

Commit

Permalink
Load InteractiveUtils from the IJulia namespace in src/kernel.jl. (#951)
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikekre authored Sep 29, 2020
1 parent 4fd955a commit 9b10fa9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "IJulia"
uuid = "7073ff75-c697-5162-941a-fcdaad2a7d2a"
version = "1.21.3"
version = "1.21.4"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down
4 changes: 4 additions & 0 deletions src/IJulia.jl
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ import Random
using Base64: Base64EncodePipe
import REPL

# InteractiveUtils is not used inside IJulia, but loaded in src/kernel.jl
# and this import makes it possible to load InteractiveUtils from the IJulia namespace
import InteractiveUtils

const depfile = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
isfile(depfile) || error("IJulia not properly installed. Please run Pkg.build(\"IJulia\")")
include(depfile) # generated by Pkg.build("IJulia")
Expand Down
3 changes: 2 additions & 1 deletion src/kernel.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ let
end
end

using InteractiveUtils
# Load InteractiveUtils from the IJulia namespace since @stdlib might not be in LOAD_PATH
using IJulia.InteractiveUtils

# workaround #60:
if Sys.isapple()
Expand Down

2 comments on commit 9b10fa9

@fredrikekre
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/22179

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.21.4 -m "<description of version>" 9b10fa9b879574bbf720f5285029e07758e50a5e
git push origin v1.21.4

Please sign in to comment.