update back pre-commit hook

specify minimum target_version as py36

results in some churn
This commit is contained in:
Min RK
2020-11-30 10:13:10 +01:00
parent 5664e4d318
commit 28fdbeb0c0
16 changed files with 57 additions and 41 deletions

View File

@@ -4,7 +4,7 @@ repos:
hooks:
- id: reorder-python-imports
- repo: https://github.com/psf/black
rev: 19.10b0
rev: 20.8b1
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks

View File

@@ -101,7 +101,10 @@ class Authenticator(LoggingConfigurable):
"""
).tag(config=True)
whitelist = Set(help="Deprecated, use `Authenticator.allowed_users`", config=True,)
whitelist = Set(
help="Deprecated, use `Authenticator.allowed_users`",
config=True,
)
allowed_users = Set(
help="""
@@ -715,7 +718,9 @@ for _old_name, _new_name, _version in [
("check_blacklist", "check_blocked_users", "1.2"),
]:
setattr(
Authenticator, _old_name, _deprecated_method(_old_name, _new_name, _version),
Authenticator,
_old_name,
_deprecated_method(_old_name, _new_name, _version),
)
@@ -778,7 +783,9 @@ class LocalAuthenticator(Authenticator):
"""
).tag(config=True)
group_whitelist = Set(help="""DEPRECATED: use allowed_groups""",).tag(config=True)
group_whitelist = Set(
help="""DEPRECATED: use allowed_groups""",
).tag(config=True)
allowed_groups = Set(
help="""

View File

@@ -489,7 +489,7 @@ class BaseHandler(RequestHandler):
self.clear_cookie(
'jupyterhub-services',
path=url_path_join(self.base_url, 'services'),
**kwargs
**kwargs,
)
# Reset _jupyterhub_user
self._jupyterhub_user = None
@@ -1485,10 +1485,14 @@ class UserUrlHandler(BaseHandler):
# if request is expecting JSON, assume it's an API request and fail with 503
# because it won't like the redirect to the pending page
if get_accepted_mimetype(
if (
get_accepted_mimetype(
self.request.headers.get('Accept', ''),
choices=['application/json', 'text/html'],
) == 'application/json' or 'api' in user_path.split('/'):
)
== 'application/json'
or 'api' in user_path.split('/')
):
self._fail_api_request(user_name, server_name)
return

View File

@@ -256,7 +256,7 @@ class JupyterHubRequestValidator(RequestValidator):
self.db.commit()
def get_authorization_code_scopes(self, client_id, code, redirect_uri, request):
""" Extracts scopes from saved authorization code.
"""Extracts scopes from saved authorization code.
The scopes returned by this method is used to route token requests
based on scopes passed to Authorization Code requests.
With that the token endpoint knows when to include OpenIDConnect

View File

@@ -182,7 +182,8 @@ async def test_get_users(app):
@mark.user
@mark.parametrize(
"state", ("inactive", "active", "ready", "invalid"),
"state",
("inactive", "active", "ready", "invalid"),
)
async def test_get_users_state_filter(app, state):
db = app.db

View File

@@ -265,7 +265,8 @@ async def test_spawn_with_query_arguments(app):
next_url = ujoin(app.base_url, 'user/jones/tree')
r = await async_requests.get(
url_concat(
ujoin(base_url, 'spawn'), {'next': next_url, 'energy': '510keV'},
ujoin(base_url, 'spawn'),
{'next': next_url, 'energy': '510keV'},
),
cookies=cookies,
)

View File

@@ -258,8 +258,7 @@ async def test_shell_cmd(db, tmpdir, request):
def test_inherit_overwrite():
"""On 3.6+ we check things are overwritten at import time
"""
"""On 3.6+ we check things are overwritten at import time"""
if sys.version_info >= (3, 6):
with pytest.raises(NotImplementedError):

View File

@@ -75,8 +75,7 @@ def can_connect(ip, port):
def make_ssl_context(keyfile, certfile, cafile=None, verify=True, check_hostname=True):
"""Setup context for starting an https server or making requests over ssl.
"""
"""Setup context for starting an https server or making requests over ssl."""
if not keyfile or not certfile:
return None
purpose = ssl.Purpose.SERVER_AUTH if verify else ssl.Purpose.CLIENT_AUTH
@@ -96,7 +95,7 @@ async def exponential_backoff(
timeout=10,
timeout_tolerance=0.1,
*args,
**kwargs
**kwargs,
):
"""
Exponentially backoff until `pass_func` is true.

View File

@@ -1,2 +1,7 @@
[tool.black]
skip-string-normalization = true
target_version = [
"py36",
"py37",
"py38",
]