From 0e94b28cd862069dd9b11b6eeaefb597827cd5dc Mon Sep 17 00:00:00 2001 From: Fernando Perez Date: Tue, 12 Jan 2010 12:42:23 -0800 Subject: [PATCH] Remove accidentally introduced runtime nose dependencies. --- IPython/testing/iptest.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 84a79849b..e4bc7807d 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -22,6 +22,7 @@ from __future__ import absolute_import # Module imports #----------------------------------------------------------------------------- +# Stdlib import os import os.path as path import signal @@ -31,9 +32,16 @@ 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 . import nosepatch +# Now, proceed to import nose itself import nose.plugins.builtin from nose.core import TestProgram +# Our own imports from IPython.utils import genutils from IPython.utils.platutils import find_cmd, FindCmdError from . import globalipapp