Merge pull request #6662 from minrk/dependencies

Proposal: remove dependencies from IPython.external

IPython/config/application.py

@@ -14,7 +14,7 b' import sys'
 from copy import deepcopy
 from collections import defaultdict
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.config.configurable import SingletonConfigurable
 from IPython.config.loader import (

IPython/core/formatters.py

@@ -17,7 +17,7 b' import sys'
 import traceback
 import warnings
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.config.configurable import Configurable
 from IPython.core.getipython import get_ipython

IPython/core/history.py

@@ -28,7 +28,7 b' import threading'
 
 # Our own packages
 from IPython.config.configurable import Configurable
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.utils.decorators import undoc
 from IPython.utils.path import locate_profile
 from IPython.utils import py3compat

IPython/core/interactiveshell.py

@@ -27,6 +27,8 b' import types'
 import subprocess
 from io import open as io_open
 
+from pickleshare import PickleShareDB
+
 from IPython.config.configurable import SingletonConfigurable
 from IPython.core import debugger, oinspect
 from IPython.core import magic
@@ -63,7 +65,6 b' from IPython.utils.decorators import undoc'
 from IPython.utils.io import ask_yes_no
 from IPython.utils.ipstruct import Struct
 from IPython.utils.path import get_home_dir, get_ipython_dir, get_py_filename, unquote_filename, ensure_dir_exists
-from IPython.utils.pickleshare import PickleShareDB
 from IPython.utils.process import system, getoutput
 from IPython.utils.py3compat import (builtin_mod, unicode_type, string_types,
                                      with_metaclass, iteritems)

IPython/core/magic.py

@@ -27,7 +27,7 b' from IPython.config.configurable import Configurable'
 from IPython.core import oinspect
 from IPython.core.error import UsageError
 from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.utils.ipstruct import Struct
 from IPython.utils.process import arg_split
 from IPython.utils.py3compat import string_types, iteritems

IPython/core/tests/test_oinspect.py

@@ -26,7 +26,7 b' from IPython.core.magic import (Magics, magics_class, line_magic,'
                                 cell_magic, line_cell_magic,
                                 register_line_magic, register_cell_magic,
                                 register_line_cell_magic)
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.testing.decorators import skipif
 from IPython.testing.tools import AssertPrints
 from IPython.utils.path import compress_user

IPython/extensions/rmagic.py

@@ -73,7 +73,7 b' from IPython.testing.skipdoctest import skip_doctest'
 from IPython.core.magic_arguments import (
     argument, magic_arguments, parse_argstring
 )
-from IPython.external.simplegeneric import generic
+from simplegeneric import generic
 from IPython.utils.py3compat import (str_to_unicode, unicode_to_str, PY3,
                                      unicode_type)
 from IPython.utils.text import dedent

IPython/kernel/zmq/eventloops.py

@@ -11,19 +11,14 b' import zmq'
 
 from IPython.config.application import Application
 from IPython.utils import io
-
-
-def _on_os_x_10_9():
-    import platform
-    from distutils.version import LooseVersion as V
-    return sys.platform == 'darwin' and V(platform.mac_ver()[0]) >= V('10.9')
+from IPython.lib.inputhook import _use_appnope
 
 def _notify_stream_qt(kernel, stream):
     
     from IPython.external.qt_for_kernel import QtCore
     
-    if _on_os_x_10_9() and kernel._darwin_app_nap:
-        from IPython.external.appnope import nope_scope as context
+    if _use_appnope() and kernel._darwin_app_nap:
+        from appnope import nope_scope as context
     else:
         from IPython.core.interactiveshell import NoOpContext as context
 
@@ -93,10 +88,10 b' def loop_wx(kernel):'
     import wx
     from IPython.lib.guisupport import start_event_loop_wx
     
-    if _on_os_x_10_9() and kernel._darwin_app_nap:
+    if _use_appnope() and kernel._darwin_app_nap:
         # we don't hook up App Nap contexts for Wx,
         # just disable it outright.
-        from IPython.external.appnope import nope
+        from appnope import nope
         nope()
 
     doi = kernel.do_one_iteration

IPython/lib/inputhook.py

@@ -3,16 +3,8 b''
 Inputhook management for GUI event loop integration.
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  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
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
 try:
     import ctypes
@@ -21,6 +13,7 b' except ImportError:'
 except SystemError: # IronPython issue, 2/8/2014
     ctypes = None
 import os
+import platform
 import sys
 from distutils.version import LooseVersion as V
 
@@ -57,8 +50,14 b' def _stdin_ready_nt():'
 
 def _stdin_ready_other():
     """Return True, assuming there's something to read on stdin."""
