mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-03-01 12:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merging Fernando's trunk (fp-trunk-dev) and Brian's edits (fp-review).

Browse Source 
This is a huge merge of months worth of work by Fernando and Brian.

Some highlights:

* The test suite has been ported to use the new APIs.
* The test suite runs and passes on all platforms!!!
* The IPython Sphinx directive has been updated to use the new APIs.
* %history works again.
* New %tb magic for showing last traceback.
* Significant design improvements in the config loaders and applications.
* Zillions of bugs fixed.
* Completely new %pylab implementation that uses the new GUI support.
  This allows pylab to be enabled *at runtime*.
* Many other things.
This commit is contained in:
Brian Granger 2010-01-31 15:30:13 -08:00
commit 5dae9f5f49
3 changed files with 449 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

543
IPython/testing/iptest.py
View File

@ -17,25 +17,68 @@ will change in the future.
"""
#-----------------------------------------------------------------------------
# Module imports
# Copyright (C) 2009 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
# Stdlib
import os
import os.path as path
import signal
import sys
import subprocess
import tempfile
import time
import warnings
# Note: monkeypatch!
# We need to monkeypatch a small problem in nose itself first, before importing
# it for actual use. This should get into nose upstream, but its release cycle
# is slow and we need it for our parametric tests to work correctly.
from IPython.testing import nosepatch
# Now, proceed to import nose itself
import nose.plugins.builtin
from nose.core import TestProgram
from IPython.utils.platutils import find_cmd
# from IPython.testing.plugin.ipdoctest import IPythonDoctest
# Our own imports
from IPython.utils.path import get_ipython_module_path
from IPython.utils.process import find_cmd, pycmd2argv
from IPython.utils.sysinfo import sys_info
from IPython.testing import globalipapp
from IPython.testing.plugin.ipdoctest import IPythonDoctest
pjoin = path.join
#-----------------------------------------------------------------------------
# Globals
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Warnings control
#-----------------------------------------------------------------------------
# Twisted generates annoying warnings with Python 2.6, as will do other code
# that imports 'sets' as of today
warnings.filterwarnings('ignore', 'the sets module is deprecated',
DeprecationWarning )
# This one also comes from Twisted
warnings.filterwarnings('ignore', 'the sha module is deprecated',
DeprecationWarning)
# Wx on Fedora11 spits these out
warnings.filterwarnings('ignore', 'wxPython/wxWidgets release number mismatch',
UserWarning)
#-----------------------------------------------------------------------------
# Logic for skipping doctests
#-----------------------------------------------------------------------------
@ -44,101 +87,261 @@ def test_for(mod):
"""Test to see if mod is importable."""
try:
__import__(mod)
except ImportError:
except (ImportError, RuntimeError):
# GTK reports Runtime error if it can't be initialized even if it's
# importable.
return False
else:
return True
have_curses = test_for('_curses')
have_wx = test_for('wx')
have_wx_aui = test_for('wx.aui')
have_zi = test_for('zope.interface')
have_twisted = test_for('twisted')
have_foolscap = test_for('foolscap')
have_objc = test_for('objc')
have_pexpect = test_for('pexpect')
have_gtk = test_for('gtk')
have_gobject = test_for('gobject')
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', 'quarantine'),
pjoin('IPython', 'deathrow'),
pjoin('IPython', 'testing', 'attic'),
pjoin('IPython', 'testing', 'tools'),
pjoin('IPython', 'testing', 'mkdoctests'),
pjoin('IPython', 'lib', 'inputhook')
]
if not have_wx:
EXCLUDE.append(pjoin('IPython', 'gui'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'wx'))
EXCLUDE.append(pjoin('IPython', 'lib', 'inputhookwx'))
if not have_gtk or not have_gobject:
EXCLUDE.append(pjoin('IPython', 'lib', 'inputhookgtk'))
if not have_wx_aui:
EXCLUDE.append(pjoin('IPython', 'gui', 'wx', 'wxIPython'))
if not have_objc:
EXCLUDE.append(pjoin('IPython', 'frontend', 'cocoa'))
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'))
# This is scary. We still have things in frontend and testing that
# are being tested by nose that use twisted. We need to rethink
# how we are isolating dependencies in testing.
if not (have_twisted and have_zi and have_foolscap):
EXCLUDE.append(pjoin('IPython', 'frontend', 'asyncfrontendbase'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'prefilterfrontend'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'frontendbase'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'linefrontendbase'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
'test_linefrontend'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
'test_frontendbase'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
'test_prefilterfrontend'))
EXCLUDE.append(pjoin('IPython', 'frontend', 'tests',
'test_asyncfrontendbase')),
EXCLUDE.append(pjoin('IPython', 'testing', 'parametric'))
EXCLUDE.append(pjoin('IPython', 'testing', 'util'))
EXCLUDE.append(pjoin('IPython', 'testing', 'tests',
'test_decorators_trial'))
# 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
# Global dict where we can store information on what we have and what we don't
# have available at test run time
have = {}
have['curses'] = test_for('_curses')
have['wx'] = test_for('wx')
have['wx.aui'] = test_for('wx.aui')
have['zope.interface'] = test_for('zope.interface')
have['twisted'] = test_for('twisted')
have['foolscap'] = test_for('foolscap')
have['objc'] = test_for('objc')
have['pexpect'] = test_for('pexpect')
have['gtk'] = test_for('gtk')
have['gobject'] = test_for('gobject')
#-----------------------------------------------------------------------------
# Functions and classes
#-----------------------------------------------------------------------------
def report():
"""Return a string with a summary report of test-related variables."""
out = [ sys_info() ]
avail = []
not_avail = []
for k, is_avail in have.items():
if is_avail:
avail.append(k)
else:
not_avail.append(k)
if avail:
out.append('\nTools and libraries available at test time:\n')
avail.sort()
out.append(' ' + ' '.join(avail)+'\n')
if not_avail:
out.append('\nTools and libraries NOT available at test time:\n')
not_avail.sort()
out.append(' ' + ' '.join(not_avail)+'\n')
return ''.join(out)
def make_exclude():
"""Make patterns of modules and packages to exclude from testing.
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.
These modules and packages will NOT get scanned by nose at all for tests.
"""
# Simple utility to make IPython paths more readably, we need a lot of
# these below
ipjoin = lambda *paths: pjoin('IPython', *paths)
exclusions = [ipjoin('external'),
ipjoin('frontend', 'process', 'winprocess.py'),
# Deprecated old Shell and iplib modules, skip to avoid
# warnings
ipjoin('Shell'),
ipjoin('iplib'),
pjoin('IPython_doctest_plugin'),
ipjoin('quarantine'),
ipjoin('deathrow'),
ipjoin('testing', 'attic'),
# This guy is probably attic material
ipjoin('testing', 'mkdoctests'),
# Testing inputhook will need a lot of thought, to figure out
# how to have tests that don't lock up with the gui event
# loops in the picture
ipjoin('lib', 'inputhook'),
# Config files aren't really importable stand-alone
ipjoin('config', 'default'),
ipjoin('config', 'profile'),
]
if not have['wx']:
exclusions.append(ipjoin('gui'))
exclusions.append(ipjoin('frontend', 'wx'))
exclusions.append(ipjoin('lib', 'inputhookwx'))
if not have['gtk'] or not have['gobject']:
exclusions.append(ipjoin('lib', 'inputhookgtk'))
if not have['wx.aui']:
exclusions.append(ipjoin('gui', 'wx', 'wxIPython'))
if not have['objc']:
exclusions.append(ipjoin('frontend', 'cocoa'))
# 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':
exclusions.append(ipjoin('testing', 'plugin', 'test_exampleip'))
exclusions.append(ipjoin('testing', 'plugin', 'dtexample'))
if not have['pexpect']:
exclusions.extend([ipjoin('scripts', 'irunner'),
ipjoin('lib', 'irunner')])
# This is scary. We still have things in frontend and testing that
# are being tested by nose that use twisted. We need to rethink
# how we are isolating dependencies in testing.
if not (have['twisted'] and have['zope.interface'] and have['foolscap']):
exclusions.extend(
[ipjoin('frontend', 'asyncfrontendbase'),
ipjoin('frontend', 'prefilterfrontend'),
ipjoin('frontend', 'frontendbase'),
ipjoin('frontend', 'linefrontendbase'),
ipjoin('frontend', 'tests', 'test_linefrontend'),
ipjoin('frontend', 'tests', 'test_frontendbase'),
ipjoin('frontend', 'tests', 'test_prefilterfrontend'),
ipjoin('frontend', 'tests', 'test_asyncfrontendbase'),
ipjoin('testing', 'parametric'),
ipjoin('testing', 'util'),
ipjoin('testing', 'tests', 'test_decorators_trial'),
] )
# This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
if sys.platform == 'win32':
exclusions = [s.replace('\\','\\\\') for s in exclusions]
return exclusions
class IPTester(object):
"""Call that calls iptest or trial in a subprocess.
"""
#: string, name of test runner that will be called
runner = None
#: list, parameters for test runner
params = None
#: list, arguments of system call to be made to call test runner
call_args = None
#: list, process ids of subprocesses we start (for cleanup)
pids = None
def __init__(self, runner='iptest', params=None):
"""Create new test runner."""
p = os.path
if runner == 'iptest':
iptest_app = get_ipython_module_path('IPython.testing.iptest')
self.runner = pycmd2argv(iptest_app) + sys.argv[1:]
elif runner == 'trial':
# For trial, it needs to be installed system-wide
self.runner = pycmd2argv(p.abspath(find_cmd('trial')))
else:
raise Exception('Not a valid test runner: %s' % repr(runner))
if params is None:
params = []
if isinstance(params, str):
params = [params]
self.params = params
# Assemble call
self.call_args = self.runner+self.params
# Store pids of anything we start to clean up on deletion, if possible
# (on posix only, since win32 has no os.kill)
self.pids = []
if sys.platform == 'win32':
def _run_cmd(self):
# On Windows, use os.system instead of subprocess.call, because I
# was having problems with subprocess and I just don't know enough
# about win32 to debug this reliably. Os.system may be the 'old
# fashioned' way to do it, but it works just fine. If someone
# later can clean this up that's fine, as long as the tests run
# reliably in win32.
# What types of problems are you having. They may be related to
# running Python in unboffered mode. BG.
return os.system(' '.join(self.call_args))
else:
def _run_cmd(self):
#print >> sys.stderr, '*** CMD:', ' '.join(self.call_args) # dbg
subp = subprocess.Popen(self.call_args)
self.pids.append(subp.pid)
# If this fails, the pid will be left in self.pids and cleaned up
# later, but if the wait call succeeds, then we can clear the
# stored pid.
retcode = subp.wait()
self.pids.pop()
return retcode
def run(self):
"""Run the stored commands"""
try:
return self._run_cmd()
except:
import traceback
traceback.print_exc()
return 1 # signal failure
def __del__(self):
"""Cleanup on exit by killing any leftover processes."""
if not hasattr(os, 'kill'):
return
for pid in self.pids:
try:
print 'Cleaning stale PID:', pid
os.kill(pid, signal.SIGKILL)
except OSError:
# This is just a best effort, if we fail or the process was
# really gone, ignore it.
pass
def make_runners():
"""Define the top-level packages that need to be tested.
"""
# Packages to be tested via nose, that only depend on the stdlib
nose_pkg_names = ['config', 'core', 'extensions', 'frontend', 'lib',
'scripts', 'testing', 'utils' ]
# The machinery in kernel needs twisted for real testing
trial_pkg_names = []
if have['wx']:
nose_pkg_names.append('gui')
# And add twisted ones if conditions are met
if have['zope.interface'] and have['twisted'] and have['foolscap']:
# We only list IPython.kernel for testing using twisted.trial as
# nose and twisted.trial have conflicts that make the testing system
# unstable.
trial_pkg_names.append('kernel')
# For debugging this code, only load quick stuff
#nose_pkg_names = ['core', 'extensions'] # dbg
#trial_pkg_names = [] # dbg
# Make fully qualified package names prepending 'IPython.' to our name lists
nose_packages = ['IPython.%s' % m for m in nose_pkg_names ]
trial_packages = ['IPython.%s' % m for m in trial_pkg_names ]
# Make runners
runners = [ (v, IPTester('iptest', params=v)) for v in nose_packages ]
runners.extend([ (v, IPTester('trial', params=v)) for v in trial_packages ])
return runners
def run_iptest():
"""Run the IPython test suite using nose.
@ -150,16 +353,14 @@ def run_iptest():
warnings.filterwarnings('ignore',
'This will be removed soon. Use IPython.testing.util instead')
argv = sys.argv + [
# Loading ipdoctest causes problems with Twisted.
# I am removing this as a temporary fix to get the
# test suite back into working shape. Our nose
# plugin needs to be gone through with a fine
# toothed comb to find what is causing the problem.
# '--with-ipdoctest',
# '--ipdoctest-tests','--ipdoctest-extension=txt',
# '--detailed-errors',
argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks
# Loading ipdoctest causes problems with Twisted, but
# our test suite runner now separates things and runs
# all Twisted tests with trial.
'--with-ipdoctest',
'--ipdoctest-tests','--ipdoctest-extension=txt',
# We add --exe because of setuptools' imbecility (it
# blindly does chmod +x on ALL files). Nose does the
# right thing and it tries to avoid executables,
@ -169,101 +370,30 @@ def run_iptest():
'--exe',
]
# Detect if any tests were required by explicitly calling an IPython
# submodule or giving a specific path
has_tests = False
for arg in sys.argv:
if 'IPython' in arg or arg.endswith('.py') or \
(':' in arg and '.py' in arg):
has_tests = True
break
# If nothing was specifically requested, test full IPython
if not has_tests:
argv.append('IPython')
if nose.__version__ >= '0.11':
# I don't fully understand why we need this one, but depending on what
# directory the test suite is run from, if we don't give it, 0 tests
# get run. Specifically, if the test suite is run from the source dir
# with an argument (like 'iptest.py IPython.core', 0 tests are run,
# even if the same call done in this directory works fine). It appears
# that if the requested package is in the current dir, nose bails early
# by default. Since it's otherwise harmless, leave it in by default
# for nose >= 0.11, though unfortunately nose 0.10 doesn't support it.
argv.append('--traverse-namespace')
# Construct list of plugins, omitting the existing doctest plugin, which
# ours replaces (and extends).
EXCLUDE = make_exclude()
plugins = []
# plugins = [IPythonDoctest(EXCLUDE)]
plugins = [IPythonDoctest(make_exclude())]
for p in nose.plugins.builtin.plugins:
plug = p()
if plug.name == 'doctest':
continue
plugins.append(plug)
TestProgram(argv=argv,plugins=plugins)
class IPTester(object):
"""Call that calls iptest or trial in a subprocess.
"""
def __init__(self,runner='iptest',params=None):
""" """
if runner == 'iptest':
self.runner = ['iptest','-v']
else:
self.runner = [find_cmd('trial')]
if params is None:
params = []
if isinstance(params,str):
params = [params]
self.params = params
# Assemble call
self.call_args = self.runner+self.params
if sys.platform == 'win32':
def run(self):
"""Run the stored commands"""
# On Windows, cd to temporary directory to run tests. Otherwise,
# Twisted's trial may not be able to execute 'trial IPython', since
# it will confuse the IPython module name with the ipython
# execution scripts, because the windows file system isn't case
# sensitive.
# We also use os.system instead of subprocess.call, because I was
# having problems with subprocess and I just don't know enough
# about win32 to debug this reliably. Os.system may be the 'old
# fashioned' way to do it, but it works just fine. If someone
# later can clean this up that's fine, as long as the tests run
# reliably in win32.
curdir = os.getcwd()
os.chdir(tempfile.gettempdir())
stat = os.system(' '.join(self.call_args))
os.chdir(curdir)
return stat
else:
def run(self):
"""Run the stored commands"""
return subprocess.call(self.call_args)
def make_runners():
"""Define the top-level packages that need to be tested.
"""
nose_packages = ['config', 'core', 'extensions',
'frontend', 'lib',
'scripts', 'testing', 'utils']
trial_packages = ['kernel']
if have_wx:
nose_packages.append('gui')
nose_packages = ['IPython.%s' % m for m in nose_packages ]
trial_packages = ['IPython.%s' % m for m in trial_packages ]
# Make runners
runners = dict()
nose_runners = dict(zip(nose_packages, [IPTester(params=v) for v in nose_packages]))
if have_zi and have_twisted and have_foolscap:
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
# We need a global ipython running in this process
globalipapp.start_ipython()
# Now nose can run
TestProgram(argv=argv, plugins=plugins)
def run_iptestall():
@ -277,32 +407,45 @@ def run_iptestall():
runners = make_runners()
# Run the test runners in a temporary dir so we can nuke it when finished
# to clean up any junk files left over by accident. This also makes it
# robust against being run in non-writeable directories by mistake, as the
# temp dir will always be user-writeable.
curdir = os.getcwd()
testdir = tempfile.gettempdir()
os.chdir(testdir)
# Run all test runners, tracking execution time
failed = {}
failed = []
t_start = time.time()
for name,runner in runners.iteritems():
print '*'*77
print 'IPython test group:',name
res = runner.run()
if res:
failed[name] = res
try:
for (name, runner) in runners:
print '*'*70
print 'IPython test group:',name
res = runner.run()
if res:
failed.append( (name, runner) )
finally:
os.chdir(curdir)
t_end = time.time()
t_tests = t_end - t_start
nrunners = len(runners)
nfail = len(failed)
# summarize results
print
print '*'*77
print '*'*70
print 'Test suite completed for system with the following information:'
print report()
print 'Ran %s test groups in %.3fs' % (nrunners, t_tests)
print
print 'Status:'
if not failed:
print 'OK'
else:
# If anything went wrong, point out what command to rerun manually to
# see the actual errors and individual summary
print 'ERROR - %s out of %s test groups failed.' % (nfail, nrunners)
for name in failed:
failed_runner = runners[name]
for name, failed_runner in failed:
print '-'*40
print 'Runner failed:',name
print 'You may wish to rerun this one individually, with:'
@ -311,13 +454,13 @@ def run_iptestall():
def main():
if len(sys.argv) == 1:
run_iptestall()
else:
if sys.argv[1] == 'all':
run_iptestall()
else:
for arg in sys.argv[1:]:
if arg.startswith('IPython'):
# This is in-process
run_iptest()
else:
# This starts subprocesses
run_iptestall()
if __name__ == '__main__':

