From dee802b42fdd8b779a001322228a97d00a50acb2 Mon Sep 17 00:00:00 2001 From: gvaroquaux Date: Tue, 12 Aug 2008 11:20:30 -0500 Subject: [PATCH 1/3] Add entry point for ipythonx to setup.py, when used with setuptools. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fe79d380b..98c1156eb 100755 --- a/setup.py +++ b/setup.py @@ -132,7 +132,8 @@ if 'setuptools' in sys.modules: 'pycolor = IPython.PyColorize:main', 'ipcontroller = IPython.kernel.scripts.ipcontroller:main', 'ipengine = IPython.kernel.scripts.ipengine:main', - 'ipcluster = IPython.kernel.scripts.ipcluster:main' + 'ipcluster = IPython.kernel.scripts.ipcluster:main', + 'ipythonx = IPython.frontend.wx.ipythonx:main' ] } setup_args["extras_require"] = dict( From 89b977c2f7cd39353fe890ecc74d8a6d95a10126 Mon Sep 17 00:00:00 2001 From: gvaroquaux Date: Tue, 12 Aug 2008 18:12:36 -0500 Subject: [PATCH 2/3] Add the subpackage to the setupbase.py --- setupbase.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setupbase.py b/setupbase.py index 657596a79..b40382e95 100644 --- a/setupbase.py +++ b/setupbase.py @@ -107,6 +107,10 @@ def find_packages(): add_package(packages, 'external') add_package(packages, 'gui') add_package(packages, 'gui.wx') + add_package(packages, 'frontend') + add_package(packages, 'frontend._process') + add_package(packages, 'frontend.wx') + add_package(packages, 'frontend.cocoa') add_package(packages, 'kernel', config=True, tests=True, scripts=True) add_package(packages, 'kernel.core', config=True, tests=True) add_package(packages, 'testing', tests=True) @@ -229,4 +233,4 @@ def check_for_dependencies(): check_for_sphinx() check_for_pygments() check_for_nose() - check_for_pexpect() \ No newline at end of file + check_for_pexpect() From b3274107854905d93f2c1a4a980ee08d12fb4dbe Mon Sep 17 00:00:00 2001 From: gvaroquaux Date: Tue, 12 Aug 2008 18:59:57 -0500 Subject: [PATCH 3/3] Add ipythonx to scripts. --- setupbase.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setupbase.py b/setupbase.py index b40382e95..b5529ca52 100644 --- a/setupbase.py +++ b/setupbase.py @@ -107,10 +107,10 @@ def find_packages(): add_package(packages, 'external') add_package(packages, 'gui') add_package(packages, 'gui.wx') - add_package(packages, 'frontend') + add_package(packages, 'frontend', tests=True) add_package(packages, 'frontend._process') add_package(packages, 'frontend.wx') - add_package(packages, 'frontend.cocoa') + add_package(packages, 'frontend.cocoa', tests=True) add_package(packages, 'kernel', config=True, tests=True, scripts=True) add_package(packages, 'kernel.core', config=True, tests=True) add_package(packages, 'testing', tests=True) @@ -185,6 +185,7 @@ def find_scripts(): scripts.append('IPython/kernel/scripts/ipcontroller') scripts.append('IPython/kernel/scripts/ipcluster') scripts.append('scripts/ipython') + scripts.append('scripts/ipythonx') scripts.append('scripts/pycolor') scripts.append('scripts/irunner')