From a2691564b4ba7c6a632edf9a9c49d828e9ad6eb5 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 25 Mar 2015 11:23:14 -0700 Subject: [PATCH 1/2] shim nbconvert --- IPython/nbconvert/exporters/python.py | 31 --------------------------- 1 file changed, 31 deletions(-) delete mode 100644 IPython/nbconvert/exporters/python.py diff --git a/IPython/nbconvert/exporters/python.py b/IPython/nbconvert/exporters/python.py deleted file mode 100644 index e1218daa7..000000000 --- a/IPython/nbconvert/exporters/python.py +++ /dev/null @@ -1,31 +0,0 @@ -"""Python script Exporter class""" - -#----------------------------------------------------------------------------- -# Copyright (c) 2013, the IPython Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -#----------------------------------------------------------------------------- - -#----------------------------------------------------------------------------- -# Imports -#----------------------------------------------------------------------------- - -from .templateexporter import TemplateExporter - -#----------------------------------------------------------------------------- -# Classes -#----------------------------------------------------------------------------- - -class PythonExporter(TemplateExporter): - """ - Exports a Python code file. - """ - def _file_extension_default(self): - return '.py' - - def _template_file_default(self): - return 'python' - - output_mimetype = 'text/x-python' From 8cc3ebe72492af12f7c35053c4efdbdf915c3385 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 25 Mar 2015 11:23:22 -0700 Subject: [PATCH 2/2] remove nbconvert from package data --- setupbase.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/setupbase.py b/setupbase.py index 481d557e1..4c0d8cc4e 100644 --- a/setupbase.py +++ b/setupbase.py @@ -175,10 +175,20 @@ def find_package_data(): os.chdir(os.path.join('tests',)) js_tests = glob('*.js') + glob('*/*.js') - - os.chdir(os.path.join(cwd, 'IPython', 'nbconvert')) - nbconvert_templates = [os.path.join(dirpath, '*.*') - for dirpath, _, _ in os.walk('templates')] + + # nbconvert package_data: + # os.chdir(os.path.join(cwd, 'IPython', 'nbconvert')) + # nbconvert_templates = [os.path.join(dirpath, '*.*') + # for dirpath, _, _ in os.walk('templates')] + # package_data = { + # 'IPython.nbconvert.filters' : ['marked.js'], + # 'IPython.nbconvert' : nbconvert_templates + + # [ + # 'tests/files/*.*', + # 'exporters/tests/files/*.*', + # 'preprocessors/tests/files/*.*', + # ], + # } os.chdir(cwd) @@ -189,13 +199,6 @@ def find_package_data(): 'IPython.testing.plugin' : ['*.txt'], 'IPython.html' : ['templates/*'] + static_data, 'IPython.html.tests' : js_tests, - 'IPython.nbconvert' : nbconvert_templates + - [ - 'tests/files/*.*', - 'exporters/tests/files/*.*', - 'preprocessors/tests/files/*.*', - ], - 'IPython.nbconvert.filters' : ['marked.js'], # 'IPython.nbformat' : [ # 'tests/*.ipynb', # 'v3/nbformat.v3.schema.json',