##// END OF EJS Templates
Fixing install logic for nbconvert.
Brian E. Granger -
Show More
@@ -23,15 +23,13 b' import io'
23 import os
23 import os
24
24
25 #From IPython
25 #From IPython
26 #All the stuff needed for the configurable things
27 from IPython.config.application import Application
26 from IPython.config.application import Application
28 from IPython.utils.traitlets import (Bool)
27 from IPython.utils.traitlets import Bool
29
28
30 #Local imports
29 from .exporters.export import export_by_name
31 from nbconvert.exporters.export import export_by_name
30 from .exporters.exporter import Exporter
32 from nbconvert.exporters.exporter import Exporter
31 from .transformers import extractfigure
33 from nbconvert.transformers import extractfigure
32 from .utils.config import GlobalConfigurable
34 from nbconvert.utils.config import GlobalConfigurable
35
33
36 #-----------------------------------------------------------------------------
34 #-----------------------------------------------------------------------------
37 #Globals and constants
35 #Globals and constants
@@ -278,6 +278,7 b" if 'setuptools' in sys.modules:"
278 doc = 'Sphinx>=0.3',
278 doc = 'Sphinx>=0.3',
279 test = 'nose>=0.10.1',
279 test = 'nose>=0.10.1',
280 notebook = ['tornado>=2.0', 'pyzmq>=2.1.11', 'jinja2'],
280 notebook = ['tornado>=2.0', 'pyzmq>=2.1.11', 'jinja2'],
281 nbconvert = ['pygments', 'markdown', 'jinja2', 'Sphinx>=0.3']
281 )
282 )
282 requires = setup_args.setdefault('install_requires', [])
283 requires = setup_args.setdefault('install_requires', [])
283 setupext.display_status = False
284 setupext.display_status = False
@@ -151,6 +151,8 b' def find_package_data():'
151 'IPython.testing.plugin' : ['*.txt'],
151 'IPython.testing.plugin' : ['*.txt'],
152 'IPython.html' : ['templates/*'] + static_data,
152 'IPython.html' : ['templates/*'] + static_data,
153 'IPython.qt.console' : ['resources/icon/*.svg'],
153 'IPython.qt.console' : ['resources/icon/*.svg'],
154 'IPython.nbconvert.templates' : ['*.tpl', 'latex/*.tpl',
155 'latex/skeleton/*.tplx', 'skeleton/*']
154 }
156 }
155 return package_data
157 return package_data
156
158
@@ -320,7 +322,7 b" def find_scripts(entry_points=False, suffix=''):"
320 'iplogger%s = IPython.parallel.apps.iploggerapp:launch_new_instance',
322 'iplogger%s = IPython.parallel.apps.iploggerapp:launch_new_instance',
321 'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
323 'ipcluster%s = IPython.parallel.apps.ipclusterapp:launch_new_instance',
322 'iptest%s = IPython.testing.iptest:main',
324 'iptest%s = IPython.testing.iptest:main',
323 'irunner%s = IPython.lib.irunner:main'
325 'irunner%s = IPython.lib.irunner:main',
324 ]]
326 ]]
325 gui_scripts = []
327 gui_scripts = []
326 scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
328 scripts = dict(console_scripts=console_scripts, gui_scripts=gui_scripts)
@@ -370,6 +372,8 b' def check_for_dependencies():'
370 check_for_pexpect()
372 check_for_pexpect()
371 check_for_pyzmq()
373 check_for_pyzmq()
372 check_for_readline()
374 check_for_readline()
375 check_for_jinja2()
376 check_for_markdown()
373
377
374 #---------------------------------------------------------------------------
378 #---------------------------------------------------------------------------
375 # VCS related
379 # VCS related
@@ -67,7 +67,7 b' def check_for_sphinx():'
67 try:
67 try:
68 import sphinx
68 import sphinx
69 except ImportError:
69 except ImportError:
70 print_status('sphinx', "Not found (required for building documentation)")
70 print_status('sphinx', "Not found (required for docs and nbconvert)")
71 return False
71 return False
72 else:
72 else:
73 print_status('sphinx', sphinx.__version__)
73 print_status('sphinx', sphinx.__version__)
@@ -77,60 +77,50 b' def check_for_pygments():'
77 try:
77 try:
78 import pygments
78 import pygments
79 except ImportError:
79 except ImportError:
80 print_status('pygments', "Not found (required for syntax highlighting documentation)")
80 print_status('pygments', "Not found (required for docs and nbconvert)")
81 return False
81 return False
82 else:
82 else:
83 print_status('pygments', pygments.__version__)
83 print_status('pygments', pygments.__version__)
84 return True
84 return True
85
85
86 def check_for_nose():
86 def check_for_jinja2():
87 try:
88 import nose
89 except ImportError:
90 print_status('nose', "Not found (required for running the test suite)")
91 return False
92 else:
93 print_status('nose', nose.__version__)
94 return True
95
96 def check_for_pexpect():
97 try:
87 try:
98 import pexpect
88 import jinja2
99 except ImportError:
89 except ImportError:
100 print_status("pexpect", "no (required for running standalone doctests)")
90 print_status('jinja2', "Not found (required for notebook and nbconvert)")
101 return False
91 return False
102 else:
92 else:
103 print_status("pexpect", pexpect.__version__)
93 print_status('jinja2', jinja2.__version__)
104 return True
94 return True
105
95
106 def check_for_httplib2():
96 def check_for_markdown():
107 try:
97 try:
108 import httplib2
98 import markdown
109 except ImportError:
99 except ImportError:
110 print_status("httplib2", "no (required for blocking http clients)")
100 print_status('pygments', "Not found (required for nbconvert)")
111 return False
101 return False
112 else:
102 else:
113 print_status("httplib2","yes")
103 print_status('markdown', markdown.version)
114 return True
104 return True
115
105
116 def check_for_sqlalchemy():
106 def check_for_nose():
117 try:
107 try:
118 import sqlalchemy
108 import nose
119 except ImportError:
109 except ImportError:
120 print_status("sqlalchemy", "no (required for the ipython1 notebook)")
110 print_status('nose', "Not found (required for running the test suite)")
121 return False
111 return False
122 else:
112 else:
123 print_status("sqlalchemy","yes")
113 print_status('nose', nose.__version__)
124 return True
114 return True
125
115
126 def check_for_simplejson():
116 def check_for_pexpect():
127 try:
117 try:
128 import simplejson
118 import pexpect
129 except ImportError:
119 except ImportError:
130 print_status("simplejson", "no (required for the ipython1 notebook)")
120 print_status("pexpect", "no (required for running standalone doctests)")
131 return False
121 return False
132 else:
122 else:
133 print_status("simplejson","yes")
123 print_status("pexpect", pexpect.__version__)
134 return True
124 return True
135
125
136 def check_for_pyzmq():
126 def check_for_pyzmq():
General Comments 0
You need to be logged in to leave comments. Login now