Show More
@@ -14,7 +14,7 b' import sys' | |||||
14 | from copy import deepcopy |
|
14 | from copy import deepcopy | |
15 | from collections import defaultdict |
|
15 | from collections import defaultdict | |
16 |
|
16 | |||
17 |
from |
|
17 | from decorator import decorator | |
18 |
|
18 | |||
19 | from IPython.config.configurable import SingletonConfigurable |
|
19 | from IPython.config.configurable import SingletonConfigurable | |
20 | from IPython.config.loader import ( |
|
20 | from IPython.config.loader import ( |
@@ -17,7 +17,7 b' import sys' | |||||
17 | import traceback |
|
17 | import traceback | |
18 | import warnings |
|
18 | import warnings | |
19 |
|
19 | |||
20 |
from |
|
20 | from decorator import decorator | |
21 |
|
21 | |||
22 | from IPython.config.configurable import Configurable |
|
22 | from IPython.config.configurable import Configurable | |
23 | from IPython.core.getipython import get_ipython |
|
23 | from IPython.core.getipython import get_ipython |
@@ -28,7 +28,7 b' import threading' | |||||
28 |
|
28 | |||
29 | # Our own packages |
|
29 | # Our own packages | |
30 | from IPython.config.configurable import Configurable |
|
30 | from IPython.config.configurable import Configurable | |
31 |
from |
|
31 | from decorator import decorator | |
32 | from IPython.utils.decorators import undoc |
|
32 | from IPython.utils.decorators import undoc | |
33 | from IPython.utils.path import locate_profile |
|
33 | from IPython.utils.path import locate_profile | |
34 | from IPython.utils import py3compat |
|
34 | from IPython.utils import py3compat |
@@ -27,7 +27,7 b' from IPython.config.configurable import Configurable' | |||||
27 | from IPython.core import oinspect |
|
27 | from IPython.core import oinspect | |
28 | from IPython.core.error import UsageError |
|
28 | from IPython.core.error import UsageError | |
29 | from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2 |
|
29 | from IPython.core.inputsplitter import ESC_MAGIC, ESC_MAGIC2 | |
30 |
from |
|
30 | from decorator import decorator | |
31 | from IPython.utils.ipstruct import Struct |
|
31 | from IPython.utils.ipstruct import Struct | |
32 | from IPython.utils.process import arg_split |
|
32 | from IPython.utils.process import arg_split | |
33 | from IPython.utils.py3compat import string_types, iteritems |
|
33 | from IPython.utils.py3compat import string_types, iteritems |
@@ -26,7 +26,7 b' from IPython.core.magic import (Magics, magics_class, line_magic,' | |||||
26 | cell_magic, line_cell_magic, |
|
26 | cell_magic, line_cell_magic, | |
27 | register_line_magic, register_cell_magic, |
|
27 | register_line_magic, register_cell_magic, | |
28 | register_line_cell_magic) |
|
28 | register_line_cell_magic) | |
29 |
from |
|
29 | from decorator import decorator | |
30 | from IPython.testing.decorators import skipif |
|
30 | from IPython.testing.decorators import skipif | |
31 | from IPython.testing.tools import AssertPrints |
|
31 | from IPython.testing.tools import AssertPrints | |
32 | from IPython.utils.path import compress_user |
|
32 | from IPython.utils.path import compress_user |
@@ -12,7 +12,7 b' from datetime import datetime' | |||||
12 | from zmq import MessageTracker |
|
12 | from zmq import MessageTracker | |
13 |
|
13 | |||
14 | from IPython.core.display import clear_output, display, display_pretty |
|
14 | from IPython.core.display import clear_output, display, display_pretty | |
15 |
from |
|
15 | from decorator import decorator | |
16 | from IPython.parallel import error |
|
16 | from IPython.parallel import error | |
17 | from IPython.utils.py3compat import string_types |
|
17 | from IPython.utils.py3compat import string_types | |
18 |
|
18 |
@@ -31,7 +31,7 b' from IPython.utils.path import get_ipython_dir, compress_user' | |||||
31 | from IPython.utils.py3compat import cast_bytes, string_types, xrange, iteritems |
|
31 | from IPython.utils.py3compat import cast_bytes, string_types, xrange, iteritems | |
32 | from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode, |
|
32 | from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode, | |
33 | Dict, List, Bool, Set, Any) |
|
33 | Dict, List, Bool, Set, Any) | |
34 |
from |
|
34 | from decorator import decorator | |
35 |
|
35 | |||
36 | from IPython.parallel import Reference |
|
36 | from IPython.parallel import Reference | |
37 | from IPython.parallel import error |
|
37 | from IPython.parallel import error |
@@ -8,7 +8,7 b' from __future__ import division' | |||||
8 | import sys |
|
8 | import sys | |
9 | import warnings |
|
9 | import warnings | |
10 |
|
10 | |||
11 |
from |
|
11 | from decorator import decorator | |
12 | from IPython.testing.skipdoctest import skip_doctest |
|
12 | from IPython.testing.skipdoctest import skip_doctest | |
13 |
|
13 | |||
14 | from . import map as Map |
|
14 | from . import map as Map |
@@ -18,7 +18,7 b' from IPython.utils import pickleutil' | |||||
18 | from IPython.utils.traitlets import ( |
|
18 | from IPython.utils.traitlets import ( | |
19 | HasTraits, Any, Bool, List, Dict, Set, Instance, CFloat, Integer |
|
19 | HasTraits, Any, Bool, List, Dict, Set, Instance, CFloat, Integer | |
20 | ) |
|
20 | ) | |
21 |
from |
|
21 | from decorator import decorator | |
22 |
|
22 | |||
23 | from IPython.parallel import util |
|
23 | from IPython.parallel import util | |
24 | from IPython.parallel.controller.dependency import Dependency, dependent |
|
24 | from IPython.parallel.controller.dependency import Dependency, dependent |
@@ -26,7 +26,7 b' import zmq' | |||||
26 | from zmq.eventloop import ioloop, zmqstream |
|
26 | from zmq.eventloop import ioloop, zmqstream | |
27 |
|
27 | |||
28 | # local imports |
|
28 | # local imports | |
29 |
from |
|
29 | from decorator import decorator | |
30 | from IPython.config.application import Application |
|
30 | from IPython.config.application import Application | |
31 | from IPython.config.loader import Config |
|
31 | from IPython.config.loader import Config | |
32 | from IPython.utils.traitlets import Instance, Dict, List, Set, Integer, Enum, CBytes |
|
32 | from IPython.utils.traitlets import Instance, Dict, List, Set, Integer, Enum, CBytes |
@@ -22,7 +22,7 b' from nose import SkipTest' | |||||
22 | import zmq |
|
22 | import zmq | |
23 | from zmq.tests import BaseZMQTestCase |
|
23 | from zmq.tests import BaseZMQTestCase | |
24 |
|
24 | |||
25 |
from |
|
25 | from decorator import decorator | |
26 |
|
26 | |||
27 | from IPython.parallel import error |
|
27 | from IPython.parallel import error | |
28 | from IPython.parallel import Client |
|
28 | from IPython.parallel import Client |
@@ -28,7 +28,7 b' import zmq' | |||||
28 | from zmq.log import handlers |
|
28 | from zmq.log import handlers | |
29 |
|
29 | |||
30 | from IPython.utils.log import get_logger |
|
30 | from IPython.utils.log import get_logger | |
31 |
from |
|
31 | from decorator import decorator | |
32 |
|
32 | |||
33 | from IPython.config.application import Application |
|
33 | from IPython.config.application import Application | |
34 | from IPython.utils.localinterfaces import localhost, is_public_ip, public_ips |
|
34 | from IPython.utils.localinterfaces import localhost, is_public_ip, public_ips |
@@ -52,7 +52,7 b' import unittest' | |||||
52 | # Third-party imports |
|
52 | # Third-party imports | |
53 |
|
53 | |||
54 | # This is Michele Simionato's decorator module, kept verbatim. |
|
54 | # This is Michele Simionato's decorator module, kept verbatim. | |
55 |
from |
|
55 | from decorator import decorator | |
56 |
|
56 | |||
57 | # Expose the unittest-driven decorators |
|
57 | # Expose the unittest-driven decorators | |
58 | from .ipunittest import ipdoctest, ipdocstring |
|
58 | from .ipunittest import ipdoctest, ipdocstring |
@@ -269,6 +269,7 b" extras_require['notebook'].extend(extras_require['nbformat'])" | |||||
269 | extras_require['nbconvert'].extend(extras_require['nbformat']) |
|
269 | extras_require['nbconvert'].extend(extras_require['nbformat']) | |
270 |
|
270 | |||
271 | install_requires = [ |
|
271 | install_requires = [ | |
|
272 | 'decorator', | |||
272 | 'path.py', # required by pickleshare, remove when pickleshare is added here |
|
273 | 'path.py', # required by pickleshare, remove when pickleshare is added here | |
273 | ] |
|
274 | ] | |
274 |
|
275 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now