File tree Expand file tree Collapse file tree 4 files changed +12
-4
lines changed Expand file tree Collapse file tree 4 files changed +12
-4
lines changed Original file line number Diff line number Diff line change 4848 # Keep in sync with SAGE_ROOT/src/sage/misc/replace_dot_all.py
4949 pattern : ' from\s+sage(|[.](arith|categories|combinat|crypto|databases|data_structures|dynamics|ext|game_theory|games|geometry|graphs|groups|interfaces|manifolds|matrix|matroids|misc|modules|monoids|numerical|probability|quadratic_forms|quivers|rings|sat|schemes|sets|stats|symbolic|tensor)[a-z0-9_.]*|[.]libs)[.]all\s+import'
5050 # imports from .all are allowed in all.py; also allow in some modules that need sage.all
51- filePattern : ' (.*/|)(?!(all|benchmark|dev_tools|parsing|sage_eval|explain_pickle|.*_test))[^/.]*[.](py|pyx|pxi)$'
51+ filePattern : ' (.*/|)(?!(all|benchmark|dev_tools|parsing|sage_eval|explain_pickle|.*_test|eval_cmd ))[^/.]*[.](py|pyx|pxi)$'
5252
5353- name : ' namespace_pkg_all_import_2: Module-level import of .all of a namespace package'
5454 hint : |
Original file line number Diff line number Diff line change @@ -11,11 +11,15 @@ def test_eval_cmd_print(capsys):
1111 assert captured .out == "5559060566555523\n "
1212 assert result == 0
1313
14+
1415def test_eval_cmd_invalid_command (capsys ):
1516 options = CliOptions (command = "invalid_command" )
1617 eval_cmd = EvalCmd (options )
1718
1819 result = eval_cmd .run ()
1920 captured = capsys .readouterr ()
20- assert "An error occurred while executing the command: name 'invalid_command' is not defined" in captured .out
21+ assert (
22+ "An error occurred while executing the command: name 'invalid_command' is not defined"
23+ in captured .out
24+ )
2125 assert result == 1
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ def __init__(self, options: CliOptions):
3232 Initialize the command.
3333 """
3434 self .options = options
35-
35+
3636 def run (self ) -> int :
3737 r"""
3838 Start the Jupyter notebook server.
@@ -48,5 +48,5 @@ def run(self) -> int:
4848 from jupyterlab .labapp import main
4949 else :
5050 raise ValueError (f"Unknown notebook type: { self .options .notebook } " )
51-
51+
5252 return main ([])
Original file line number Diff line number Diff line change @@ -11,24 +11,28 @@ def test_jupyter_as_default():
1111 args = parser .parse_args (["--notebook" ])
1212 assert args .notebook == "jupyter"
1313
14+
1415def test_jupyter_explicitly ():
1516 parser = argparse .ArgumentParser ()
1617 JupyterNotebookCmd .extend_parser (parser )
1718 args = parser .parse_args (["--notebook" , "jupyter" ])
1819 assert args .notebook == "jupyter"
1920
21+
2022def test_jupyterlab_explicitly ():
2123 parser = argparse .ArgumentParser ()
2224 JupyterNotebookCmd .extend_parser (parser )
2325 args = parser .parse_args (["--notebook" , "jupyterlab" ])
2426 assert args .notebook == "jupyterlab"
2527
28+
2629def test_invalid_notebook_choice ():
2730 parser = argparse .ArgumentParser ()
2831 JupyterNotebookCmd .extend_parser (parser )
2932 with pytest .raises (SystemExit ):
3033 parser .parse_args (["--notebook" , "invalid" ])
3134
35+
3236def test_help ():
3337 parser = argparse .ArgumentParser ()
3438 JupyterNotebookCmd .extend_parser (parser )
You can’t perform that action at this time.
0 commit comments