-
-
Notifications
You must be signed in to change notification settings - Fork 423
make an ijulia "app" entrypoint #1211
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
KristofferC
wants to merge
2
commits into
JuliaLang:master
Choose a base branch
from
KristofferC:kc/app
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| using Test | ||
| import IJulia | ||
|
|
||
| @testset "@main app entry point" begin | ||
| # Test help output | ||
| @testset "help" begin | ||
| # Capture stdout using a pipe | ||
| old_stdout = stdout | ||
| rd, wr = redirect_stdout() | ||
|
|
||
| ret = IJulia.main(["--help"]) | ||
|
|
||
| # Restore stdout and read the captured output | ||
| redirect_stdout(old_stdout) | ||
| close(wr) | ||
| help_text = read(rd, String) | ||
| close(rd) | ||
|
|
||
| @test ret == 0 | ||
| @test occursin("IJulia Launcher", help_text) | ||
| @test occursin("notebook", help_text) | ||
| @test occursin("lab", help_text) | ||
| @test occursin("--dir=PATH", help_text) | ||
| @test occursin("--port=N", help_text) | ||
| @test occursin("--detached", help_text) | ||
| @test occursin("--verbose", help_text) | ||
| end | ||
|
|
||
| # Test invalid subcommand | ||
| @testset "invalid subcommand" begin | ||
| ret = @test_logs (:error, r"Unknown subcommand.*Use 'notebook' or 'lab'") IJulia.main(["invalid"]) | ||
| @test ret == 1 | ||
| end | ||
|
|
||
| # Test argument parsing without actually launching | ||
| @testset "argument parsing" begin | ||
| # Test default subcommand (lab) | ||
| called_with = nothing | ||
| mock_jupyterlab = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false) | ||
| called_with = (; args, dir, detached, port, verbose) | ||
| return nothing | ||
| end | ||
|
|
||
| ret = IJulia.main(["--dir=/test", "--port=9999", "--detached", "--verbose", "--no-browser"]; jupyterlab_cmd=mock_jupyterlab) | ||
| @test ret == 0 | ||
| @test !isnothing(called_with) | ||
| @test called_with.dir == "/test" | ||
| @test called_with.port == 9999 | ||
| @test called_with.detached == true | ||
| @test called_with.verbose == true | ||
| @test "--no-browser" in called_with.args | ||
|
|
||
| # Test explicit notebook subcommand | ||
| called_with = nothing | ||
| mock_notebook = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false) | ||
| called_with = (; args, dir, detached, port, verbose) | ||
| return nothing | ||
| end | ||
|
|
||
| ret = IJulia.main(["notebook", "--dir=/test", "--port=9999", "--detached", "--verbose", "--no-browser"]; notebook_cmd=mock_notebook) | ||
| @test ret == 0 | ||
| @test !isnothing(called_with) | ||
| @test called_with.dir == "/test" | ||
| @test called_with.port == 9999 | ||
| @test called_with.detached == true | ||
| @test called_with.verbose == true | ||
| @test "--no-browser" in called_with.args | ||
|
|
||
| # Test lab subcommand | ||
| called_with = nothing | ||
| mock_jupyterlab = function(args=``; dir=homedir(), detached=false, port=nothing, verbose=false) | ||
| called_with = (; args, dir, detached, port, verbose) | ||
| return nothing | ||
| end | ||
|
|
||
| ret = IJulia.main(["lab", "--dir=/lab", "--verbose"]; jupyterlab_cmd=mock_jupyterlab) | ||
| @test ret == 0 | ||
| @test !isnothing(called_with) | ||
| @test called_with.dir == "/lab" | ||
| @test called_with.verbose == true | ||
| end | ||
|
|
||
| # Test InterruptException handling | ||
| @testset "interrupt handling" begin | ||
| mock_notebook = function(args=``; kwargs...) | ||
| throw(InterruptException()) | ||
| end | ||
|
|
||
| ret = IJulia.main(["notebook"]; notebook_cmd=mock_notebook) | ||
| @test ret == 0 # InterruptException should return 0 | ||
| end | ||
|
|
||
| # Test error handling | ||
| @testset "error handling" begin | ||
| mock_notebook = function(args=``; kwargs...) | ||
| error("Test error") | ||
| end | ||
|
|
||
| ret = @test_logs (:error, r"Failed to launch") IJulia.main(["notebook"]; notebook_cmd=mock_notebook) | ||
| @test ret == 1 # Errors should return 1 | ||
| end | ||
| end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think IJulia is one of the few packages that still has a build step 😅 Shall we just install the app automatically when building? My only concern is that from reading the docs it seems that an app is somehow hardcoded to a specific Julia binary? That's a bit unfortunate because we recently added a juliaup integration that reduced the need for rebuilding IJulia to once per minor release (#1201). And perhaps if it's that experimental we should leave it out by default, can always enable it later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about this and I even have a started branch that removes the build step.
Moves the kernel installation into the package and auto-installs on first kernel launch and uses a scratch space to keep the preference (https://github.com/JuliaPackaging/Scratch.jl).
What do you think about that? Build scripts are not that great...
But anyway, once I've fixed a bug, app installation should run the build step like normally.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That sounds ok, as long as it still installs the same kernels as now. @stevengj, what do you think?