61
IPython/utils/tests/test_io.py Normal file
View File

@ -0,0 +1,61 @@
# encoding: utf-8
"""Tests for io.py"""
#-----------------------------------------------------------------------------
# Copyright (C) 2008 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import sys
from cStringIO import StringIO
import nose.tools as nt
from IPython.testing import decorators as dec
from IPython.utils.io import Tee
#-----------------------------------------------------------------------------
# Tests
#-----------------------------------------------------------------------------
def test_tee_simple():
"Very simple check with stdout only"
chan = StringIO()
text = 'Hello'
tee = Tee(chan, channel='stdout')
print >> chan, text,
nt.assert_equal(chan.getvalue(), text)
class TeeTestCase(dec.ParametricTestCase):
def tchan(self, channel, check='close'):
trap = StringIO()
chan = StringIO()
text = 'Hello'
std_ori = getattr(sys, channel)
setattr(sys, channel, trap)
tee = Tee(chan, channel=channel)
print >> chan, text,
setattr(sys, channel, std_ori)
trap_val = trap.getvalue()
nt.assert_equals(chan.getvalue(), text)
if check=='close':
tee.close()
else:
del tee
def test(self):
for chan in ['stdout', 'stderr']:
for check in ['close', 'del']:
yield self.tchan(chan, check)

