diff --git a/.gitignore b/.gitignore index 583abf719..703b7bcc8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ _build docs/man/*.gz docs/source/api/generated docs/gh-pages -IPython/frontend/html/notebook/static/mathjax +IPython/html/notebook/static/mathjax *.py[co] __pycache__ build diff --git a/IPython/frontend/html/notebook/tree/__init__.py b/IPython/frontend/html/notebook/tree/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/IPython/frontend/html/notebook/README.md b/IPython/html/README.md similarity index 95% rename from IPython/frontend/html/notebook/README.md rename to IPython/html/README.md index e52816791..cbb20a17f 100644 --- a/IPython/frontend/html/notebook/README.md +++ b/IPython/html/README.md @@ -54,7 +54,7 @@ wide install. First, cd into js directory : ```bash -cd IPython/frontend/html/notebook/static/js/ +cd IPython/html/static/js/ # install yuidoc npm install yuidocjs ``` @@ -62,7 +62,7 @@ npm install yuidocjs ### Run YUIdoc server -From IPython/frontend/html/notebook/static/js/ +From IPython/html/static/js/ ```bash # run yuidoc for install dir ./node_modules/yuidocjs/lib/cli.js --server . @@ -70,4 +70,4 @@ From IPython/frontend/html/notebook/static/js/ Follow the instruction and the documentation should be available on localhost:3000 -Omitting `--server` will build a static version in the `out` folder by default. \ No newline at end of file +Omitting `--server` will build a static version in the `out` folder by default. diff --git a/IPython/html/__init__.py b/IPython/html/__init__.py new file mode 100644 index 000000000..3eff7907d --- /dev/null +++ b/IPython/html/__init__.py @@ -0,0 +1,7 @@ +"""The IPython HTML Notebook""" + +import os +# Packagers: modify this line if you store the notebook static files elsewhere +DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static") + +del os diff --git a/IPython/frontend/html/notebook/auth/login.py b/IPython/html/auth/login.py similarity index 100% rename from IPython/frontend/html/notebook/auth/login.py rename to IPython/html/auth/login.py diff --git a/IPython/frontend/html/notebook/auth/logout.py b/IPython/html/auth/logout.py similarity index 100% rename from IPython/frontend/html/notebook/auth/logout.py rename to IPython/html/auth/logout.py diff --git a/IPython/frontend/html/notebook/base/handlers.py b/IPython/html/base/handlers.py similarity index 100% rename from IPython/frontend/html/notebook/base/handlers.py rename to IPython/html/base/handlers.py diff --git a/IPython/frontend/html/notebook/base/zmqhandlers.py b/IPython/html/base/zmqhandlers.py similarity index 100% rename from IPython/frontend/html/notebook/base/zmqhandlers.py rename to IPython/html/base/zmqhandlers.py diff --git a/IPython/frontend/html/notebook/fabfile.py b/IPython/html/fabfile.py similarity index 100% rename from IPython/frontend/html/notebook/fabfile.py rename to IPython/html/fabfile.py diff --git a/IPython/frontend/html/notebook/notebook/handlers.py b/IPython/html/notebook/handlers.py similarity index 100% rename from IPython/frontend/html/notebook/notebook/handlers.py rename to IPython/html/notebook/handlers.py diff --git a/IPython/frontend/html/notebook/notebookapp.py b/IPython/html/notebookapp.py similarity index 98% rename from IPython/frontend/html/notebook/notebookapp.py rename to IPython/html/notebookapp.py index b833f6264..91bcffe67 100644 --- a/IPython/frontend/html/notebook/notebookapp.py +++ b/IPython/html/notebookapp.py @@ -34,7 +34,7 @@ import webbrowser # Third party # check for pyzmq 2.1.11 from IPython.utils.zmqrelated import check_for_zmq -check_for_zmq('2.1.11', 'IPython.frontend.html.notebook') +check_for_zmq('2.1.11', 'IPython.html') import zmq from jinja2 import Environment, FileSystemLoader @@ -61,7 +61,7 @@ from tornado import httpserver from tornado import web # Our own libraries -from IPython.frontend.html.notebook import DEFAULT_STATIC_FILES_PATH +from IPython.html import DEFAULT_STATIC_FILES_PATH from .services.kernels.kernelmanager import MappingKernelManager from .services.notebooks.nbmanager import NotebookManager @@ -72,7 +72,7 @@ from .base.handlers import AuthenticatedFileHandler, FileFindHandler from IPython.config.application import catch_config_error, boolean_flag from IPython.core.application import BaseIPythonApplication -from IPython.frontend.consoleapp import IPythonConsoleApp +from IPython.consoleapp import IPythonConsoleApp from IPython.kernel import swallow_argv from IPython.kernel.zmq.session import default_secure from IPython.kernel.zmq.kernelapp import ( @@ -120,7 +120,7 @@ def random_ports(port, n): def load_handlers(name): """Load the (URL pattern, handler) tuples for each component.""" - name = 'IPython.frontend.html.notebook.' + name + name = 'IPython.html.' + name mod = __import__(name, fromlist=['default_handlers']) return mod.default_handlers @@ -490,7 +490,7 @@ class NotebookApp(BaseIPythonApplication): else: self.log.info("Using MathJax: %s", new) - notebook_manager_class = DottedObjectName('IPython.frontend.html.notebook.services.notebooks.filenbmanager.FileNotebookManager', + notebook_manager_class = DottedObjectName('IPython.html.services.notebooks.filenbmanager.FileNotebookManager', config=True, help='The notebook manager class to use.') diff --git a/IPython/frontend/html/notebook/services/clusters/clustermanager.py b/IPython/html/services/clusters/clustermanager.py similarity index 100% rename from IPython/frontend/html/notebook/services/clusters/clustermanager.py rename to IPython/html/services/clusters/clustermanager.py diff --git a/IPython/frontend/html/notebook/services/clusters/handlers.py b/IPython/html/services/clusters/handlers.py similarity index 100% rename from IPython/frontend/html/notebook/services/clusters/handlers.py rename to IPython/html/services/clusters/handlers.py diff --git a/IPython/frontend/html/notebook/services/kernels/handlers.py b/IPython/html/services/kernels/handlers.py similarity index 100% rename from IPython/frontend/html/notebook/services/kernels/handlers.py rename to IPython/html/services/kernels/handlers.py diff --git a/IPython/frontend/html/notebook/services/kernels/kernelmanager.py b/IPython/html/services/kernels/kernelmanager.py similarity index 100% rename from IPython/frontend/html/notebook/services/kernels/kernelmanager.py rename to IPython/html/services/kernels/kernelmanager.py diff --git a/IPython/frontend/html/notebook/services/notebooks/filenbmanager.py b/IPython/html/services/notebooks/filenbmanager.py similarity index 100% rename from IPython/frontend/html/notebook/services/notebooks/filenbmanager.py rename to IPython/html/services/notebooks/filenbmanager.py diff --git a/IPython/frontend/html/notebook/services/notebooks/handlers.py b/IPython/html/services/notebooks/handlers.py similarity index 100% rename from IPython/frontend/html/notebook/services/notebooks/handlers.py rename to IPython/html/services/notebooks/handlers.py diff --git a/IPython/frontend/html/notebook/services/notebooks/nbmanager.py b/IPython/html/services/notebooks/nbmanager.py similarity index 100% rename from IPython/frontend/html/notebook/services/notebooks/nbmanager.py rename to IPython/html/services/notebooks/nbmanager.py diff --git a/IPython/frontend/html/notebook/services/notebooks/tests/test_nbmanager.py b/IPython/html/services/notebooks/tests/test_nbmanager.py similarity index 100% rename from IPython/frontend/html/notebook/services/notebooks/tests/test_nbmanager.py rename to IPython/html/services/notebooks/tests/test_nbmanager.py diff --git a/IPython/frontend/html/notebook/static/auth/css/override.css b/IPython/html/static/auth/css/override.css similarity index 100% rename from IPython/frontend/html/notebook/static/auth/css/override.css rename to IPython/html/static/auth/css/override.css diff --git a/IPython/frontend/html/notebook/static/auth/js/loginmain.js b/IPython/html/static/auth/js/loginmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/auth/js/loginmain.js rename to IPython/html/static/auth/js/loginmain.js diff --git a/IPython/frontend/html/notebook/static/auth/js/loginwidget.js b/IPython/html/static/auth/js/loginwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/auth/js/loginwidget.js rename to IPython/html/static/auth/js/loginwidget.js diff --git a/IPython/frontend/html/notebook/static/auth/js/logoutmain.js b/IPython/html/static/auth/js/logoutmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/auth/js/logoutmain.js rename to IPython/html/static/auth/js/logoutmain.js diff --git a/IPython/frontend/html/notebook/static/auth/less/login.less b/IPython/html/static/auth/less/login.less similarity index 100% rename from IPython/frontend/html/notebook/static/auth/less/login.less rename to IPython/html/static/auth/less/login.less diff --git a/IPython/frontend/html/notebook/static/auth/less/logout.less b/IPython/html/static/auth/less/logout.less similarity index 100% rename from IPython/frontend/html/notebook/static/auth/less/logout.less rename to IPython/html/static/auth/less/logout.less diff --git a/IPython/frontend/html/notebook/static/auth/less/style.less b/IPython/html/static/auth/less/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/auth/less/style.less rename to IPython/html/static/auth/less/style.less diff --git a/IPython/frontend/html/notebook/static/base/images/favicon.ico b/IPython/html/static/base/images/favicon.ico similarity index 100% rename from IPython/frontend/html/notebook/static/base/images/favicon.ico rename to IPython/html/static/base/images/favicon.ico diff --git a/IPython/frontend/html/notebook/static/base/js/dialog.js b/IPython/html/static/base/js/dialog.js similarity index 100% rename from IPython/frontend/html/notebook/static/base/js/dialog.js rename to IPython/html/static/base/js/dialog.js diff --git a/IPython/frontend/html/notebook/static/base/js/events.js b/IPython/html/static/base/js/events.js similarity index 100% rename from IPython/frontend/html/notebook/static/base/js/events.js rename to IPython/html/static/base/js/events.js diff --git a/IPython/frontend/html/notebook/static/base/js/namespace.js b/IPython/html/static/base/js/namespace.js similarity index 100% rename from IPython/frontend/html/notebook/static/base/js/namespace.js rename to IPython/html/static/base/js/namespace.js diff --git a/IPython/frontend/html/notebook/static/base/js/page.js b/IPython/html/static/base/js/page.js similarity index 100% rename from IPython/frontend/html/notebook/static/base/js/page.js rename to IPython/html/static/base/js/page.js diff --git a/IPython/frontend/html/notebook/static/base/js/pagemain.js b/IPython/html/static/base/js/pagemain.js similarity index 100% rename from IPython/frontend/html/notebook/static/base/js/pagemain.js rename to IPython/html/static/base/js/pagemain.js diff --git a/IPython/frontend/html/notebook/static/base/js/utils.js b/IPython/html/static/base/js/utils.js similarity index 100% rename from IPython/frontend/html/notebook/static/base/js/utils.js rename to IPython/html/static/base/js/utils.js diff --git a/IPython/frontend/html/notebook/static/base/less/flexbox.less b/IPython/html/static/base/less/flexbox.less similarity index 100% rename from IPython/frontend/html/notebook/static/base/less/flexbox.less rename to IPython/html/static/base/less/flexbox.less diff --git a/IPython/frontend/html/notebook/static/base/less/mixins.less b/IPython/html/static/base/less/mixins.less similarity index 100% rename from IPython/frontend/html/notebook/static/base/less/mixins.less rename to IPython/html/static/base/less/mixins.less diff --git a/IPython/frontend/html/notebook/static/base/less/page.less b/IPython/html/static/base/less/page.less similarity index 100% rename from IPython/frontend/html/notebook/static/base/less/page.less rename to IPython/html/static/base/less/page.less diff --git a/IPython/frontend/html/notebook/static/base/less/style.less b/IPython/html/static/base/less/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/base/less/style.less rename to IPython/html/static/base/less/style.less diff --git a/IPython/frontend/html/notebook/static/base/less/variables.less b/IPython/html/static/base/less/variables.less similarity index 100% rename from IPython/frontend/html/notebook/static/base/less/variables.less rename to IPython/html/static/base/less/variables.less diff --git a/IPython/frontend/html/notebook/static/custom/custom.css b/IPython/html/static/custom/custom.css similarity index 100% rename from IPython/frontend/html/notebook/static/custom/custom.css rename to IPython/html/static/custom/custom.css diff --git a/IPython/frontend/html/notebook/static/custom/custom.js b/IPython/html/static/custom/custom.js similarity index 100% rename from IPython/frontend/html/notebook/static/custom/custom.js rename to IPython/html/static/custom/custom.js diff --git a/IPython/frontend/html/notebook/static/notebook/css/override.css b/IPython/html/static/notebook/css/override.css similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/css/override.css rename to IPython/html/static/notebook/css/override.css diff --git a/IPython/frontend/html/notebook/static/notebook/js/cell.js b/IPython/html/static/notebook/js/cell.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/cell.js rename to IPython/html/static/notebook/js/cell.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/celltoolbar.js b/IPython/html/static/notebook/js/celltoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/celltoolbar.js rename to IPython/html/static/notebook/js/celltoolbar.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/default.js b/IPython/html/static/notebook/js/celltoolbarpresets/default.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/default.js rename to IPython/html/static/notebook/js/celltoolbarpresets/default.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/example.js b/IPython/html/static/notebook/js/celltoolbarpresets/example.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/example.js rename to IPython/html/static/notebook/js/celltoolbarpresets/example.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js b/IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js rename to IPython/html/static/notebook/js/celltoolbarpresets/slideshow.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/codecell.js b/IPython/html/static/notebook/js/codecell.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/codecell.js rename to IPython/html/static/notebook/js/codecell.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/codemirror-ipython.js b/IPython/html/static/notebook/js/codemirror-ipython.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/codemirror-ipython.js rename to IPython/html/static/notebook/js/codemirror-ipython.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/completer.js b/IPython/html/static/notebook/js/completer.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/completer.js rename to IPython/html/static/notebook/js/completer.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/contexthint.js b/IPython/html/static/notebook/js/contexthint.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/contexthint.js rename to IPython/html/static/notebook/js/contexthint.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/main.js rename to IPython/html/static/notebook/js/main.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/maintoolbar.js rename to IPython/html/static/notebook/js/maintoolbar.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/mathjaxutils.js b/IPython/html/static/notebook/js/mathjaxutils.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/mathjaxutils.js rename to IPython/html/static/notebook/js/mathjaxutils.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/menubar.js b/IPython/html/static/notebook/js/menubar.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/menubar.js rename to IPython/html/static/notebook/js/menubar.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/notebook.js rename to IPython/html/static/notebook/js/notebook.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/notificationarea.js rename to IPython/html/static/notebook/js/notificationarea.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js b/IPython/html/static/notebook/js/notificationwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js rename to IPython/html/static/notebook/js/notificationwidget.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/outputarea.js b/IPython/html/static/notebook/js/outputarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/outputarea.js rename to IPython/html/static/notebook/js/outputarea.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/pager.js b/IPython/html/static/notebook/js/pager.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/pager.js rename to IPython/html/static/notebook/js/pager.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/quickhelp.js b/IPython/html/static/notebook/js/quickhelp.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/quickhelp.js rename to IPython/html/static/notebook/js/quickhelp.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/savewidget.js b/IPython/html/static/notebook/js/savewidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/savewidget.js rename to IPython/html/static/notebook/js/savewidget.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/textcell.js b/IPython/html/static/notebook/js/textcell.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/textcell.js rename to IPython/html/static/notebook/js/textcell.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/toolbar.js b/IPython/html/static/notebook/js/toolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/toolbar.js rename to IPython/html/static/notebook/js/toolbar.js diff --git a/IPython/frontend/html/notebook/static/notebook/js/tooltip.js b/IPython/html/static/notebook/js/tooltip.js similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/js/tooltip.js rename to IPython/html/static/notebook/js/tooltip.js diff --git a/IPython/frontend/html/notebook/static/notebook/less/ansicolors.less b/IPython/html/static/notebook/less/ansicolors.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/ansicolors.less rename to IPython/html/static/notebook/less/ansicolors.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/cell.less b/IPython/html/static/notebook/less/cell.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/cell.less rename to IPython/html/static/notebook/less/cell.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/celltoolbar.less b/IPython/html/static/notebook/less/celltoolbar.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/celltoolbar.less rename to IPython/html/static/notebook/less/celltoolbar.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/codecell.less b/IPython/html/static/notebook/less/codecell.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/codecell.less rename to IPython/html/static/notebook/less/codecell.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/codemirror.less b/IPython/html/static/notebook/less/codemirror.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/codemirror.less rename to IPython/html/static/notebook/less/codemirror.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/completer.less b/IPython/html/static/notebook/less/completer.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/completer.less rename to IPython/html/static/notebook/less/completer.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/highlight.less b/IPython/html/static/notebook/less/highlight.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/highlight.less rename to IPython/html/static/notebook/less/highlight.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/menubar.less rename to IPython/html/static/notebook/less/menubar.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/notebook.less rename to IPython/html/static/notebook/less/notebook.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less b/IPython/html/static/notebook/less/notificationarea.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/notificationarea.less rename to IPython/html/static/notebook/less/notificationarea.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less b/IPython/html/static/notebook/less/notificationwidget.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less rename to IPython/html/static/notebook/less/notificationwidget.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/outputarea.less b/IPython/html/static/notebook/less/outputarea.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/outputarea.less rename to IPython/html/static/notebook/less/outputarea.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/pager.less b/IPython/html/static/notebook/less/pager.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/pager.less rename to IPython/html/static/notebook/less/pager.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/quickhelp.less b/IPython/html/static/notebook/less/quickhelp.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/quickhelp.less rename to IPython/html/static/notebook/less/quickhelp.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less b/IPython/html/static/notebook/less/renderedhtml.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less rename to IPython/html/static/notebook/less/renderedhtml.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/savewidget.less b/IPython/html/static/notebook/less/savewidget.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/savewidget.less rename to IPython/html/static/notebook/less/savewidget.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/style.less b/IPython/html/static/notebook/less/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/style.less rename to IPython/html/static/notebook/less/style.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/textcell.less b/IPython/html/static/notebook/less/textcell.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/textcell.less rename to IPython/html/static/notebook/less/textcell.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/toolbar.less b/IPython/html/static/notebook/less/toolbar.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/toolbar.less rename to IPython/html/static/notebook/less/toolbar.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/tooltip.less b/IPython/html/static/notebook/less/tooltip.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/tooltip.less rename to IPython/html/static/notebook/less/tooltip.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/variables.less b/IPython/html/static/notebook/less/variables.less similarity index 100% rename from IPython/frontend/html/notebook/static/notebook/less/variables.less rename to IPython/html/static/notebook/less/variables.less diff --git a/IPython/frontend/html/notebook/static/services/kernels/js/kernel.js b/IPython/html/static/services/kernels/js/kernel.js similarity index 100% rename from IPython/frontend/html/notebook/static/services/kernels/js/kernel.js rename to IPython/html/static/services/kernels/js/kernel.js diff --git a/IPython/frontend/html/notebook/static/style/style.less b/IPython/html/static/style/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/style/style.less rename to IPython/html/static/style/style.less diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/html/static/style/style.min.css similarity index 100% rename from IPython/frontend/html/notebook/static/style/style.min.css rename to IPython/html/static/style/style.min.css diff --git a/IPython/frontend/html/notebook/static/tree/css/override.css b/IPython/html/static/tree/css/override.css similarity index 100% rename from IPython/frontend/html/notebook/static/tree/css/override.css rename to IPython/html/static/tree/css/override.css diff --git a/IPython/frontend/html/notebook/static/tree/js/clusterlist.js b/IPython/html/static/tree/js/clusterlist.js similarity index 100% rename from IPython/frontend/html/notebook/static/tree/js/clusterlist.js rename to IPython/html/static/tree/js/clusterlist.js diff --git a/IPython/frontend/html/notebook/static/tree/js/main.js b/IPython/html/static/tree/js/main.js similarity index 100% rename from IPython/frontend/html/notebook/static/tree/js/main.js rename to IPython/html/static/tree/js/main.js diff --git a/IPython/frontend/html/notebook/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js similarity index 100% rename from IPython/frontend/html/notebook/static/tree/js/notebooklist.js rename to IPython/html/static/tree/js/notebooklist.js diff --git a/IPython/frontend/html/notebook/static/tree/less/altuploadform.less b/IPython/html/static/tree/less/altuploadform.less similarity index 100% rename from IPython/frontend/html/notebook/static/tree/less/altuploadform.less rename to IPython/html/static/tree/less/altuploadform.less diff --git a/IPython/frontend/html/notebook/static/tree/less/style.less b/IPython/html/static/tree/less/style.less similarity index 100% rename from IPython/frontend/html/notebook/static/tree/less/style.less rename to IPython/html/static/tree/less/style.less diff --git a/IPython/frontend/html/notebook/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less similarity index 100% rename from IPython/frontend/html/notebook/static/tree/less/tree.less rename to IPython/html/static/tree/less/tree.less diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/html/templates/login.html similarity index 100% rename from IPython/frontend/html/notebook/templates/login.html rename to IPython/html/templates/login.html diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/html/templates/logout.html similarity index 100% rename from IPython/frontend/html/notebook/templates/logout.html rename to IPython/html/templates/logout.html diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/html/templates/notebook.html similarity index 100% rename from IPython/frontend/html/notebook/templates/notebook.html rename to IPython/html/templates/notebook.html diff --git a/IPython/frontend/html/notebook/templates/page.html b/IPython/html/templates/page.html similarity index 100% rename from IPython/frontend/html/notebook/templates/page.html rename to IPython/html/templates/page.html diff --git a/IPython/frontend/html/notebook/templates/tree.html b/IPython/html/templates/tree.html similarity index 100% rename from IPython/frontend/html/notebook/templates/tree.html rename to IPython/html/templates/tree.html diff --git a/IPython/frontend/html/notebook/tests/test_hist.sqlite b/IPython/html/tests/test_hist.sqlite similarity index 100% rename from IPython/frontend/html/notebook/tests/test_hist.sqlite rename to IPython/html/tests/test_hist.sqlite diff --git a/IPython/frontend/html/notebook/tree/handlers.py b/IPython/html/tree/handlers.py similarity index 100% rename from IPython/frontend/html/notebook/tree/handlers.py rename to IPython/html/tree/handlers.py diff --git a/IPython/frontend/html/notebook/utils.py b/IPython/html/utils.py similarity index 100% rename from IPython/frontend/html/notebook/utils.py rename to IPython/html/utils.py diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 3d020337a..2c93f5fdd 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -230,8 +230,8 @@ def make_exclude(): # files for web serving. Occasionally projects may put a .py # file in there (MathJax ships a conf.py), so we might as # well play it safe and skip the whole thing. - ipjoin('frontend', 'html', 'notebook', 'static'), - ipjoin('frontend', 'html', 'notebook', 'fabfile'), + ipjoin('html', 'static'), + ipjoin('html', 'fabfile'), ] if not have['sqlite3']: exclusions.append(ipjoin('core', 'tests', 'test_history')) @@ -261,18 +261,18 @@ def make_exclude(): if not have['pexpect']: exclusions.extend([ipjoin('lib', 'irunner'), ipjoin('lib', 'tests', 'test_irunner'), - ipjoin('frontend', 'terminal', 'console'), + ipjoin('terminal', 'console'), ]) if not have['zmq']: exclusions.append(ipjoin('kernel')) - exclusions.append(ipjoin('frontend', 'qt')) - exclusions.append(ipjoin('frontend', 'html')) - exclusions.append(ipjoin('frontend', 'consoleapp.py')) - exclusions.append(ipjoin('frontend', 'terminal', 'console')) + exclusions.append(ipjoin('qt')) + exclusions.append(ipjoin('html')) + exclusions.append(ipjoin('consoleapp.py')) + exclusions.append(ipjoin('terminal', 'console')) exclusions.append(ipjoin('parallel')) elif not have['qt'] or not have['pygments']: - exclusions.append(ipjoin('frontend', 'qt')) + exclusions.append(ipjoin('qt')) if not have['pymongo']: exclusions.append(ipjoin('parallel', 'controller', 'mongodb')) @@ -293,17 +293,17 @@ def make_exclude(): exclusions.extend([ipjoin('extensions', 'tests', 'test_octavemagic')]) if not have['tornado']: - exclusions.append(ipjoin('frontend', 'html')) + exclusions.append(ipjoin('html')) if not have['jinja2']: - exclusions.append(ipjoin('frontend', 'html', 'notebook', 'notebookapp')) + exclusions.append(ipjoin('html', 'notebookapp')) if not have['rpy2'] or not have['numpy']: exclusions.append(ipjoin('extensions', 'rmagic')) exclusions.append(ipjoin('extensions', 'tests', 'test_rmagic')) if not have['azure']: - exclusions.append(ipjoin('frontend', 'html', 'notebook', 'services', 'notebooks', 'azurenbmanager')) + exclusions.append(ipjoin('html', 'services', 'notebooks', 'azurenbmanager')) # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. if sys.platform == 'win32': @@ -429,14 +429,21 @@ class IPTester(object): # The process did not die... print('... failed. Manual cleanup may be required.') + def make_runners(inc_slow=False): """Define the top-level packages that need to be tested. """ # Packages to be tested via nose, that only depend on the stdlib - nose_pkg_names = ['config', 'core', 'extensions', 'frontend', 'lib', + nose_pkg_names = ['config', 'core', 'extensions', 'lib', 'terminal', 'testing', 'utils', 'nbformat' ] + if have['qt']: + nose_pkg_names.append('qt') + + if have['tornado']: + nose_pkg_names.append('html') + if have['zmq']: nose_pkg_names.append('kernel') nose_pkg_names.append('kernel.inprocess') diff --git a/setupbase.py b/setupbase.py index 218d5cb1b..315848ea5 100644 --- a/setupbase.py +++ b/setupbase.py @@ -134,7 +134,7 @@ def find_package_data(): # walk notebook resources: cwd = os.getcwd() - os.chdir(os.path.join('IPython', 'frontend', 'html', 'notebook')) + os.chdir(os.path.join('IPython', 'html')) static_walk = list(os.walk('static')) os.chdir(cwd) static_data = [] @@ -148,8 +148,8 @@ def find_package_data(): 'IPython.config.profile' : ['README*', '*/*.py'], 'IPython.testing' : ['*.txt'], 'IPython.testing.plugin' : ['*.txt'], - 'IPython.frontend.html.notebook' : ['templates/*'] + static_data, - 'IPython.frontend.qt.console' : ['resources/icon/*.svg'], + 'IPython.html' : ['templates/*'] + static_data, + 'IPython.qt.console' : ['resources/icon/*.svg'], } return package_data @@ -312,7 +312,7 @@ def find_scripts(entry_points=False, suffix=''): """ if entry_points: console_scripts = [s % suffix for s in [ - 'ipython%s = IPython.frontend.terminal.ipapp:launch_new_instance', + 'ipython%s = IPython.terminal.ipapp:launch_new_instance', 'pycolor%s = IPython.utils.PyColorize:main', 'ipcontroller%s = IPython.parallel.apps.ipcontrollerapp:launch_new_instance', 'ipengine%s = IPython.parallel.apps.ipengineapp:launch_new_instance',