Merge pull request #703 from minrk/isort

switch to isort for import formatting

Author: minrk

.pre-commit-config.yaml

@@ -6,10 +6,10 @@ repos:
         args:
           - --py36-plus
         exclude: setupbase.py
-  - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.0.1
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
     hooks:
-      - id: reorder-python-imports
+      - id: isort
         exclude: setupbase.py
   - repo: https://github.com/psf/black
     rev: 22.3.0

benchmarks/benchmarks/throughput.py

@@ -1,11 +1,13 @@
 import os
 
 os.environ['OPENBLAS_NUM_THREADS'] = '1'
-import ipyparallel as ipp
-import timeit
 import time
+import timeit
+
 import numpy as np
 
+import ipyparallel as ipp
+
 delay = [0]
 engines = [1, 2, 16, 64, 128, 256, 512, 1024]
 byte_param = [1000, 10_000, 100_000, 1_000_000, 2_000_000]

benchmarks/gcloud_setup.py

@@ -2,8 +2,7 @@
 import multiprocessing as mp
 import os
 import sys
-from subprocess import check_call
-from subprocess import Popen
+from subprocess import Popen, check_call
 from time import sleep
 from typing import List
 

benchmarks/profiling/profiling_code_runner.py

@@ -2,9 +2,7 @@
 import os
 import sys
 import time
-from subprocess import check_call
-from subprocess import check_output
-from subprocess import Popen
+from subprocess import Popen, check_call, check_output
 
 import ipyparallel as ipp
 

docs/source/examples/customresults.py

@@ -26,7 +26,8 @@
 
 def sleep_here(count, t):
     """simple function that takes args, prints a short message, sleeps for a time, and returns the same args"""
-    import time, sys
+    import sys
+    import time
 
     print("hi from engine %i" % id)
     sys.stdout.flush()

docs/source/examples/daVinci Word Count/pwordfreq.py

@@ -8,8 +8,7 @@
 from itertools import repeat
 
 import requests
-from wordfreq import print_wordfreq
-from wordfreq import wordfreq
+from wordfreq import print_wordfreq, wordfreq
 
 import ipyparallel as ipp
 

docs/source/examples/daVinci Word Count/wordfreq.py

