Cleanup CLI naming

parente · parente · commit de7753402bea · 2016-07-02T14:57:10.000-04:00
Based on first review by @minrk * bundlerextension for consistency * Move CLI entry point into bundler package * Add bundler/__main__.py (c) Copyright IBM Corp. 2016
diff --git a/notebook/bundler/__main__.py b/notebook/bundler/__main__.py
@@ -0,0 +1,7 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+from .bundlerextensions import main
+
+if __name__ == '__main__':    
+    main()
diff --git a/notebook/bundler/bundlerextensions.py b/notebook/bundler/bundlerextensions.py
@@ -3,8 +3,8 @@
 import sys
 import os
 
-from .nbextensions import (BaseNBExtensionApp, _get_config_dir)    
-from ._version import __version__
+from ..nbextensions import (BaseNBExtensionApp, _get_config_dir)
+from .._version import __version__
 
 from traitlets.config.manager import BaseJSONConfigManager
 from traitlets.utils.importstring import import_item
diff --git a/scripts/jupyter-bundlerextension b/scripts/jupyter-bundlerextension
@@ -2,7 +2,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from notebook.bundlerextensions import main
+from notebook.bundler.bundlerextensions import main
 
 if __name__ == '__main__':
     main()
diff --git a/setup.py b/setup.py
@@ -180,7 +180,7 @@
             'jupyter-notebook = notebook.notebookapp:main',
             'jupyter-nbextension = notebook.nbextensions:main',
             'jupyter-serverextension = notebook.serverextensions:main',
-            'jupyter-bundler = notebook.bundlerextensions:main',
+            'jupyter-bundlerextension = notebook.bundler.bundlerextensions:main',
         ]
     }
     setup_args.pop('scripts', None)

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@`
`180`	`180`	`'jupyter-notebook = notebook.notebookapp:main',`
`181`	`181`	`'jupyter-nbextension = notebook.nbextensions:main',`
`182`	`182`	`'jupyter-serverextension = notebook.serverextensions:main',`
`183`		`- 'jupyter-bundler = notebook.bundlerextensions:main',`
	`183`	`+ 'jupyter-bundlerextension = notebook.bundler.bundlerextensions:main',`
`184`	`184`	`]`
`185`	`185`	`}`
`186`	`186`	`setup_args.pop('scripts', None)`