Skip to content

Add isort to pre-commit hooks, package resorting #4600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- [ ] Closes #xxxx
- [ ] Tests added / passed
- [ ] Passes `black distributed` / `flake8 distributed`
- [ ] Passes `black distributed` / `flake8 distributed` / `isort distributed`
5 changes: 5 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
repos:
- repo: https://github.com/pycqa/isort
rev: 5.7.0
hooks:
- id: isort
language_version: python3
- repo: https://github.com/psf/black
rev: 20.8b1
hooks:
Expand Down
1 change: 0 additions & 1 deletion conftest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# https://pytest.org/latest/example/simple.html#control-skipping-of-tests-according-to-command-line-option
import pytest


# Uncomment to enable more logging and checks
# (https://docs.python.org/3/library/asyncio-dev.html)
# Note this makes things slower and might consume much memory.
Expand Down
30 changes: 15 additions & 15 deletions distributed/__init__.py
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
from . import config
from . import config # isort:skip
import dask
from dask.config import config

from ._version import get_versions
from .actor import Actor, ActorFuture
from .core import connect, rpc, Status
from .deploy import LocalCluster, Adaptive, SpecCluster, SSHCluster
from .diagnostics.progressbar import progress
from .diagnostics.plugin import WorkerPlugin, SchedulerPlugin, PipInstall
from .client import (
Client,
Executor,
CompatibleExecutor,
wait,
Executor,
Future,
as_completed,
default_client,
fire_and_forget,
Future,
futures_of,
get_task_metadata,
get_task_stream,
performance_report,
get_task_metadata,
wait,
)
from .core import Status, connect, rpc
from .deploy import Adaptive, LocalCluster, SpecCluster, SSHCluster
from .diagnostics.plugin import PipInstall, SchedulerPlugin, WorkerPlugin
from .diagnostics.progressbar import progress
from .event import Event
from .lock import Lock
from .multi_lock import MultiLock
from .nanny import Nanny
from .pubsub import Pub, Sub
from .queues import Queue
from .scheduler import Scheduler
from .security import Security
from .semaphore import Semaphore
from .event import Event
from .scheduler import Scheduler
from .threadpoolexecutor import rejoin
from .utils import sync, TimeoutError, CancelledError
from .utils import CancelledError, TimeoutError, sync
from .variable import Variable
from .worker import Worker, get_worker, get_client, secede, Reschedule
from .worker import Reschedule, Worker, get_client, get_worker, secede
from .worker_client import local_client, worker_client

from ._version import get_versions

versions = get_versions()
__version__ = versions["version"]
__git_revision__ = versions["full-revisionid"]
Expand Down
5 changes: 3 additions & 2 deletions distributed/_concurrent_futures_thread.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@
__author__ = "Brian Quinlan ([email protected])"

import atexit
from concurrent.futures import _base
import itertools
from concurrent.futures import _base

try:
import queue
except ImportError:
import Queue as queue

import os
import threading
import weakref
import os

# Workers are created as daemon threads. This is done to allow the interpreter
# to exit when there are still idle threads in a ThreadPoolExecutor's thread
Expand Down
12 changes: 5 additions & 7 deletions distributed/_ipython_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@
except ImportError:
# Python 2
import Queue as queue
from subprocess import Popen

import sys
from threading import Thread
from subprocess import Popen
from threading import Event, Thread
from uuid import uuid4

from tornado.gen import TimeoutError
from tornado.ioloop import IOLoop
from threading import Event

from IPython import get_ipython
from jupyter_client import BlockingKernelClient, write_connection_file
from jupyter_core.paths import jupyter_runtime_dir

from tornado.gen import TimeoutError
from tornado.ioloop import IOLoop

OUTPUT_TIMEOUT = 10

Expand Down
2 changes: 1 addition & 1 deletion distributed/actor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from .client import Future, default_client
from .protocol import to_serialize
from .utils import iscoroutinefunction, thread_state, sync
from .utils import iscoroutinefunction, sync, thread_state
from .utils_comm import WrappedKey
from .worker import get_worker

Expand Down
3 changes: 1 addition & 2 deletions distributed/batched.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from collections import deque
import logging
from collections import deque

import dask
from tornado import gen, locks
Expand All @@ -8,7 +8,6 @@
from .core import CommClosedError
from .utils import parse_timedelta


logger = logging.getLogger(__name__)


Expand Down
5 changes: 2 additions & 3 deletions distributed/cfexecutor.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import concurrent.futures as cf
import weakref
from concurrent import futures as cf

from tlz import merge

from tornado import gen

from .metrics import time
from .utils import sync, TimeoutError
from .utils import TimeoutError, sync


@gen.coroutine
Expand Down
7 changes: 3 additions & 4 deletions distributed/cli/dask_scheduler.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
import atexit
import logging
import gc
import logging
import os
import re
import sys
import warnings

