Show More
@@ -278,7 +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', ' |
|
281 | nbconvert = ['pygments', 'jinja2', 'Sphinx>=0.3'] | |
282 | ) |
|
282 | ) | |
283 | requires = setup_args.setdefault('install_requires', []) |
|
283 | requires = setup_args.setdefault('install_requires', []) | |
284 | setupext.display_status = False |
|
284 | setupext.display_status = False |
@@ -355,7 +355,7 b' def check_for_dependencies():' | |||||
355 | check_for_sphinx, check_for_pygments, |
|
355 | check_for_sphinx, check_for_pygments, | |
356 | check_for_nose, check_for_pexpect, |
|
356 | check_for_nose, check_for_pexpect, | |
357 | check_for_pyzmq, check_for_readline, |
|
357 | check_for_pyzmq, check_for_readline, | |
358 |
check_for_jinja2 |
|
358 | check_for_jinja2 | |
359 | ) |
|
359 | ) | |
360 | print_line() |
|
360 | print_line() | |
361 | print_raw("BUILDING IPYTHON") |
|
361 | print_raw("BUILDING IPYTHON") | |
@@ -374,7 +374,6 b' def check_for_dependencies():' | |||||
374 | check_for_pyzmq() |
|
374 | check_for_pyzmq() | |
375 | check_for_readline() |
|
375 | check_for_readline() | |
376 | check_for_jinja2() |
|
376 | check_for_jinja2() | |
377 | check_for_markdown() |
|
|||
378 |
|
377 | |||
379 | #--------------------------------------------------------------------------- |
|
378 | #--------------------------------------------------------------------------- | |
380 | # VCS related |
|
379 | # VCS related |
@@ -93,16 +93,6 b' def check_for_jinja2():' | |||||
93 | print_status('jinja2', jinja2.__version__) |
|
93 | print_status('jinja2', jinja2.__version__) | |
94 | return True |
|
94 | return True | |
95 |
|
95 | |||
96 | def check_for_markdown(): |
|
|||
97 | try: |
|
|||
98 | import markdown |
|
|||
99 | except ImportError: |
|
|||
100 | print_status('pygments', "Not found (required for nbconvert)") |
|
|||
101 | return False |
|
|||
102 | else: |
|
|||
103 | print_status('markdown', markdown.version) |
|
|||
104 | return True |
|
|||
105 |
|
||||
106 | def check_for_nose(): |
|
96 | def check_for_nose(): | |
107 | try: |
|
97 | try: | |
108 | import nose |
|
98 | import nose |
General Comments 0
You need to be logged in to leave comments.
Login now