run pre-commit hook

This commit is contained in:
Min RK
2019-09-19 15:51:02 +02:00
parent 949d8d0bfa
commit ac32ae496e
7 changed files with 20 additions and 17 deletions

View File

@@ -4,5 +4,5 @@
alabaster_jupyterhub
recommonmark==0.5.0
sphinx-copybutton
sphinx>=1.7
sphinx-jsonschema
sphinx>=1.7

View File

@@ -19,7 +19,7 @@ extensions = [
'sphinx.ext.napoleon',
'autodoc_traits',
'sphinx_copybutton',
'sphinx-jsonschema'
'sphinx-jsonschema',
]
templates_path = ['_templates']

View File

@@ -5,19 +5,19 @@
import asyncio
import atexit
import binascii
import json
import logging
import os
import re
import signal
import socket
import sys
import json
from glob import glob
from concurrent.futures import ThreadPoolExecutor
from datetime import datetime
from datetime import timezone
from functools import partial
from getpass import getuser
from glob import glob
from operator import itemgetter
from textwrap import dedent
from urllib.parse import unquote
@@ -2073,7 +2073,7 @@ class JupyterHub(Application):
internal_ssl_ca=self.internal_ssl_ca,
trusted_alt_names=self.trusted_alt_names,
shutdown_on_logout=self.shutdown_on_logout,
eventlog=self.eventlog
eventlog=self.eventlog,
)
# allow configured settings to have priority
settings.update(self.tornado_settings)
@@ -2109,7 +2109,6 @@ class JupyterHub(Application):
continue
self.eventlog.register_schema_file(os.path.join(dirname, file))
def write_pid_file(self):
pid = os.getpid()
if self.pid_file:

View File

@@ -850,11 +850,11 @@ class BaseHandler(RequestHandler):
SERVER_SPAWN_DURATION_SECONDS.labels(
status=ServerSpawnStatus.success
).observe(time.perf_counter() - spawn_start_time)
self.eventlog.record_event('hub.jupyter.org/server-action', 1, {
'action': 'start',
'username': user.name,
'servername': server_name
})
self.eventlog.record_event(
'hub.jupyter.org/server-action',
1,
{'action': 'start', 'username': user.name, 'servername': server_name},
)
proxy_add_start_time = time.perf_counter()
spawner._proxy_pending = True
try:
@@ -1035,11 +1035,15 @@ class BaseHandler(RequestHandler):
SERVER_STOP_DURATION_SECONDS.labels(
status=ServerStopStatus.success
).observe(toc - tic)
self.eventlog.record_event('hub.jupyter.org/server-action', 1, {
self.eventlog.record_event(
'hub.jupyter.org/server-action',
1,
{
'action': 'stop',
'username': user.name,
'servername': server_name
})
'servername': server_name,
},
)
except:
SERVER_STOP_DURATION_SECONDS.labels(
status=ServerStopStatus.failure

View File

@@ -3,6 +3,7 @@ async_generator>=1.8
certipy>=0.1.2
entrypoints
jinja2
jupyter_telemetry
oauthlib>=3.0
pamela
prometheus_client>=0.0.21
@@ -11,4 +12,3 @@ requests
SQLAlchemy>=1.1
tornado>=5.0
traitlets>=4.3.2
jupyter_telemetry