update references for IPython.html

This commit is contained in:
MinRK 2013-06-20 10:54:02 -04:00
parent cf726d6a40
commit a3653e34b1
4 changed files with 12 additions and 12 deletions

View File

@ -54,7 +54,7 @@ wide install.
First, cd into js directory :
```bash
cd IPython/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/html/notebook/static/js/
From IPython/html/static/js/
```bash
# run yuidoc for install dir
./node_modules/yuidocjs/lib/cli.js --server .

View File

@ -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.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.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
@ -120,7 +120,7 @@ def random_ports(port, n):
def load_handlers(name):
"""Load the (URL pattern, handler) tuples for each component."""
name = 'IPython.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.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.')

View File

@ -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('html', 'notebook', 'static'),
ipjoin('html', 'notebook', 'fabfile'),
ipjoin('html', 'static'),
ipjoin('html', 'fabfile'),
]
if not have['sqlite3']:
exclusions.append(ipjoin('core', 'tests', 'test_history'))
@ -296,14 +296,14 @@ def make_exclude():
exclusions.append(ipjoin('html'))
if not have['jinja2']:
exclusions.append(ipjoin('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('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':

View File

@ -134,7 +134,7 @@ def find_package_data():
# walk notebook resources:
cwd = os.getcwd()
os.chdir(os.path.join('IPython', 'html', 'notebook'))
os.chdir(os.path.join('IPython', 'html'))
static_walk = list(os.walk('static'))
os.chdir(cwd)
static_data = []
@ -148,7 +148,7 @@ def find_package_data():
'IPython.config.profile' : ['README*', '*/*.py'],
'IPython.testing' : ['*.txt'],
'IPython.testing.plugin' : ['*.txt'],
'IPython.html.notebook' : ['templates/*'] + static_data,
'IPython.html' : ['templates/*'] + static_data,
'IPython.qt.console' : ['resources/icon/*.svg'],
}
return package_data