From b9288b668bed867b65d2fde96d0e15dbab349346 2009-07-27 22:46:28 From: Brian Granger Date: 2009-07-27 22:46:28 Subject: [PATCH] Merging upstream from module-reorg. --- diff --git a/IPython/extensions/ibrowse.py b/IPython/extensions/ibrowse.py index fcbef75..809b4c9 100644 --- a/IPython/extensions/ibrowse.py +++ b/IPython/extensions/ibrowse.py @@ -2,7 +2,7 @@ import curses, fcntl, signal, struct, tty, textwrap, inspect -from IPython.coreZ import ipapi +from IPython.core import ipapi import astyle, ipipe diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index d793ca2..44b732e 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -56,55 +56,60 @@ have_foolscap = test_for('foolscap') have_objc = test_for('objc') have_pexpect = test_for('pexpect') -# For the IPythonDoctest plugin, we need to exclude certain patterns that cause -# testing problems. We should strive to minimize the number of skipped -# modules, since this means untested code. As the testing machinery -# solidifies, this list should eventually become empty. -EXCLUDE = [pjoin('IPython', 'external'), - pjoin('IPython', 'frontend', 'process', 'winprocess.py'), - pjoin('IPython_doctest_plugin'), - pjoin('IPython', 'Gnuplot'), - pjoin('IPython', 'extensions', 'ipy_'), - pjoin('IPython', 'extensions', 'clearcmd'), - pjoin('IPython', 'extensions', 'PhysicalQInteractive'), - pjoin('IPython', 'extensions', 'scitedirector'), - pjoin('IPython', 'extensions', 'numeric_formats'), - pjoin('IPython', 'testing', 'attic'), - pjoin('IPython', 'testing', 'tutils'), - pjoin('IPython', 'testing', 'tools'), - pjoin('IPython', 'testing', 'mkdoctests') - ] - -if not have_wx: - EXCLUDE.append(pjoin('IPython', 'extensions', 'igrid')) - EXCLUDE.append(pjoin('IPython', 'gui')) - EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) - -if not have_objc: - EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) - -if not have_curses: - EXCLUDE.append(pjoin('IPython', 'extensions', 'ibrowse')) - -if not sys.platform == 'win32': - EXCLUDE.append(pjoin('IPython', 'platutils_win32')) - -# These have to be skipped on win32 because the use echo, rm, cd, etc. -# See ticket https://bugs.launchpad.net/bugs/366982 -if sys.platform == 'win32': - EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) - EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) - -if not os.name == 'posix': - EXCLUDE.append(pjoin('IPython', 'platutils_posix')) - -if not have_pexpect: - EXCLUDE.append(pjoin('IPython', 'lib', 'irunner')) - -# This is needed for the reg-exp to match on win32 in the ipdoctest plugin. -if sys.platform == 'win32': - EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] +def make_exclude(): + + # For the IPythonDoctest plugin, we need to exclude certain patterns that cause + # testing problems. We should strive to minimize the number of skipped + # modules, since this means untested code. As the testing machinery + # solidifies, this list should eventually become empty. + EXCLUDE = [pjoin('IPython', 'external'), + pjoin('IPython', 'frontend', 'process', 'winprocess.py'), + pjoin('IPython_doctest_plugin'), + pjoin('IPython', 'extensions', 'ipy_'), + pjoin('IPython', 'extensions', 'clearcmd'), + pjoin('IPython', 'extensions', 'PhysicalQInteractive'), + pjoin('IPython', 'extensions', 'scitedirector'), + pjoin('IPython', 'extensions', 'numeric_formats'), + pjoin('IPython', 'testing', 'attic'), + pjoin('IPython', 'testing', 'tools'), + pjoin('IPython', 'testing', 'mkdoctests') + ] + + if not have_wx: + EXCLUDE.append(pjoin('IPython', 'extensions', 'igrid')) + EXCLUDE.append(pjoin('IPython', 'gui')) + EXCLUDE.append(pjoin('IPython', 'frontend', 'wx')) + + if not have_objc: + EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa')) + + if not have_curses: + EXCLUDE.append(pjoin('IPython', 'extensions', 'ibrowse')) + + if not sys.platform == 'win32': + EXCLUDE.append(pjoin('IPython', 'utils', 'platutils_win32')) + + # These have to be skipped on win32 because the use echo, rm, cd, etc. + # See ticket https://bugs.launchpad.net/bugs/366982 + if sys.platform == 'win32': + EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'test_exampleip')) + EXCLUDE.append(pjoin('IPython', 'testing', 'plugin', 'dtexample')) + + if not os.name == 'posix': + EXCLUDE.append(pjoin('IPython', 'utils', 'platutils_posix')) + + if not have_pexpect: + EXCLUDE.append(pjoin('IPython', 'scripts', 'irunner')) + + # Skip shell always because of a bug in FakeModule. + EXCLUDE.append(pjoin('IPython', 'core', 'shell')) + + # This is needed for the reg-exp to match on win32 in the ipdoctest plugin. + if sys.platform == 'win32': + EXCLUDE = [s.replace('\\','\\\\') for s in EXCLUDE] + + return EXCLUDE #----------------------------------------------------------------------------- # Functions and classes @@ -155,13 +160,12 @@ def run_iptest(): # Construct list of plugins, omitting the existing doctest plugin, which # ours replaces (and extends). + EXCLUDE = make_exclude() plugins = [IPythonDoctest(EXCLUDE)] for p in nose.plugins.builtin.plugins: plug = p() if plug.name == 'doctest': continue - - #print '*** adding plugin:',plug.name # dbg plugins.append(plug) TestProgram(argv=argv,plugins=plugins) @@ -191,55 +195,28 @@ class IPTester(object): def make_runners(): - """Define the modules and packages that need to be tested. + """Define the top-level packages that need to be tested. """ - - # This omits additional top-level modules that should not be doctested. - # XXX: shell.py is also ommited because of a bug in the skip_doctest - # decorator. See ticket https://bugs.launchpad.net/bugs/366209 - top_mod = \ - ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py', - 'crashhandler.py', 'debugger.py', 'deepreload.py', 'demo.py', - 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'fakemodule.py', - 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py', - 'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py', - 'logger.py', 'macro.py', 'magic.py', 'oinspect.py', - 'outputtrap.py', 'platutils.py', 'prefilter.py', 'prompts.py', - 'PyColorize.py', 'release.py', 'rlineimpl.py', 'shadowns.py', - 'shellglobals.py', 'strdispatch.py', 'twshell.py', - 'ultratb.py', 'upgradedir.py', 'usage.py', 'wildcard.py', - # See note above for why this is skipped - # 'shell.py', - 'winconsole.py'] - - if have_pexpect: - top_mod.append('irunner.py') - - if sys.platform == 'win32': - top_mod.append('platutils_win32.py') - elif os.name == 'posix': - top_mod.append('platutils_posix.py') - else: - top_mod.append('platutils_dummy.py') - # These are tested by nose, so skip IPython.kernel - top_pack = ['config','extensions','frontend', - 'testing','tests','tools','userconfig'] + nose_packages = ['config', 'core', 'extensions', + 'frontend', 'lib', 'quarantine', + 'scripts', 'testing', 'utils'] + trial_packages = ['kernel'] if have_wx: - top_pack.append('gui') + nose_packages.append('gui') - modules = ['IPython.%s' % m[:-3] for m in top_mod ] - packages = ['IPython.%s' % m for m in top_pack ] + nose_packages = ['IPython.%s' % m for m in nose_packages ] + trial_packages = ['IPython.%s' % m for m in trial_packages ] # Make runners - runners = dict(zip(top_pack, [IPTester(params=v) for v in packages])) + runners = dict() - # Test IPython.kernel using trial if twisted is installed + nose_runners = dict(zip(nose_packages, [IPTester(params=v) for v in nose_packages])) if have_zi and have_twisted and have_foolscap: - runners['trial'] = IPTester('trial',['IPython']) - - runners['modules'] = IPTester(params=modules) + trial_runners = dict(zip(trial_packages, [IPTester('trial',params=v) for v in trial_packages])) + runners.update(nose_runners) + runners.update(trial_runners) return runners @@ -252,13 +229,15 @@ def run_iptestall(): and packages of IPython to be tested each in their own subprocess using nose or twisted.trial appropriately. """ + runners = make_runners() + # Run all test runners, tracking execution time failed = {} t_start = time.time() for name,runner in runners.iteritems(): print '*'*77 - print 'IPython test set:',name + print 'IPython test set:', name res = runner.run() if res: failed[name] = res diff --git a/IPython/utils/genutils.py b/IPython/utils/genutils.py index 85f5e3f..1fe1622 100644 --- a/IPython/utils/genutils.py +++ b/IPython/utils/genutils.py @@ -2178,7 +2178,7 @@ def extract_vars(*names,**kw): In [2]: def func(x): ...: y = 1 - ...: print extractVars('x','y') + ...: print extract_vars('x','y') ...: In [3]: func('hello') diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 4cc4527..0000000 --- a/debian/changelog +++ /dev/null @@ -1,392 +0,0 @@ -ipython (0.8.1-2) unstable; urgency=low - - [ Piotr Ożarowski ] - * Homepage field added - * Rename XS-Vcs-* fields to Vcs-* (dpkg supports them now) - * Add 04_remove_shebang patch - * Removing lintian overrides, adding proper patches instead. - - [ Bernd Zeimetz ] - * Replacing Recommends by Suggests to stop ipython from installing ~500MB - of dependencies. Thanks to Marcela Tiznado (Closes: #451887). - - -- Bernd Zeimetz Mon, 19 Nov 2007 19:10:14 +0100 - -ipython (0.8.1-1) unstable; urgency=low - - [ Bernd Zeimetz ] - * debian/control: - - adding python-matplotlib to Recommends because - it is needed to run ipython -pylab - - [ Norbert Tretkowski ] - * New upstream release. (closes: #428398) - - [ Reinhard Tartler ] - * Install ipython.el properly. - - -- Norbert Tretkowski Mon, 11 Jun 2007 20:05:30 +0200 - -ipython (0.8.0-2) unstable; urgency=low - - * debian/changelog: - - adding missing colons to Closes entries to fix two - lintian warnings - * debian/compat: - - bumping compat level to 5 - * debian/control: - - adding XS-Vcs-Browser - - remove no longer needed X*-Python-Version fields - - moving python-pexpect from Recommends to Depends because - /usr/bin/irunner is not useable without it - - moving debhelper and dpatch from Build-Depends-Indep to - Build-Depends, fixing the following lintian errors: - - clean-should-be-satisfied-by-build-depends debhelper - - clean-should-be-satisfied-by-build-depends dpatch - - removing unnecessary Build-Depends-Indep on python-all-dev, - adding python to Build-Depends instead - - replacing python-central by python-support to be able to - fix #420134 without hassle - - adding ${misc:Depends} - - adding the missing identation for Homepage: - - adding cdbs as Build-Depends - - adding myself to Uploaders - - removing the short description from the long description - * debian/patches/03_ipy_gnuglobal.dpatch: - - fix the location of the global binary - we're not on windows - * debian/rules: - - removing old crust, using cdbs to make things clear again - - using python-support instead of python-central to make - modules for 2.5 avaiable now. (Closes: #420134) - - making sure the bogus /usr/IPython directory is not - included in the package again - - do not remove docs/ipython.el (Closes: #198505, #415427) - * adding lintian ovverrides for several scripts included in the - IPython/Extensions directory. - * adding a manpage for /usr/bin/irunner - - -- Bernd Zeimetz Tue, 24 Apr 2007 02:47:26 +0200 - -ipython (0.8.0-1) unstable; urgency=low - - * New upstream release. (closes: #419716) - * Removed patches merged upstream. - - -- Norbert Tretkowski Tue, 17 Apr 2007 20:26:43 +0200 - -ipython (0.7.3-2) unstable; urgency=low - - * Added a new patch from svn to fix jobctrl to work properly on posix. - - -- Norbert Tretkowski Thu, 21 Dec 2006 20:13:57 +0100 - -ipython (0.7.3-1) unstable; urgency=low - - * New upstream release. - - -- Norbert Tretkowski Mon, 18 Dec 2006 22:23:55 +0100 - -ipython (0.7.3~rc2-1) experimental; urgency=low - - * New upstream release candidate. - - -- Norbert Tretkowski Sat, 16 Dec 2006 02:20:13 +0100 - -ipython (0.7.3~beta2-1) experimental; urgency=low - - * New upstream beta release. - - -- Norbert Tretkowski Fri, 8 Dec 2006 08:02:16 +0100 - -ipython (0.7.3~beta1-1) experimental; urgency=low - - * New upstream beta release. - * Removed backported patch added in 0.7.2-5 to workaround bugs in python - 2.3's inspect module. - - -- Norbert Tretkowski Wed, 29 Nov 2006 12:35:22 +0100 - -ipython (0.7.2-6) UNRELEASED; urgency=low - - * Added XS-Vcs-Svn field. - - -- Piotr Ozarowski Thu, 23 Nov 2006 14:44:43 +0100 - -ipython (0.7.2-5) unstable; urgency=low - - * Added a new patch from svn to workaround bugs in python 2.3's inspect - module. (closes: #374625) - - -- Norbert Tretkowski Thu, 10 Aug 2006 18:36:12 +0200 - -ipython (0.7.2-4) unstable; urgency=low - - * Fixed spelling error in description. (closes: #363976) - * Ack NMU 0.7.2-3.1, thanks Matthias. (closes: #377787) - - -- Norbert Tretkowski Tue, 1 Aug 2006 22:45:11 +0200 - -ipython (0.7.2-3.1) unstable; urgency=medium - - * NMU. - * Convert to updated Python policy. (closes: #377787) - - -- Matthias Klose Thu, 13 Jul 2006 17:42:06 +0000 - -ipython (0.7.2-3ubuntu1) edgy; urgency=low - - * Synchronize with Debian unstable. - * Convert to updated Python policy. Collapse all packages into one - ipython package, don't handle ipython using alternatives. - - -- Matthias Klose Tue, 11 Jul 2006 09:47:37 +0000 - -ipython (0.7.2-3) unstable; urgency=low - - * Removed alternative for irunner manpage. - - -- Norbert Tretkowski Sat, 17 Jun 2006 09:49:10 +0200 - -ipython (0.7.2-2) unstable; urgency=medium - - * Fixed conflict in irunner. (closes: #373874) - * Added recommendation for python-pexpect. (closes: #373794) - - -- Norbert Tretkowski Fri, 16 Jun 2006 10:43:45 +0200 - -ipython (0.7.2-1) unstable; urgency=low - - [ Piotr Ozarowski ] - * Added watch file. - - [ Norbert Tretkowski ] - * New upstream release. - - -- Norbert Tretkowski Thu, 8 Jun 2006 23:36:03 +0200 - -ipython (0.7.1.fix1+0.7.2.rc1-1) experimental; urgency=low - - * New upstream release candidate. - * Updated Standards-Version to 3.7.2.0, no changes required. - - -- Norbert Tretkowski Sat, 27 May 2006 14:49:24 +0200 - -ipython (0.7.1.fix1-2) unstable; urgency=low - - * Set maintainer to Debian Python modules team and added myself to - uploaders. - - -- Norbert Tretkowski Sun, 16 Apr 2006 15:53:43 +0200 - -ipython (0.7.1.fix1-1) unstable; urgency=low - - * New upstream bugfix release. - * Removed backported patch which was added in 0.7.1-3 to catch - KeyboardInterrupt exceptions properly, it's part of this release. - * Fixed names of pdfs in doc-base file to shut up linda. - - -- Norbert Tretkowski Tue, 14 Feb 2006 23:51:17 +0100 - -ipython (0.7.1-3) unstable; urgency=low - - * Added a new patch from upstream to catch KeyboardInterrupt exceptions - properly. - - -- Norbert Tretkowski Mon, 30 Jan 2006 19:42:31 +0100 - -ipython (0.7.1-2) unstable; urgency=low - - * Really remove alternatives on purge, thanks Lars Wirzenius for finding - the problem. (closes: #317269) - - -- Norbert Tretkowski Sun, 29 Jan 2006 23:11:28 +0100 - -ipython (0.7.1-1) unstable; urgency=low - - * New upstream release. - - -- Norbert Tretkowski Tue, 24 Jan 2006 21:42:33 +0100 - -ipython (0.7.0-2) unstable; urgency=low - - * Fixed circular dependencies (closes: #341980) - * Added version to dependency on ipython dummy package. (closes: #320235) - * Removed python2.2 package, ipython now depends on python >= 2.3. - * Bumped up standards-version, no changes needed. - - -- Norbert Tretkowski Sat, 21 Jan 2006 23:27:53 +0100 - -ipython (0.7.0-1) unstable; urgency=low - - * New upstream release. - * Updated 01_docdir-base.dpatch and 02_profiler-message.dpatch. - - -- Norbert Tretkowski Sat, 21 Jan 2006 20:08:23 +0100 - -ipython (0.6.15-2) unstable; urgency=low - - * New maintainer, thanks Jack for your work. - - -- Norbert Tretkowski Sun, 28 Aug 2005 19:57:09 +0200 - -ipython (0.6.15-1) unstable; urgency=low - - * New upstream release. - - -- Norbert Tretkowski Thu, 2 Jun 2005 23:51:45 +0200 - -ipython (0.6.14-1) unstable; urgency=low - - * New upstream release. - - -- Norbert Tretkowski Tue, 31 May 2005 22:53:25 +0200 - -ipython (0.6.13-1) unstable; urgency=low - - * New upstream release. - * Removed backported patch which was added in 0.6.12-3 to fix misleading - prompt, it's part of this release. - - -- Norbert Tretkowski Fri, 15 Apr 2005 09:42:35 +0200 - -ipython (0.6.12-4) unstable; urgency=medium - - * Re-added python build-dependency, it got lost in 0.6.12-2. - (closes: #301636) - - -- Norbert Tretkowski Sun, 27 Mar 2005 14:28:26 +0200 - -ipython (0.6.12-3) unstable; urgency=low - - * Added a new patch from cvs to fix misleading prompt2. (closes: #300847) - - -- Norbert Tretkowski Sun, 27 Mar 2005 00:05:26 +0100 - -ipython (0.6.12-2) unstable; urgency=low - - * Added packages for python2.2 and python2.4, ipython package is now a dummy - package depending on ipython built for Debians default python. - (closes: #292537) - * Split out generic files into separate ipython-common package. - * Enhanced package descriptions. - * Removed CFLAGS settings from debian/rules, not required. - * Tweaked message displayed when profiler support is missing. - * Suggest the python-profiler package. - - -- Norbert Tretkowski Fri, 25 Mar 2005 20:24:36 +0100 - -ipython (0.6.12-1) unstable; urgency=low - - * New upstream release. - * Removed patch which was added in 0.6.5-1.1 to make profiling support - optional, it was merged upstream. - - -- Norbert Tretkowski Wed, 2 Mar 2005 12:15:09 +0100 - -ipython (0.6.11-1) unstable; urgency=low - - * New upstream release. - + Fixed broken profiling support unless -D is specified. (closes: #295779) - * Acknowledged NMUs. (closes: #206653, #294500, #294861, #280505) - * New co-maintainer, added myself to uploaders. - - -- Norbert Tretkowski Tue, 1 Mar 2005 12:40:33 +0100 - -ipython (0.6.5-1.2) unstable; urgency=low - - * Non-maintainer upload. - * Rebuild with a python version that is actually in Debian. - - -- Wichert Akkerman Thu, 17 Feb 2005 23:08:52 +0100 - -ipython (0.6.5-1.1) unstable; urgency=low - - * NMU to apply patch making profiling support optional (provided by - Torsten Marek). (closes: #294500) - - -- Steven R. Baker Thu, 17 Feb 2005 05:02:55 -0400 - -ipython (0.6.5-1) unstable; urgency=low - - * New upstream release - - -- Jack Moffitt Thu, 2 Dec 2004 15:49:27 -0700 - -ipython (0.6.4-1.1) unstable; urgency=low - - * NMU from BSP Frankfurt: - - Added Build-Depends on dpatch (Closes: #280505) - - -- Joerg Jaspert Sat, 27 Nov 2004 18:28:17 +0100 - -ipython (0.6.4-1) unstable; urgency=low - - * New upstream release - * Updated debian/rules to use dpatch and added debian/patches/* - - -- Jack Moffitt Tue, 9 Nov 2004 10:38:51 -0700 - -ipython (0.6.3-1) unstable; urgency=low - - * New upstream release (Closes: #262244, #252525) - - -- Jack Moffitt Wed, 22 Sep 2004 21:39:38 -0600 - -ipython (0.6.0-1) unstable; urgency=low - - * New upstream release - - -- Jack Moffitt Sun, 9 May 2004 17:38:00 +0200 - -ipython (0.4.0-1.1) unstable; urgency=low - - * Non maintainer upload with maintainer consensus. - * Updated buil-dep to depend on python-2.3 (Closes: #206653) - * Included encoding comment string in modules under IPython to - avoid python2.3 Warnigs (upstream noticed). - - -- Marco Presi (Zufus) Mon, 25 Aug 2003 19:02:20 +0200 - -ipython (0.4.0-1) unstable; urgency=low - - * New upstream release (Closes: #195215) - * Updated Build-Depends (Closes: #200021) - - -- Jack Moffitt Fri, 25 Jul 2003 10:16:12 -0600 - -ipython (0.2.15pre3-4) unstable; urgency=low - - * Add python-dev Build-Depends (Closes: #189901) - - -- Jack Moffitt Mon, 12 May 2003 23:33:43 -0600 - -ipython (0.2.15pre3-3) unstable; urgency=low - - * Fix for accidently converting home directory files' line ends - instead of just the appropriate ipython configuration files - (Closes: #189042) - - -- Jack Moffitt Mon, 14 Apr 2003 21:18:18 -0600 - -ipython (0.2.15pre3-2) unstable; urgency=low - - * Added text of the PSF license to debian/copyright. - - -- Jack Moffitt Sat, 5 Apr 2003 11:41:31 -0700 - -ipython (0.2.15pre3-1) unstable; urgency=low - - * Updated documentation to point to the new homepage - - http://ipython.scipy.org - * Removed doc/COPYING and doc/GNU-LGPL to fix lintian warnings - * Public release ready (Closes: #185789) - - -- Jack Moffitt Tue, 1 Apr 2003 20:53:31 -0700 - -ipython (0.2.15pre3-0a) unstable; urgency=low - - * Initial Release. - * This is my first Debian package - - -- Jack Moffitt Wed, 12 Mar 2003 21:04:22 -0700 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index cdb61a0..0000000 --- a/debian/control +++ /dev/null @@ -1,26 +0,0 @@ -Source: ipython -Section: python -Priority: optional -Maintainer: Debian Python Modules Team -Uploaders: Norbert Tretkowski , Bernd Zeimetz -Build-Depends: debhelper (>= 5.0.37.2), dpatch (>= 2.0.10), cdbs (>= 0.4.43), python, python-support (>= 0.4) -Homepage: http://ipython.scipy.org/ -Vcs-Svn: svn://svn.debian.org/python-modules/packages/ipython/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/ipython/trunk/ -Standards-Version: 3.7.2.2 - -Package: ipython -Architecture: all -Depends: ${python:Depends}, ${misc:Depends}, python-pexpect -Conflicts: python2.3-ipython, python2.4-ipython, ipython-common -Replaces: python2.3-ipython, python2.4-ipython, ipython-common -Suggests: python-profiler, python-numeric, python-numeric-ext, python-matplotlib -Description: enhanced interactive Python shell - IPython can be used as a replacement for the standard Python shell, - or it can be used as a complete working environment for scientific - computing (like Matlab or Mathematica) when paired with the standard - Python scientific and numerical tools. It supports dynamic object - introspections, numbered input/output prompts, a macro system, - session logging, session restoring, complete system shell access, - verbose and colored traceback reports, auto-parentheses, auto-quoting, - and is embeddable in other Python programs. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index c4c326b..0000000 --- a/debian/copyright +++ /dev/null @@ -1,168 +0,0 @@ -This package was debianized by Jack Moffitt on -Wed, 12 Mar 2003 20:38:14 -0700. - -It was downloaded from http://ipython.scipy.org/ - -Upstream Author: Fernando Perez , - Janko Hauser , - Nathaniel Gray - -Copyright: - -Most IPython code is copyright (C) 2001 by Fernando Perez, Janko -Hauser, and Nathaniel Gray. All code is licensed under the GNU Lesser -General Public License (LGPL) except as explicitly mentioned below. -Its full text is included in the file /usr/share/common-licenses/LGPL. - -DPyGetOpt.py is copyright (C) 2001 by Bill Bumgarner -and is licensed under the MIT license, reproduced below: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. - -FlexCompleter.py is copyright (C) 2001 by the Python Software -Foundation and licensed under the terms of the Python Software -Foundation License, reproduced below: - -A. HISTORY OF THE SOFTWARE -========================== - -Python was created in the early 1990s by Guido van Rossum at Stichting -Mathematisch Centrum (CWI) in the Netherlands as a successor of a -language called ABC. Guido is Python's principal author, although it -includes many contributions from others. The last version released -from CWI was Python 1.2. In 1995, Guido continued his work on Python -at the Corporation for National Research Initiatives (CNRI) in Reston, -Virginia where he released several versions of the software. Python -1.6 was the last of the versions released by CNRI. In 2000, Guido and -the Python core development team moved to BeOpen.com to form the -BeOpen PythonLabs team. Python 2.0 was the first and only release -from BeOpen.com. - -Following the release of Python 1.6, and after Guido van Rossum left -CNRI to work with commercial software developers, it became clear that -the ability to use Python with software available under the GNU Public -License (GPL) was very desirable. CNRI and the Free Software -Foundation (FSF) interacted to develop enabling wording changes to the -Python license. Python 1.6.1 is essentially the same as Python 1.6, -with a few minor bug fixes, and with a different license that enables -later versions to be GPL-compatible. Python 2.1 is a derivative work -of Python 1.6.1, as well as of Python 2.0. - -After Python 2.0 was released by BeOpen.com, Guido van Rossum and the -other PythonLabs developers joined Digital Creations. All -intellectual property added from this point on, starting with Python -2.1 and its alpha and beta releases, is owned by the Python Software -Foundation (PSF), a non-profit modeled after the Apache Software -Foundation. See http://www.python.org/psf/ for more information about -the PSF. - -Thanks to the many outside volunteers who have worked under Guido's -direction to make these releases possible. - - -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - -PSF LICENSE AGREEMENT ---------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using Python 2.1 software in source or binary form and its -associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 2.1 -alone or in any derivative version, provided, however, that PSF's -License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001 Python Software Foundation; All Rights Reserved" are retained in -Python 2.1 alone or in any derivative version prepared by Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 2.1 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 2.1. - -4. PSF is making Python 2.1 available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -2.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A -RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1, OR -ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. This License Agreement shall be governed by the federal -intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of -Virginia, excluding Virginia's conflict of law provisions. -Notwithstanding the foregoing, with regard to derivative works based -on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License -Agreement only as to issues arising under or with respect to -Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI PERMISSIONS STATEMENT AND DISCLAIMER ----------------------------------------- - -Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -Itpl.py is copyright (C) 2001 Ka-Ping Yee and licensed -under the MIT license reproduced above. diff --git a/debian/install b/debian/install deleted file mode 100644 index 2f61d73..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -doc/ipython.el usr/share/emacs/site-lisp diff --git a/debian/ipython.doc-base b/debian/ipython.doc-base deleted file mode 100644 index ddb97e9..0000000 --- a/debian/ipython.doc-base +++ /dev/null @@ -1,14 +0,0 @@ -Document: ipython -Title: IPython Manual -Author: Fernando Perez -Abstract: Full documentation on all features of IPython. -Section: devel - -Format: pdf -Files: /usr/share/doc/ipython/ipython.pdf - -Format: HTML -Index: /usr/share/doc/ipython/manual/index.html -Files: /usr/share/doc/ipython/manual/*.html - - diff --git a/debian/irunner.1 b/debian/irunner.1 deleted file mode 100644 index 71c9c55..0000000 --- a/debian/irunner.1 +++ /dev/null @@ -1,52 +0,0 @@ -.TH IRUNNER 1 "April 24, 2007" "" "" -.SH NAME -\fBirunner \- interactive runner interface -.SH SYNOPSIS -.nf -.fam C -\fBirunner\fP [\fIoptions\fP] \fIfile_to_run\fP -.fam T -.fi -.SH DESCRIPTION -irunner is an interface to the various interactive runners -available in IPython's \fBirunner\fP module. -.PP -The already implemented runners are listed below; adding -one for a new program is a trivial task, see the source -for examples. -.SH OPTIONS -.TP -.B -\-h, \-\-help -show this help message and exit -.TP -.B -\-\-ipython -IPython interactive runner (default). -.TP -.B -\-\-python -Python interactive runner. -.TP -.B -\-\-sage -SAGE interactive runner. -.SH EXAMPLE -irunner.py \-\-python \-\- \-\-help -will pass \-\-help to the python runner. -Similarly, -irunner.py \-\-ipython \-\- \-\-interact script.ipy -.SH SEE ALSO -.BR ipython(1) -.br -.SH BUGS -The SAGE runner only works if you manually configure your SAGE -copy to use 'colors NoColor' in the ipythonrc config file, since -currently the prompt matching regexp does not identify color sequences. -.SH AUTHOR -\fBirunner\fP is an extension of Ken Schutte 's -script contributed on the ipython-user list: -http://scipy.net/pipermail/ipython-user/2006-May/001705.html -.PP -This manual page was written by Bernd Zeimetz , -for the Debian project (but may be used by others). diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index 58da2e3..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -debian/irunner.1 diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 96b2706..0000000 --- a/debian/postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -e - -OLD_MODDIR=/usr/lib/python2.2/site-packages/IPython - -if [ $1 = "configure" ]; then - if [ -d $OLD_MODDIR ];then - echo "Removing old python2.2 modules" - rm -fr $OLD_MODDIR >&2 - fi -fi - -#DEBHELPER# diff --git a/debian/pycompat b/debian/pycompat deleted file mode 100644 index 0cfbf08..0000000 --- a/debian/pycompat +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 6bc02e7..0000000 --- a/debian/rules +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/make -f -# ipython debian/rules file -DEB_PYTHON_SYSTEM=pysupport -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/python-distutils.mk -include /usr/share/cdbs/1/rules/dpatch.mk - -install/ipython:: - # remove documentation - rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/COPYING - rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/ChangeLog - rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/README_Windows.txt - rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/pycon.ico - - # change permission on scripts - chmod a-x $(CURDIR)/debian/ipython/usr/share/doc/ipython/examples/* - - # removing bogus usr/IPython directory - rm -rf $(CURDIR)/debian/ipython/usr/IPython - -binary-fixup/ipython:: - # fix lintian warnings (see also patches/04_remove_shebang.dpatch) - chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/upgrade_dir.py - chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/Extensions/pickleshare.py - chmod +x $(CURDIR)/debian/ipython/usr/share/python-support/ipython/IPython/irunner.py diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1a2b269..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://ipython.scipy.org/dist/ ipython-(.*)\.tar\.gz diff --git a/setup_bdist_egg.py b/tools/setup_bdist_egg.py similarity index 100% rename from setup_bdist_egg.py rename to tools/setup_bdist_egg.py