-    return True #
+    return True
+
+def _use_appnope():
+    """Should we use appnope for dealing with OS X app nap?
 
+    Checks if we are on OS X 10.9 or greater.
+    """
+    return sys.platform == 'darwin' and V(platform.mac_ver()[0]) >= V('10.9')
 
 def _ignore_CTRL_C_posix():
     """Ignore CTRL+C (SIGINT)."""
@@ -317,9 +316,10 b' class WxInputHook(InputHookBase):'
             raise ValueError("requires wxPython >= 2.8, but you have %s" % wx.__version__)
         
         from IPython.lib.inputhookwx import inputhook_wx
-        from IPython.external.appnope import nope
         self.manager.set_inputhook(inputhook_wx)
-        nope()
+        if _use_appnope():
+            from appnope import nope
+            nope()
 
         import wx
         if app is None:
@@ -334,8 +334,9 b' class WxInputHook(InputHookBase):'
 
         This restores appnapp on OS X
         """
-        from IPython.external.appnope import nap
-        nap()
+        if _use_appnope():
+            from appnope import nap
+            nap()
 
 @inputhook_manager.register('qt', 'qt4')
 class Qt4InputHook(InputHookBase):
@@ -362,10 +363,11 b' class Qt4InputHook(InputHookBase):'
             app = QtGui.QApplication(sys.argv)
         """
         from IPython.lib.inputhookqt4 import create_inputhook_qt4
-        from IPython.external.appnope import nope
-        app, inputhook_qt4 = create_inputhook_qt4(self.manager, app)
+        app, inputhook_qt4 = create_inputhook_qt4(self, app)
         self.manager.set_inputhook(inputhook_qt4)
-        nope()
+        if _use_appnope():
+            from appnope import nope
+            nope()
 
         return app
 
@@ -374,8 +376,9 b' class Qt4InputHook(InputHookBase):'
 
         This restores appnapp on OS X
         """
-        from IPython.external.appnope import nap
-        nap()
+        if _use_appnope():
+            from appnope import nap
+            nap()
 
 
 @inputhook_manager.register('qt5')

IPython/parallel/client/asyncresult.py

@@ -12,7 +12,7 b' from datetime import datetime'
 from zmq import MessageTracker
 
 from IPython.core.display import clear_output, display, display_pretty
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.parallel import error
 from IPython.utils.py3compat import string_types
 

IPython/parallel/client/client.py

@@ -31,7 +31,7 b' from IPython.utils.path import get_ipython_dir, compress_user'
 from IPython.utils.py3compat import cast_bytes, string_types, xrange, iteritems
 from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode,
                                     Dict, List, Bool, Set, Any)
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.parallel import Reference
 from IPython.parallel import error

IPython/parallel/client/remotefunction.py

@@ -8,7 +8,7 b' from __future__ import division'
 import sys
 import warnings
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.testing.skipdoctest import skip_doctest
 
 from . import map as Map

IPython/parallel/client/view.py

@@ -18,7 +18,7 b' from IPython.utils import pickleutil'
 from IPython.utils.traitlets import (
     HasTraits, Any, Bool, List, Dict, Set, Instance, CFloat, Integer
 )
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.parallel import util
 from IPython.parallel.controller.dependency import Dependency, dependent

IPython/parallel/controller/scheduler.py

@@ -26,7 +26,7 b' import zmq'
 from zmq.eventloop import ioloop, zmqstream
 
 # local imports
-from IPython.external.decorator import decorator
+from decorator import decorator
 from IPython.config.application import Application
 from IPython.config.loader import Config
 from IPython.utils.traitlets import Instance, Dict, List, Set, Integer, Enum, CBytes

IPython/parallel/tests/clienttest.py

@@ -22,7 +22,7 b' from nose import SkipTest'
 import zmq
 from zmq.tests import BaseZMQTestCase
 
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.parallel import error
 from IPython.parallel import Client

IPython/parallel/util.py

@@ -28,7 +28,7 b' import zmq'
 from zmq.log import handlers
 
 from IPython.utils.log import get_logger
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 from IPython.config.application import Application
 from IPython.utils.localinterfaces import localhost, is_public_ip, public_ips

IPython/terminal/console/tests/test_console.py

@@ -62,7 +62,7 b' def stop_console(p, pexpect, t):'
 
 def start_console():
     "Start `ipython console` using pexpect"
-    from IPython.external import pexpect
+    import pexpect
     
     args = ['-m', 'IPython', 'console', '--colors=NoColor']
     cmd = sys.executable

IPython/terminal/tests/test_embed.py

@@ -60,7 +60,7 b' def test_ipython_embed():'
 @skip_win32
 def test_nest_embed():
     """test that `IPython.embed()` is nestable"""
-    from IPython.external import pexpect
+    import pexpect
     ipy_prompt = r']:' #ansi color codes give problems matching beyond this
 
 

IPython/testing/decorators.py

@@ -52,7 +52,7 b' import unittest'
 # Third-party imports
 
 # This is Michele Simionato's decorator module, kept verbatim.
-from IPython.external.decorator import decorator
+from decorator import decorator
 
 # Expose the unittest-driven decorators
 from .ipunittest import ipdoctest, ipdocstring

IPython/testing/iptest.py

@@ -42,12 +42,6 b' from IPython.external.decorators import KnownFailure, knownfailureif'
 
 pjoin = path.join
 
-
-#-----------------------------------------------------------------------------
-# Globals
-#-----------------------------------------------------------------------------
-
-
 #-----------------------------------------------------------------------------
 # Warnings control
 #-----------------------------------------------------------------------------
@@ -127,7 +121,7 b' have = {}'
 have['curses'] = test_for('_curses')
 have['matplotlib'] = test_for('matplotlib')
 have['numpy'] = test_for('numpy')
-have['pexpect'] = test_for('IPython.external.pexpect')
+have['pexpect'] = test_for('pexpect')
 have['pymongo'] = test_for('pymongo')
 have['pygments'] = test_for('pygments')
 have['qt'] = test_for('IPython.external.qt')

IPython/utils/_process_posix.py

@@ -21,7 +21,7 b' import os'
 import subprocess as sp
 import sys
 
-from IPython.external import pexpect
+import pexpect
 
 # Our own
 from ._process_common import getoutput, arg_split

IPython/utils/generics.py

@@ -1,26 +1,11 b''
 # encoding: utf-8
 """Generic functions for extending IPython.
 