49
setup.py
View File

@ -13,13 +13,30 @@ requires utilities which are not available under Windows."""
# the file COPYING, distributed as part of this software.
#-------------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Minimal Python version sanity check
#-----------------------------------------------------------------------------
import sys
# This check is also made in IPython/__init__, don't forget to update both when
# changing Python version requirements.
if sys.version[0:3] < '2.5':
error = """\
ERROR: 'IPython requires Python Version 2.5 or above.'
Exiting."""
print >> sys.stderr, error
sys.exit(1)
# At least we're on Python 2.5 or newer, move on.
#-------------------------------------------------------------------------------
# Imports
#-------------------------------------------------------------------------------
# Stdlib imports
import os
import sys
import shutil
from glob import glob
@ -29,7 +46,8 @@ if os.path.exists('MANIFEST'): os.remove('MANIFEST')
from distutils.core import setup
from IPython.utils.genutils import target_update
# Our own imports
from IPython.utils.path import target_update
from setupbase import (
setup_args,
@ -43,6 +61,21 @@ from setupbase import (
isfile = os.path.isfile
pjoin = os.path.join
#-----------------------------------------------------------------------------
# Function definitions
#-----------------------------------------------------------------------------
def cleanup():
"""Clean up the junk left around by the build process"""
if "develop" not in sys.argv:
try:
shutil.rmtree('ipython.egg-info')
except:
try:
os.unlink('ipython.egg-info')
except:
pass
#-------------------------------------------------------------------------------
# Handle OS specific things
#-------------------------------------------------------------------------------
@ -144,7 +177,6 @@ if len(sys.argv) >= 2 and sys.argv[1] in ('sdist','bdist_rpm'):
)
[ target_update(*t) for t in to_update ]
#---------------------------------------------------------------------------
# Find all the packages, package data, scripts and data_files
@ -159,6 +191,14 @@ data_files = find_data_files()
# Handle dependencies and setuptools specific things
#---------------------------------------------------------------------------
# For some commands, use setuptools. Note that we do NOT list install here!
# If you want a setuptools-enhanced install, just run 'setupegg.py install'
if len(set(('develop', 'sdist', 'release', 'bdist_egg', 'bdist_rpm',
'bdist', 'bdist_dumb', 'bdist_wininst', 'install_egg_info',
'build_sphinx', 'egg_info', 'easy_install', 'upload',
)).intersection(sys.argv)) > 0:
import setuptools
# This dict is used for passing extra arguments that are setuptools
# specific to setup
setuptools_extra_args = {}
@ -195,7 +235,6 @@ else:
# just to make life easy for users.
check_for_dependencies()
#---------------------------------------------------------------------------
# Do the actual setup now
#---------------------------------------------------------------------------
@ -206,5 +245,7 @@ setup_args['scripts'] = scripts
setup_args['data_files'] = data_files
setup_args.update(setuptools_extra_args)
if __name__ == '__main__':
setup(**setup_args)
cleanup()