s/jupyter_notebook/notebook

.bowerrc

@@ -1,3 +1,3 @@
 {
-  "directory": "jupyter_notebook/static/components"
+  "directory": "notebook/static/components"
 }

.gitignore

@@ -5,8 +5,8 @@ _build
 docs/man/*.gz
 docs/source/api/generated
 docs/gh-pages
-jupyter_notebook/static/components
-jupyter_notebook/static/style/*.min.css*
+notebook/static/components
+notebook/static/style/*.min.css*
 node_modules
 *.py[co]
 __pycache__
@@ -19,3 +19,4 @@ __pycache__
 \#*#
 .#*
 .coverage
+src

.travis.yml

@@ -17,10 +17,10 @@ before_install:
     - 'if [[ $GROUP == js* ]]; then npm install -g casperjs; fi'
     - git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
 install:
-    - pip install -f travis-wheels/wheelhouse -r requirements.txt file://$PWD#egg=jupyter_notebook[test] coveralls
+    - pip install -f travis-wheels/wheelhouse -r requirements.txt file://$PWD#egg=notebook[test] coveralls
 script:
-    - 'if [[ $GROUP == js* ]]; then python -m jupyter_notebook.jstest ${GROUP:3}; fi'
-    - 'if [[ $GROUP == python ]]; then nosetests --with-coverage --cover-package=jupyter_notebook jupyter_notebook; fi'
+    - 'if [[ $GROUP == js* ]]; then python -m notebook.jstest ${GROUP:3}; fi'
+    - 'if [[ $GROUP == python ]]; then nosetests --with-coverage --cover-package=notebook notebook; fi'
 matrix:
     include:
         - python: 3.3

README.md

@@ -19,11 +19,11 @@ Launch with:
 For Ubuntu Trusty:
 ```
 sudo apt-get install nodejs-legacy npm python-virtualenv python-dev
-python2 -m virtualenv ~/.virtualenvs/jupyter_notebook
-source ~/.virtualenvs/jupyter_notebook/bin/activate
+python2 -m virtualenv ~/.virtualenvs/notebook
+source ~/.virtualenvs/notebook/bin/activate
 pip install --upgrade setuptools pip
-git clone https://github.com/jupyter/jupyter_notebook.git
-cd jupyter_notebook
+git clone https://github.com/jupyter/notebook.git
+cd notebook
 pip install -r requirements.txt -e .
 jupyter notebook
 ```

docs/source/development.rst

@@ -16,12 +16,12 @@ To do so we rely on the livereaload extension of various browser (`for chrome
 and the gulp-livereload extension. 
 
 
-To use the livereload extension, in the root of `jupyter_notebook` project launch::
+To use the livereload extension, in the root of `notebook` project launch::
 
     $ gulp watch
     
     
-Any changes to any of the less files under the `jupyter_notebook/static`
+Any changes to any of the less files under the `notebook/static`
 directory will trigger a rebuild of css and ask the reload extension to reload
 the current page. 
 

gulpfile.js

@@ -9,7 +9,7 @@ var sourcemaps = require('gulp-sourcemaps');
 var livereload = require('gulp-livereload');
  
 gulp.task('css', function () {
-  return gulp.src('./jupyter_notebook/static/style/*.less')
+  return gulp.src('./notebook/static/style/*.less')
     .pipe(sourcemaps.init())
     .pipe(less({
       paths: [ path.join(__dirname, 'less', 'includes') ]
@@ -19,7 +19,7 @@ gulp.task('css', function () {
             suffix: '.min'
         }))
     .pipe(sourcemaps.write('./'))
-    .pipe(gulp.dest('./jupyter_notebook/static/style'))
+    .pipe(gulp.dest('./notebook/static/style'))
     .pipe(livereload());
 });
 
@@ -27,5 +27,5 @@ gulp.task('css', function () {
 
 gulp.task('watch', function() {
   livereload.listen();
-  gulp.watch('jupyter_notebook/static/**/*.less', ['css']);
+  gulp.watch('notebook/static/**/*.less', ['css']);
 });

jupyter_notebook/__main__.py

@@ -1,3 +0,0 @@
-if __name__ == '__main__':
-    from jupyter_notebook import notebookapp as app
-    app.launch_new_instance()

notebook/__init__.py

@@ -7,7 +7,7 @@ DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static")
 # Packagers: modify the next line if you store the notebook template files
 # elsewhere
 
-# Include both jupyter_notebook/ and jupyter_notebook/templates/.  This makes it
+# Include both notebook/ and notebook/templates/.  This makes it
 # possible for users to override a template with a file that inherits from that
 # template.
 #