-See http://cheeseshop.python.org/pypi/simplegeneric.
+See http://pypi.python.org/pypi/simplegeneric.
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  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
-#-----------------------------------------------------------------------------
-
 from IPython.core.error import TryNext
-from IPython.external.simplegeneric import generic
-
-#-----------------------------------------------------------------------------
-# Imports
-#-----------------------------------------------------------------------------
+from simplegeneric import generic
 
 
 @generic

IPython/utils/text.py

@@ -8,42 +8,21 b' Inheritance diagram:'
    :parts: 3
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  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 os
 import re
 import sys
 import textwrap
 from string import Formatter
 
-from IPython.external.path import path
 from IPython.testing.skipdoctest import skip_doctest_py3, skip_doctest
 from IPython.utils import py3compat
 
-#-----------------------------------------------------------------------------
-# Declarations
-#-----------------------------------------------------------------------------
-
 # datetime.strftime date format for ipython
 if sys.platform == 'win32':
     date_format = "%B %d, %Y"
 else:
     date_format = "%B %-d, %Y"
 
-
-#-----------------------------------------------------------------------------
-# Code
-#-----------------------------------------------------------------------------
-
 class LSString(str):
     """String derivative with a special access attributes.
 
@@ -52,7 +31,7 b' class LSString(str):'
         .l (or .list) : value as list (split on newlines).
         .n (or .nlstr): original value (the string itself).
         .s (or .spstr): value as whitespace-separated string.
-        .p (or .paths): list of path objects
+        .p (or .paths): list of path objects (requires path.py package)
 
     Any values which require transformations are computed only once and
     cached.
@@ -84,6 +63,7 b' class LSString(str):'
     n = nlstr = property(get_nlstr)
 
     def get_paths(self):
+        from path import path
         try:
             return self.__paths
         except AttributeError:
@@ -113,7 +93,7 b' class SList(list):'
     * .l (or .list) : value as list (the list itself).
     * .n (or .nlstr): value as a string, joined on newlines.
     * .s (or .spstr): value as a string, joined on spaces.
-    * .p (or .paths): list of path objects
+    * .p (or .paths): list of path objects (requires path.py package)
 
     Any values which require transformations are computed only once and
     cached."""
@@ -142,6 +122,7 b' class SList(list):'
     n = nlstr = property(get_nlstr)
 
     def get_paths(self):
+        from path import path
         try:
             return self.__paths
         except AttributeError:

setup.py

@@ -63,7 +63,7 b' from setupbase import ('
     find_entry_points,
     build_scripts_entrypt,
     find_data_files,
-    check_for_dependencies,
+    check_for_readline,
     git_prebuild,
     check_submodule_status,
     update_submodules,