import click
import dask

from tornado.ioloop import IOLoop

from distributed import Scheduler
from distributed.preloading import validate_preload_argv
from distributed.cli.utils import check_python_3, install_signal_handlers
from distributed.utils import deserialize_for_cli
from distributed.preloading import validate_preload_argv
from distributed.proctitle import (
enable_proctitle_on_children,
enable_proctitle_on_current,
)
from distributed.utils import deserialize_for_cli

logger = logging.getLogger("distributed.scheduler")

Expand Down
5 changes: 3 additions & 2 deletions distributed/cli/dask_spec.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import asyncio
import click
import json
import os
import sys
import yaml

import click
import dask.config
import yaml

from distributed.deploy.spec import run_spec
from distributed.utils import deserialize_for_cli

Expand Down
2 changes: 1 addition & 1 deletion distributed/cli/dask_ssh.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from distributed.deploy.old_ssh import SSHCluster
import click

from distributed.cli.utils import check_python_3
from distributed.deploy.old_ssh import SSHCluster


@click.command(
Expand Down
10 changes: 5 additions & 5 deletions distributed/cli/dask_worker.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import asyncio
import atexit
from contextlib import suppress
import logging
import gc
import logging
import os
import signal
import sys
import warnings
from contextlib import suppress

import click
import dask
from dask.system import CPU_COUNT
from tlz import valmap
from tornado.ioloop import IOLoop, TimeoutError

from distributed import Nanny
from distributed.cli.utils import check_python_3, install_signal_handlers
from distributed.comm import get_address_host_port
Expand All @@ -22,9 +25,6 @@
)
from distributed.utils import deserialize_for_cli, import_term

from tlz import valmap
from tornado.ioloop import IOLoop, TimeoutError

logger = logging.getLogger("distributed.dask_worker")


Expand Down
14 changes: 7 additions & 7 deletions distributed/cli/tests/test_dask_scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
pytest.importorskip("requests")

import os
import requests
import socket
import shutil
import socket
import sys
import tempfile
from time import sleep

import requests
from click.testing import CliRunner

import distributed
from distributed import Scheduler, Client
import distributed.cli.dask_scheduler
from distributed import Client, Scheduler
from distributed.metrics import time
from distributed.utils import get_ip, get_ip_interface, tmpfile
from distributed.utils_test import loop # noqa: F401
from distributed.utils_test import (
popen,
assert_can_connect_from_everywhere_4_6,
assert_can_connect_locally_4,
popen,
)
from distributed.utils_test import loop # noqa: F401
from distributed.metrics import time
import distributed.cli.dask_scheduler


def test_defaults(loop):
Expand Down
5 changes: 3 additions & 2 deletions distributed/cli/tests/test_dask_spec.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import pytest
import sys

import pytest
import yaml

from distributed import Client
from distributed.utils_test import popen
from distributed.utils_test import cleanup # noqa: F401
from distributed.utils_test import popen


@pytest.mark.asyncio
Expand Down
1 change: 1 addition & 0 deletions distributed/cli/tests/test_dask_ssh.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from click.testing import CliRunner

from distributed.cli.dask_ssh import main


Expand Down
19 changes: 13 additions & 6 deletions distributed/cli/tests/test_dask_worker.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
import asyncio

import pytest
from click.testing import CliRunner

pytest.importorskip("requests")

import requests
import sys
import os
from time import sleep
import sys
from multiprocessing import cpu_count
from time import sleep

import requests

import distributed.cli.dask_worker
from distributed import Client, Scheduler
from distributed.deploy.utils import nprocesses_nthreads
from distributed.metrics import time
from distributed.utils import sync, tmpfile, parse_ports
from distributed.utils_test import popen, terminate_process, wait_for_port
from distributed.utils_test import loop, cleanup # noqa: F401
from distributed.utils import parse_ports, sync, tmpfile
from distributed.utils_test import ( # noqa: F401
cleanup,
loop,
popen,
terminate_process,
wait_for_port,
)


def test_nanny_worker_ports(loop):
Expand Down
9 changes: 4 additions & 5 deletions distributed/cli/tests/test_tls_cli.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
from time import sleep

from distributed import Client
from distributed.metrics import time
from distributed.utils_test import loop # noqa: F401
from distributed.utils_test import (
popen,
get_cert,
new_config_file,
tls_security,
popen,
tls_only_config,
tls_security,
)
from distributed.utils_test import loop # noqa: F401
from distributed.metrics import time


ca_file = get_cert("tls-ca-cert.pem")
cert = get_cert("tls-cert.pem")
Expand Down
1 change: 0 additions & 1 deletion distributed/cli/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from tornado.ioloop import IOLoop


py3_err_msg = """
Warning: Your terminal does not set locales.

Expand Down
Loading