From 044c2de074fffe37c87d5da8d6bb9efc567a264a Mon Sep 17 00:00:00 2001 From: Fernando Perez Date: Sat, 23 Aug 2008 23:10:55 -0700 Subject: [PATCH 1/2] Checkpoint before merging with upstream --- setup.py | 2 -- setupbase.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 19e3187e8..7fe6280c3 100755 --- a/setup.py +++ b/setup.py @@ -152,8 +152,6 @@ if 'setuptools' in sys.modules: ) # Allow setuptools to handle the scripts scripts = [] - # eggs will lack docs, examples - data_files = [] else: # package_data of setuptools was introduced to distutils in 2.4 cfgfiles = filter(isfile, glob('IPython/UserConfig/*')) diff --git a/setupbase.py b/setupbase.py index d3db0cdd5..6d387dc4a 100644 --- a/setupbase.py +++ b/setupbase.py @@ -220,11 +220,12 @@ def find_scripts(): """ scripts = ['IPython/kernel/scripts/ipengine', 'IPython/kernel/scripts/ipcontroller', - 'IPython/kernel/scripts/ipcluster', + 'IPython/kernel/scripts/ipcluster', 'scripts/ipython', 'scripts/ipythonx', 'scripts/pycolor', 'scripts/irunner', + 'scripts/iptest', ] # Script to be run by the windows binary installer after the default setup From 15ae52f8e64be3184dcd5cef44919401f47623c3 Mon Sep 17 00:00:00 2001 From: Fernando Perez Date: Sat, 23 Aug 2008 23:29:56 -0700 Subject: [PATCH 2/2] Fix decorator bug and update build scripts to use setuptools for iptest. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7fe6280c3..fa3b052db 100755 --- a/setup.py +++ b/setup.py @@ -137,7 +137,8 @@ if 'setuptools' in sys.modules: 'ipcontroller = IPython.kernel.scripts.ipcontroller:main', 'ipengine = IPython.kernel.scripts.ipengine:main', 'ipcluster = IPython.kernel.scripts.ipcluster:main', - 'ipythonx = IPython.frontend.wx.ipythonx:main' + 'ipythonx = IPython.frontend.wx.ipythonx:main', + 'iptest = IPython.testing.iptest:main', ] } setup_args["extras_require"] = dict(