Skip to content

Commit f0fe025

Browse files
committed
pre-commit: run isort
1 parent bb047d8 commit f0fe025

32 files changed

+95
-106
lines changed

binderhub/app.py

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,55 @@
1515

1616
import kubernetes.client
1717
import kubernetes.config
18-
from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
19-
from tornado.httpclient import AsyncHTTPClient
20-
from tornado.httpserver import HTTPServer
2118
import tornado.ioloop
22-
import tornado.options
2319
import tornado.log
24-
from tornado.log import app_log
20+
import tornado.options
2521
import tornado.web
22+
from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader
23+
from jupyterhub.services.auth import HubOAuthCallbackHandler
24+
from jupyterhub.traitlets import Callable
25+
from tornado.httpclient import AsyncHTTPClient
26+
from tornado.httpserver import HTTPServer
27+
from tornado.log import app_log
2628
from traitlets import (
2729
Bool,
2830
Bytes,
2931
Dict,
3032
Integer,
3133
TraitError,
34+
Type,
3235
Unicode,
3336
Union,
34-
Type,
3537
default,
3638
observe,
3739
validate,
3840
)
3941
from traitlets.config import Application
40-
from jupyterhub.services.auth import HubOAuthCallbackHandler
41-
from jupyterhub.traitlets import Callable
4242

4343
from .base import AboutHandler, Custom404, VersionHandler
4444
from .build import Build
4545
from .builder import BuildHandler
4646
from .config import ConfigHandler
47+
from .events import EventLog
4748
from .health import HealthHandler
4849
from .launcher import Launcher
4950
from .log import log_request
51+
from .main import LegacyRedirectHandler, MainHandler, ParameterizedMainHandler
52+
from .metrics import MetricsHandler
5053
from .ratelimit import RateLimiter
51-
from .repoproviders import RepoProvider
5254
from .registry import DockerRegistry
53-
from .main import MainHandler, ParameterizedMainHandler, LegacyRedirectHandler
5455
from .repoproviders import (
56+
DataverseProvider,
57+
FigshareProvider,
58+
GistRepoProvider,
5559
GitHubRepoProvider,
56-
GitRepoProvider,
5760
GitLabRepoProvider,
58-
GistRepoProvider,
59-
ZenodoProvider,
60-
FigshareProvider,
61+
GitRepoProvider,
6162
HydroshareProvider,
62-
DataverseProvider,
63+
RepoProvider,
64+
ZenodoProvider,
6365
)
64-
from .metrics import MetricsHandler
65-
6666
from .utils import ByteSpecification, url_path_join
67-
from .events import EventLog
68-
6967

7068
HERE = os.path.dirname(os.path.abspath(__file__))
7169

binderhub/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import json
44
import urllib.parse
5+
from http.client import responses
56

67
import jwt
7-
from http.client import responses
8+
from jupyterhub.services.auth import HubOAuth, HubOAuthenticated
89
from tornado import web
910
from tornado.log import app_log
10-
from jupyterhub.services.auth import HubOAuthenticated, HubOAuth
1111

1212
from . import __version__ as binder_version
1313
from .ratelimit import RateLimitExceeded

binderhub/binderspawner_mixin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
- Duplicate the code here and in binderhub/binderspawner_mixin.py
1717
"""
1818
from tornado import web
19-
from traitlets.config import Configurable
2019
from traitlets import Bool, Unicode
20+
from traitlets.config import Configurable
2121

2222

2323
class BinderSpawnerMixin(Configurable):

binderhub/build.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22
Contains build of a docker image from a git repository.
33
"""
44

5-
from collections import defaultdict
65
import datetime
76
import json
87
import threading
8+
import warnings
9+
from collections import defaultdict
10+
from enum import Enum
911
from typing import Union
1012
from urllib.parse import urlparse
11-
from enum import Enum
12-
import warnings
1313

1414
from kubernetes import client, watch
1515
from tornado.ioloop import IOLoop
1616
from tornado.log import app_log
1717

18-
from .utils import rendezvous_rank, KUBE_REQUEST_TIMEOUT
18+
from .utils import KUBE_REQUEST_TIMEOUT, rendezvous_rank
1919

2020

2121
class ProgressEvent:

binderhub/build_local.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import queue
1010
import subprocess
1111
from threading import Event, Thread
12+
1213
from tornado.ioloop import IOLoop
1314
from tornado.log import app_log
1415

15-
from .build import ProgressEvent, Build
16-
16+
from .build import Build, ProgressEvent
1717

1818
DEFAULT_READ_TIMEOUT = 1
1919

binderhub/builder.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44

55
import asyncio
66
import hashlib
7-
from http.client import responses
87
import json
9-
import string
108
import re
9+
import string
1110
import time
12-
import escapism
11+
from http.client import responses
1312

1413
import docker
14+
import escapism
15+
from prometheus_client import Counter, Gauge, Histogram
1516
from tornado import gen
1617
from tornado.httpclient import HTTPClientError
17-
from tornado.web import Finish, authenticated
18-
from tornado.queues import Queue
19-
from tornado.iostream import StreamClosedError
2018
from tornado.ioloop import IOLoop
19+
from tornado.iostream import StreamClosedError
2120
from tornado.log import app_log
22-
from prometheus_client import Counter, Histogram, Gauge
21+
from tornado.queues import Queue
22+
from tornado.web import Finish, authenticated
2323

2424
from .base import BaseHandler
2525
from .build import ProgressEvent

binderhub/events.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
"""
22
Emit structured, discrete events when various actions happen.
33
"""
4-
from traitlets.config import Configurable
5-
4+
import json
65
import logging
76
from datetime import datetime
7+
88
import jsonschema
9-
from pythonjsonlogger import jsonlogger
109
from jupyterhub.traitlets import Callable
11-
import json
10+
from pythonjsonlogger import jsonlogger
11+
from traitlets.config import Configurable
1212

1313

1414
def _skip_message(record, **kwargs):

binderhub/health.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import asyncio
22
import json
33
import time
4-
54
from functools import wraps
65

76
from tornado.httpclient import AsyncHTTPClient

binderhub/launcher.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
import asyncio
55
import base64
66
import json
7+
import os
78
import random
89
import re
910
import string
10-
from urllib.parse import urlparse, quote
1111
import uuid
12-
import os
1312
from datetime import timedelta
13+
from urllib.parse import quote, urlparse
1414

15-
from tornado.log import app_log
16-
from tornado import web, gen
17-
from tornado.httpclient import AsyncHTTPClient, HTTPRequest, HTTPError
18-
from traitlets.config import LoggingConfigurable
19-
from traitlets import Integer, Unicode, Bool, default
2015
from jupyterhub.traitlets import Callable
2116
from jupyterhub.utils import maybe_future
17+
from tornado import gen, web
18+
from tornado.httpclient import AsyncHTTPClient, HTTPError, HTTPRequest
19+
from tornado.log import app_log
20+
from traitlets import Bool, Integer, Unicode, default
21+
from traitlets.config import LoggingConfigurable
2222

2323
from .utils import url_path_join
2424

binderhub/log.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,10 @@
77
import json
88
import logging
99
from http.cookies import SimpleCookie
10-
from urllib.parse import urlparse
11-
from urllib.parse import urlunparse
10+
from urllib.parse import urlparse, urlunparse
1211

1312
from tornado.log import access_log
14-
from tornado.web import HTTPError
15-
from tornado.web import StaticFileHandler
16-
13+
from tornado.web import HTTPError, StaticFileHandler
1714

1815
# url params to be scrubbed if seen
1916
# any url param that *contains* one of these

0 commit comments

Comments
 (0)