@@ -38,9 +38,10 @@ def wordfreq_to_weightsize(
 
 
 def tagcloud(worddict, n=10, minsize=25, maxsize=50, minalpha=0.5, maxalpha=1.0):
-    from matplotlib import pyplot as plt
     import random
 
+    from matplotlib import pyplot as plt
+
     worddict = wordfreq_to_weightsize(worddict, minsize, maxsize, minalpha, maxalpha)
 
     fig = plt.figure()

docs/source/examples/dagdeps.py

@@ -89,8 +89,8 @@ def main(nodes, edges):
     point at least slightly to the right if the graph is valid.
     """
     from matplotlib import pyplot as plt
-    from matplotlib.dates import date2num
     from matplotlib.cm import gist_rainbow
+    from matplotlib.dates import date2num
 
     print("building DAG")
     G = random_dag(nodes, edges)

docs/source/examples/fetchparse.py

@@ -19,9 +19,10 @@
 
 
 def fetchAndParse(url, data=None):
-    import requests
     from urllib.parse import urljoin
+
     import bs4  # noqa
+    import requests
 
     links = []
     r = requests.get(url, data=data)

docs/source/examples/interengine/bintree.py

@@ -12,8 +12,7 @@
 
 import zmq
 
-from ipyparallel.serialize import deserialize_object
-from ipyparallel.serialize import serialize_object
+from ipyparallel.serialize import deserialize_object, serialize_object
 from ipyparallel.util import disambiguate_url
 
 # ----------------------------------------------------------------------------

docs/source/examples/interengine/bintree_script.py

@@ -18,7 +18,6 @@
 """
 import ipyparallel as ipp
 
-
 # connect client and create views
 rc = ipp.Client()
 rc.block = True

docs/source/examples/interengine/interengine.py

@@ -1,6 +1,5 @@
 import ipyparallel as ipp
 
-
 rc = ipp.Client()
 rc.block = True
 view = rc[:]

docs/source/examples/pi/parallelpi.py

@@ -18,10 +18,12 @@
 from timeit import default_timer as clock
 
 from matplotlib import pyplot as plt
-from pidigits import compute_two_digit_freqs
-from pidigits import fetch_pi_file
-from pidigits import plot_two_digit_freqs
-from pidigits import reduce_freqs
+from pidigits import (
+    compute_two_digit_freqs,
+    fetch_pi_file,
+    plot_two_digit_freqs,
+    reduce_freqs,
+)
 
 import ipyparallel as ipp
 

docs/source/examples/wave2D/RectPartitioner.py

@@ -15,9 +15,7 @@
  * Min Ragan-Kelley
 
 """
-from numpy import ascontiguousarray
-from numpy import frombuffer
-from numpy import zeros
+from numpy import ascontiguousarray, frombuffer, zeros
 
 try:
     from mpi4py import MPI

docs/source/examples/wave2D/wavesolver.py

@@ -12,10 +12,7 @@
 """
 import time
 
-from numpy import arange
-from numpy import newaxis
-from numpy import sqrt
-from numpy import zeros
+from numpy import arange, newaxis, sqrt, zeros
 
 
 def iseq(start=0, stop=None, inc=1):

ipyparallel/__init__.py

@@ -35,6 +35,7 @@ def bind_kernel(**kwargs):
     This function returns immediately.
     """
     from ipykernel.kernelapp import IPKernelApp
+
     from ipyparallel.engine.app import IPEngine
 
     # first check for IPKernelApp, in which case this should be a no-op

ipyparallel/apps/baseapp.py

@@ -7,19 +7,14 @@
 import sys
 
 import traitlets
+from IPython.core.application import BaseIPythonApplication
 from IPython.core.application import base_aliases as base_ip_aliases
 from IPython.core.application import base_flags as base_ip_flags
-from IPython.core.application import BaseIPythonApplication
 from IPython.utils.path import expand_path
 from jupyter_client.session import Session
 from tornado.ioloop import IOLoop
-from traitlets import Bool
-from traitlets import default
-from traitlets import Instance
-from traitlets import observe
-from traitlets import Unicode
-from traitlets.config.application import catch_config_error
-from traitlets.config.application import LevelFormatter
+from traitlets import Bool, Instance, Unicode, default, observe
+from traitlets.config.application import LevelFormatter, catch_config_error
 
 from .._version import __version__
 

ipyparallel/apps/iploggerapp.py

@@ -5,9 +5,11 @@
 from IPython.core.profiledir import ProfileDir
 from traitlets import Dict
 
-from ipyparallel.apps.baseapp import base_aliases
-from ipyparallel.apps.baseapp import BaseParallelApplication
-from ipyparallel.apps.baseapp import catch_config_error
+from ipyparallel.apps.baseapp import (
+    BaseParallelApplication,
+    base_aliases,
+    catch_config_error,
+)
 from ipyparallel.apps.logwatcher import LogWatcher
 
 # -----------------------------------------------------------------------------

ipyparallel/apps/logwatcher.py

@@ -5,12 +5,9 @@
 
 import zmq
 from jupyter_client.localinterfaces import localhost
-from traitlets import Instance
-from traitlets import List
-from traitlets import Unicode
+from traitlets import Instance, List, Unicode
 from traitlets.config.configurable import LoggingConfigurable
-from zmq.eventloop import ioloop
-from zmq.eventloop import zmqstream
+from zmq.eventloop import ioloop, zmqstream
 
 
 class LogWatcher(LoggingConfigurable):

ipyparallel/client/_joblib.py

@@ -1,8 +1,7 @@
 """joblib parallel backend for IPython Parallel"""
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
-from joblib.parallel import AutoBatchingMixin
-from joblib.parallel import ParallelBackendBase
+from joblib.parallel import AutoBatchingMixin, ParallelBackendBase
 
 import ipyparallel as ipp
 

ipyparallel/client/asyncresult.py

@@ -6,32 +6,22 @@
 import threading
 import time
 import warnings
-from concurrent.futures import ALL_COMPLETED
-from concurrent.futures import FIRST_COMPLETED
-from concurrent.futures import FIRST_EXCEPTION
-from concurrent.futures import Future
+from concurrent.futures import ALL_COMPLETED, FIRST_COMPLETED, FIRST_EXCEPTION, Future
 from contextlib import contextmanager
 from datetime import datetime
-from functools import lru_cache
-from functools import partial
-from itertools import chain
-from itertools import repeat
+from functools import lru_cache, partial
+from itertools import chain, repeat
 from threading import Event
 
 import zmq
 from decorator import decorator
 from IPython import get_ipython
-from IPython.display import display
-from IPython.display import display_pretty
-from IPython.display import publish_display_data
+from IPython.display import display, display_pretty, publish_display_data
 
-from .futures import MessageFuture
-from .futures import multi_future
 from ipyparallel import error
-from ipyparallel.util import _parse_date
-from ipyparallel.util import compare_datetimes
-from ipyparallel.util import progress
-from ipyparallel.util import utcnow
+from ipyparallel.util import _parse_date, compare_datetimes, progress, utcnow
+
+from .futures import MessageFuture, multi_future
 
 
 def _raw_text(s):

ipyparallel/client/client.py

@@ -14,51 +14,43 @@
 from functools import partial
 from getpass import getpass
 from pprint import pprint
-from threading import current_thread
-from threading import Event
-from threading import Thread
+from threading import Event, Thread, current_thread
 
 import jupyter_client.session
 import zmq
 from decorator import decorator
 from ipykernel.comm import Comm
 from IPython import get_ipython
 from IPython.core.application import BaseIPythonApplication
-from IPython.core.profiledir import ProfileDir
-from IPython.core.profiledir import ProfileDirError
+from IPython.core.profiledir import ProfileDir, ProfileDirError
 from IPython.paths import get_ipython_dir
 from IPython.utils.capture import RichOutput
 from IPython.utils.coloransi import TermColors
 from IPython.utils.path import compress_user
-from jupyter_client.localinterfaces import is_local_ip
-from jupyter_client.localinterfaces import localhost
+from jupyter_client.localinterfaces import is_local_ip, localhost
 from jupyter_client.session import Session
 from tornado import ioloop
-from traitlets import Any
-from traitlets import Bool
-from traitlets import Bytes
-from traitlets import default
-from traitlets import Dict
-from traitlets import HasTraits
-from traitlets import Instance
-from traitlets import List
-from traitlets import Set
-from traitlets import Unicode
+from traitlets import (
+    Any,
+    Bool,
+    Bytes,
+    Dict,
+    HasTraits,
+    Instance,
+    List,
+    Set,
+    Unicode,
+    default,
+)
 from traitlets.config.configurable import MultipleInstanceError
 from zmq.eventloop.zmqstream import ZMQStream
 
-from .asyncresult import AsyncHubResult
-from .asyncresult import AsyncResult
-from .futures import MessageFuture
-from .futures import multi_future
-from .view import BroadcastView
-from .view import DirectView
-from .view import LoadBalancedView
-from ipyparallel import error
-from ipyparallel import serialize
-from ipyparallel import util
-from ipyparallel.serialize import PrePickled
-from ipyparallel.serialize import Reference
+from ipyparallel import error, serialize, util
+from ipyparallel.serialize import PrePickled, Reference
+
+from .asyncresult import AsyncHubResult, AsyncResult
+from .futures import MessageFuture, multi_future
+from .view import BroadcastView, DirectView, LoadBalancedView
 
 pjoin = os.path.join
 jupyter_client.session.extract_dates = lambda obj: obj

ipyparallel/client/magics.py

@@ -28,6 +28,7 @@
 import time
 from contextlib import contextmanager
 
+
 # Python 3.6 doesn't have nullcontext, so we define our own
 @contextmanager
 def nullcontext():
@@ -43,13 +44,14 @@ def nullcontext():
 
 import inspect
 import re
+import sys
 from textwrap import dedent
 
+from IPython.core import magic_arguments
 from IPython.core.error import UsageError
 from IPython.core.magic import Magics
-from IPython.core import magic_arguments
+
 from .. import error
-import sys
 
 # -----------------------------------------------------------------------------
 # Definitions of magic functions for use with IPython

ipyparallel/client/map.py

@@ -6,8 +6,7 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 import sys
-from itertools import chain
-from itertools import islice
+from itertools import chain, islice
 
 numpy = None
 

ipyparallel/client/remotefunction.py

@@ -7,8 +7,8 @@
 
 from decorator import decorator
 
-from . import map as Map
 from ..serialize import PrePickled
+from . import map as Map
 from .asyncresult import AsyncMapResult
 
 # -----------------------------------------------------------------------------