notebook/__main__.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import
+
+if __name__ == '__main__':
+    from notebook import notebookapp as app
+    app.launch_new_instance()

notebook/_sysinfo.py

@@ -6,6 +6,8 @@ Utilities for getting information about Jupyter and the system it's running in.
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+from __future__ import absolute_import
+
 import os
 import platform
 import pprint
@@ -14,7 +16,7 @@ import subprocess
 
 from ipython_genutils import py3compat, encoding
 
-import jupyter_notebook
+import notebook
 
 def pkg_commit_hash(pkg_path):
     """Get short form of commit hash given directory `pkg_path`
@@ -62,7 +64,7 @@ def pkg_info(pkg_path):
     """
     src, hsh = pkg_commit_hash(pkg_path)
     return dict(
-        notebook_version=jupyter_notebook.__version__,
+        notebook_version=notebook.__version__,
         notebook_path=pkg_path,
         commit_source=src,
         commit_hash=hsh,
@@ -77,6 +79,6 @@ def pkg_info(pkg_path):
 def get_sys_info():
     """Return useful information about the system as a dict."""
     p = os.path
-    path = p.realpath(p.dirname(p.abspath(p.join(jupyter_notebook.__file__))))
+    path = p.realpath(p.dirname(p.abspath(p.join(notebook.__file__))))
     return pkg_info(path)
 

notebook/auth/security.py

@@ -74,7 +74,7 @@ def passwd_check(hashed_passphrase, passphrase):
 
     Examples
     --------
-    >>> from jupyter_notebook.auth.security import passwd_check
+    >>> from notebook.auth.security import passwd_check
     >>> passwd_check('sha1:0e112c3ddfce:a68df677475c2b47b6e86d0467eec97ac5f4b85a',
     ...              'mypassword')
     True

notebook/base/handlers.py

@@ -21,15 +21,15 @@ from tornado import web
 from tornado import gen
 from tornado.log import app_log
 
-from jupyter_notebook._sysinfo import get_sys_info
+from notebook._sysinfo import get_sys_info
 
 from traitlets.config import Application
 from ipython_genutils.path import filefind
 from ipython_genutils.py3compat import string_types
 
-import jupyter_notebook
-from jupyter_notebook.utils import is_hidden, url_path_join, url_escape
-from jupyter_notebook.services.security import csp_report_uri
+import notebook
+from notebook.utils import is_hidden, url_path_join, url_escape
+from notebook.services.security import csp_report_uri
 
 #-----------------------------------------------------------------------------
 # Top-level handlers
@@ -456,7 +456,7 @@ class ApiVersionHandler(IPythonHandler):
     @json_errors
     def get(self):
         # not authenticated, so give as few info as possible
-        self.finish(json.dumps({"version":jupyter_notebook.__version__}))
+        self.finish(json.dumps({"version":notebook.__version__}))
 
 
 class TrailingSlashHandler(web.RequestHandler):

notebook/base/zmqhandlers.py

@@ -90,7 +90,7 @@ WS_PING_INTERVAL = 30000
 if os.environ.get('IPYTHON_ALLOW_DRAFT_WEBSOCKETS_FOR_PHANTOMJS', False):
     warnings.warn("""Allowing draft76 websocket connections!
     This should only be done for testing with phantomjs!""")
-    from jupyter_notebook import allow76
+    from notebook import allow76
     WebSocketHandler = allow76.AllowDraftWebSocketHandler
     # draft 76 doesn't support ping
     WS_PING_INTERVAL = 0

notebook/files/handlers.py

@@ -10,7 +10,7 @@ import base64
 
 from tornado import web
 
-from jupyter_notebook.base.handlers import IPythonHandler
+from notebook.base.handlers import IPythonHandler
 
 class FilesHandler(IPythonHandler):
     """serve files via ContentsManager"""

notebook/jstest.py

@@ -3,13 +3,12 @@
 
 This module runs one or more subprocesses which will actually run the Javascript
 test suite.
-
 """
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import argparse
 import json
@@ -31,7 +30,7 @@ except ImportError:
 
 from jupyter_core.paths import jupyter_runtime_dir
 from ipython_genutils.py3compat import bytes_to_str, which
-from jupyter_notebook._sysinfo import get_sys_info
+from notebook._sysinfo import get_sys_info
 from ipython_genutils.tempdir import TemporaryDirectory
 
 try:
@@ -202,7 +201,7 @@ class TestController(object):
 
 
 def get_js_test_dir():
-    import jupyter_notebook.tests as t
+    import notebook.tests as t
     return os.path.join(os.path.dirname(t.__file__), '')
 
 def all_js_groups():
@@ -308,7 +307,7 @@ class JSController(TestController):
     def _init_server(self):
         "Start the notebook server in a separate process"
         self.server_command = command = [sys.executable,
-            '-m', 'jupyter_notebook',
+            '-m', 'notebook',
             '--no-browser',
             '--notebook-dir', self.nbdir.name,
         ]
@@ -581,7 +580,7 @@ def run_jstestall(options):
                                   nrunners, ', '.join(failed_sections)), took)
         print()
         print('You may wish to rerun these, with:')
-        print('  python -m jupyter_notebook.jstest', *failed_sections)
+        print('  python -m notebook.jstest', *failed_sections)
         print()
 
     if failed:

notebook/nbconvert/tests/test_nbconvert_handlers.py

@@ -8,8 +8,8 @@ import shutil
 
 import requests
 
-from jupyter_notebook.utils import url_path_join
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
+from notebook.utils import url_path_join
+from notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
 from nbformat import write
 from nbformat.v4 import (
     new_notebook, new_markdown_cell, new_code_cell, new_output,

notebook/notebookapp.py

@@ -4,7 +4,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
+from __future__ import absolute_import, print_function
 
 import base64
 import datetime
@@ -49,7 +49,7 @@ from tornado import httpserver
 from tornado import web
 from tornado.log import LogFormatter, app_log, access_log, gen_log
 
-from jupyter_notebook import (
+from notebook import (
     DEFAULT_STATIC_FILES_PATH,
     DEFAULT_TEMPLATE_PATH_LIST,
 )
@@ -82,7 +82,7 @@ from traitlets import (
 from ipython_genutils import py3compat
 from IPython.paths import get_ipython_dir
 from jupyter_core.paths import jupyter_runtime_dir, jupyter_path
-from jupyter_notebook._sysinfo import get_sys_info
+from notebook._sysinfo import get_sys_info
 
 from .utils import url_path_join, check_pid
 
@@ -113,7 +113,7 @@ def random_ports(port, n):
 
 def load_handlers(name):
     """Load the (URL pattern, handler) tuples for each component."""
-    name = 'jupyter_notebook.' + name
+    name = 'notebook.' + name
     mod = __import__(name, fromlist=['default_handlers'])
     return mod.default_handlers
 
@@ -496,7 +496,7 @@ class NotebookApp(JupyterApp):
 
                       To generate, type in a python/IPython shell:
 
-                        from jupyter_notebook.auth import passwd; passwd()
+                        from notebook.auth import passwd; passwd()
 
                       The string should be of the form type:salt:hashed-password.
                       """
@@ -600,7 +600,7 @@ class NotebookApp(JupyterApp):
     extra_template_paths = List(Unicode, config=True,
         help="""Extra paths to search for serving jinja templates.
 
-        Can be used to override templates from jupyter_notebook.templates."""
+        Can be used to override templates from notebook.templates."""
     )
 
     @property

notebook/services/config/tests/test_config_api.py

@@ -5,8 +5,8 @@ import json
 
 import requests
 
-from jupyter_notebook.utils import url_path_join
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase
+from notebook.utils import url_path_join
+from notebook.tests.launchnotebook import NotebookTestBase
 
 
 class ConfigAPI(object):

notebook/services/contents/fileio.py

@@ -14,7 +14,7 @@ import shutil
 
 from tornado.web import HTTPError
 
-from jupyter_notebook.utils import (
+from notebook.utils import (
     to_api_path,
     to_os_path,
 )

notebook/services/contents/filemanager.py

@@ -21,7 +21,7 @@ from ipython_genutils.importstring import import_item
 from traitlets import Any, Unicode, Bool, TraitError
 from ipython_genutils.py3compat import getcwd, string_types
 from . import tz
-from jupyter_notebook.utils import (
+from notebook.utils import (
     is_hidden,
     to_api_path,
 )

notebook/services/contents/handlers.py

@@ -7,10 +7,10 @@ import json
 
 from tornado import gen, web
 
-from jupyter_notebook.utils import url_path_join, url_escape
+from notebook.utils import url_path_join, url_escape
 from jupyter_client.jsonutil import date_default
 
-from jupyter_notebook.base.handlers import (
+from notebook.base.handlers import (
     IPythonHandler, json_errors, path_regex,
 )
 

notebook/services/contents/tests/test_contents_api.py

@@ -16,8 +16,8 @@ import requests
 from ..filecheckpoints import GenericFileCheckpoints
 
 from traitlets.config import Config
-from jupyter_notebook.utils import url_path_join, url_escape, to_os_path
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
+from notebook.utils import url_path_join, url_escape, to_os_path
+from notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
 from nbformat import read, write, from_dict
 from nbformat.v4 import (
     new_notebook, new_markdown_cell,

notebook/services/kernels/handlers.py

@@ -11,7 +11,7 @@ from tornado.ioloop import IOLoop
 
 from jupyter_client.jsonutil import date_default
 from ipython_genutils.py3compat import cast_unicode
-from jupyter_notebook.utils import url_path_join, url_escape
+from notebook.utils import url_path_join, url_escape
 
 from ...base.handlers import IPythonHandler, json_errors
 from ...base.zmqhandlers import AuthenticatedZMQStreamHandler, deserialize_binary_message

notebook/services/kernels/kernelmanager.py

@@ -14,7 +14,7 @@ from tornado import web
 from jupyter_client.multikernelmanager import MultiKernelManager
 from traitlets import List, Unicode, TraitError
 
-from jupyter_notebook.utils import to_os_path
+from notebook.utils import to_os_path
 from ipython_genutils.py3compat import getcwd
 
 

notebook/services/kernels/tests/test_kernels_api.py

@@ -5,8 +5,8 @@ import requests
 
 from jupyter_client.kernelspec import NATIVE_KERNEL_NAME
 
-from jupyter_notebook.utils import url_path_join
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
+from notebook.utils import url_path_join
+from notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
 
 class KernelAPI(object):
     """Wrapper for kernel REST API requests"""

notebook/services/kernelspecs/tests/test_kernelspecs_api.py

@@ -12,8 +12,8 @@ pjoin = os.path.join
 import requests
 
 from jupyter_client.kernelspec import NATIVE_KERNEL_NAME
-from jupyter_notebook.utils import url_path_join
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
+from notebook.utils import url_path_join
+from notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
 
 # Copied from jupyter_client.tests.test_kernelspec so updating that doesn't
 # break these tests

notebook/services/nbconvert/tests/test_nbconvert_api.py

@@ -1,7 +1,7 @@
 import requests
 
-from jupyter_notebook.utils import url_path_join
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase
+from notebook.utils import url_path_join
+from notebook.tests.launchnotebook import NotebookTestBase
 
 class NbconvertAPI(object):
     """Wrapper for nbconvert API calls."""

notebook/services/sessions/handlers.py

@@ -9,7 +9,7 @@ from tornado import web
 
 from ...base.handlers import IPythonHandler, json_errors
 from jupyter_client.jsonutil import date_default
-from jupyter_notebook.utils import url_path_join, url_escape
+from notebook.utils import url_path_join, url_escape
 from jupyter_client.kernelspec import NoSuchKernel
 
 

notebook/services/sessions/sessionmanager.py

@@ -15,8 +15,8 @@ from traitlets import Instance
 
 class SessionManager(LoggingConfigurable):
 
-    kernel_manager = Instance('jupyter_notebook.services.kernels.kernelmanager.MappingKernelManager')
-    contents_manager = Instance('jupyter_notebook.services.contents.manager.ContentsManager')
+    kernel_manager = Instance('notebook.services.kernels.kernelmanager.MappingKernelManager')
+    contents_manager = Instance('notebook.services.contents.manager.ContentsManager')
     
     # Session database initialized below
     _cursor = None

notebook/services/sessions/tests/test_sessionmanager.py

@@ -5,8 +5,8 @@ from unittest import TestCase
 from tornado import web
 
 from ..sessionmanager import SessionManager
-from jupyter_notebook.services.kernels.kernelmanager import MappingKernelManager
-from jupyter_notebook.services.contents.manager import ContentsManager
+from notebook.services.kernels.kernelmanager import MappingKernelManager
+from notebook.services.contents.manager import ContentsManager
 
 class DummyKernel(object):
     def __init__(self, kernel_name='python'):

notebook/services/sessions/tests/test_sessions_api.py

@@ -10,8 +10,8 @@ import time
 
 pjoin = os.path.join
 
-from jupyter_notebook.utils import url_path_join
-from jupyter_notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
+from notebook.utils import url_path_join
+from notebook.tests.launchnotebook import NotebookTestBase, assert_http_error
 from nbformat.v4 import new_notebook
 from nbformat import write