@@ -78,7 +78,6 b' from setupbase import ('
     install_scripts_for_symlink,
     unsymlink,
 )
-from setupext import setupext
 
 isfile = os.path.isfile
 pjoin = os.path.join
@@ -268,14 +267,22 b' if sys.version_info < (3, 3):'
 extras_require['notebook'].extend(extras_require['nbformat'])
 extras_require['nbconvert'].extend(extras_require['nbformat'])
 
-install_requires = []
+install_requires = [
+    'decorator',
+    'pickleshare',
+    'simplegeneric>0.8',
+]
 
-# add readline
+# add platform-specific dependencies
 if sys.platform == 'darwin':
-    if 'bdist_wheel' in sys.argv[1:] or not setupext.check_for_readline():
+    install_requires.append('appnope')
+    if 'bdist_wheel' in sys.argv[1:] or not check_for_readline():
         install_requires.append('gnureadline')
-elif sys.platform.startswith('win'):
+
+if sys.platform.startswith('win'):
     extras_require['terminal'].append('pyreadline>=2.0')
+else:
+    install_requires.append('pexpect')
 
 everything = set()
 for deps in extras_require.values():
@@ -317,13 +324,6 b" if 'setuptools' in sys.modules:"
                                   "ipython_win_post_install.py"}}
 
 else:
-    # If we are installing without setuptools, call this function which will
-    # check for dependencies an inform the user what is needed.  This is
-    # just to make life easy for users.
-    for install_cmd in ('install', 'symlink'):
-        if install_cmd in sys.argv:
-            check_for_dependencies()
-            break
     # scripts has to be a non-empty list, or install_scripts isn't called
     setup_args['scripts'] = [e.split('=')[0].strip() for e in find_entry_points()]
 

setupbase.py

@@ -490,37 +490,23 b' class install_scripts_for_symlink(install_scripts):'
 # Verify all dependencies
 #---------------------------------------------------------------------------
 
-def check_for_dependencies():
-    """Check for IPython's dependencies.
-
-    This function should NOT be called if running under setuptools!
-    """
-    from setupext.setupext import (
-        print_line, print_raw, print_status,
-        check_for_sphinx, check_for_pygments,
-        check_for_nose, check_for_pexpect,
-        check_for_pyzmq, check_for_readline,
-        check_for_jinja2, check_for_tornado
-    )
-    print_line()
-    print_raw("BUILDING IPYTHON")
-    print_status('python', sys.version)
-    print_status('platform', sys.platform)
-    if sys.platform == 'win32':
-        print_status('Windows version', sys.getwindowsversion())
-
-    print_raw("")
-    print_raw("OPTIONAL DEPENDENCIES")
-
-    check_for_sphinx()
-    check_for_pygments()
-    check_for_nose()
-    if os.name == 'posix':
-        check_for_pexpect()
-    check_for_pyzmq()
-    check_for_tornado()
-    check_for_readline()
-    check_for_jinja2()
+def check_for_readline():
+    """Check for GNU readline"""
+    try:
+        import gnureadline as readline
+    except ImportError:
+        pass
+    else:
+        return True
+    try:
+        import readline
+    except ImportError:
+        return False
+    else:
+        if sys.platform == 'darwin' and 'libedit' in readline.__doc__:
+            print("Ignoring readline linked to libedit", file=sys.stderr)
+            return False
+        return True
 
 #---------------------------------------------------------------------------
 # VCS related
@@ -670,7 +656,7 b' def get_bdist_wheel():'
                     if found:
                         lis.pop(idx)
                 
-                for pkg in ("gnureadline", "pyreadline", "mock", "terminado"):
+                for pkg in ("gnureadline", "pyreadline", "mock", "terminado", "appnope", "pexpect"):
                     _remove_startswith(requires, pkg)
                 requires.append("gnureadline; sys.platform == 'darwin' and platform.python_implementation == 'CPython'")
                 requires.append("terminado (>=0.3.3); extra == 'notebook' and sys.platform != 'win32'")
@@ -678,6 +664,8 b' def get_bdist_wheel():'
                 requires.append("pyreadline (>=2.0); extra == 'terminal' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("pyreadline (>=2.0); extra == 'all' and sys.platform == 'win32' and platform.python_implementation == 'CPython'")
                 requires.append("mock; extra == 'test' and python_version < '3.3'")
+                requires.append("appnope; sys.platform == 'darwin'")
+                requires.append("pexpect; sys.platform != 'win32'")
                 for r in requires:
                     pkg_info['Requires-Dist'] = r
                 write_pkg_info(metadata_path, pkg_info)