run ruff via pre-commit

bower-lite

@@ -7,6 +7,7 @@ bower-lite
 Since Bower's on its way out,
 stage frontend dependencies from node_modules into components
 """
+
 import json
 import os
 import shutil

examples/bootstrap-script/jupyterhub_config.py

@@ -27,6 +27,7 @@ def clean_dir_hook(spawner):
     if os.path.exists(temp_path) and os.path.isdir(temp_path):
         shutil.rmtree(temp_path)
 
+
 c = get_config()  # noqa
 
 # attach the hook functions to the spawner

examples/server-api/start-stop-server.py

@@ -9,6 +9,7 @@ Example of starting/stopping a server via the JupyterHub API
 5. stop server via API
 6. wait for server to finish stopping
 """
+
 import json
 import logging
 import pathlib

examples/service-whoami-flask/whoami-flask.py

@@ -2,6 +2,7 @@
 """
 whoami service authentication with the Hub
 """
+
 import json
 import os
 import secrets

examples/spawn-form/jupyterhub_config.py

@@ -8,6 +8,7 @@ from jupyterhub.spawner import LocalProcessSpawner
 
 c = get_config()  # noqa
 
+
 class DemoFormSpawner(LocalProcessSpawner):
     def _options_form_default(self):
         default_env = "YOURNAME=%s\n" % self.user.name

examples/user-sharing/share-api.ipynb

@@ -254,14 +254,15 @@
     }
    ],
    "source": [
-    "from IPython.display import display, HTML\n",
+    "from IPython.display import HTML, display\n",
+    "\n",
     "full_accept_url = f\"{hub_host}{code_info['accept_url']}\"\n",
     "\n",
     "display(\n",
     "    HTML(f\"\"\"\n",
     "    <a href='{full_accept_url}'>share this link to grant access</a>\n",
     "    \"\"\")\n",
-    ")\n"
+    ")"
    ]
   },
   {
@@ -347,7 +348,9 @@
     "from urllib.parse import urlencode\n",
     "\n",
     "this_notebook_url = server_base_url + \"lab/tree/share-api.ipynb\"\n",
-    "this_notebook_accept_url = full_accept_url + \"&\" + urlencode({\"next\": this_notebook_url})\n",
+    "this_notebook_accept_url = (\n",
+    "    full_accept_url + \"&\" + urlencode({\"next\": this_notebook_url})\n",
+    ")\n",
     "print(this_notebook_accept_url)\n",
     "\n",
     "display(\n",
@@ -355,7 +358,7 @@
     "    share <a href='{this_notebook_accept_url}'>this link</a>\n",
     "    to grant access and direct users to this notebook\n",
     "    \"\"\")\n",
-    ")\n"
+    ")"
    ]
   },
   {
@@ -488,16 +491,16 @@
     "import json\n",
     "\n",
     "options = {\n",
-    "  \"scopes\": [\n",
+    "    \"scopes\": [\n",
-    "    f\"access:servers!server={user_server}\", # access the server (default)\n",
+    "        f\"access:servers!server={user_server}\",  # access the server (default)\n",
-    "    f\"servers!server={user_server}\", # start/stop the server\n",
+    "        f\"servers!server={user_server}\",  # start/stop the server\n",
-    "    f\"shares!server={user_server}\", # further share the server with others\n",
+    "        f\"shares!server={user_server}\",  # further share the server with others\n",
-    "  ],\n",
+    "    ],\n",
-    "  \"expires_in\": 3600, # code expires in one hour\n",
+    "    \"expires_in\": 3600,  # code expires in one hour\n",
     "}\n",
     "\n",
     "\n",
-    "session.post(share_codes_url, data=json.dumps(options))\n"
+    "session.post(share_codes_url, data=json.dumps(options))"
    ]
   },
   {
@@ -598,7 +601,7 @@
     "    \"user\": \"shared-with\",\n",
     "}\n",
     "\n",
-    "session.patch(shares_url, data=json.dumps(options))\n"
+    "session.patch(shares_url, data=json.dumps(options))"
    ]
   },
   {

jupyterhub/alembic/versions/19c0846f6344_base_revision_for_0_5.py

@@ -1,7 +1,7 @@
 """base revision for 0.5
 
 Revision ID: 19c0846f6344
-Revises: 
+Revises:
 Create Date: 2016-04-11 16:05:34.873288
 
 """

jupyterhub/apihandlers/users.py

@@ -593,10 +593,8 @@ class UserServerAPIHandler(APIHandler):
                 if named_server_limit_per_user <= len(named_spawners):
                     raise web.HTTPError(
                         400,
-                        "User {} already has the maximum of {} named servers."
+                        f"User {user_name} already has the maximum of {named_server_limit_per_user} named servers."
-                        "  One must be deleted before a new server can be created".format(
+                        "  One must be deleted before a new server can be created",
-                            user_name, named_server_limit_per_user
-                        ),
                     )
         spawner = user.get_spawner(server_name, replace_failed=True)
         pending = spawner.pending

jupyterhub/app.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 """The multi-user notebook application"""
+
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 import asyncio
@@ -24,7 +25,6 @@ from textwrap import dedent
 from typing import Optional
 from urllib.parse import unquote, urlparse, urlunparse
 
-
 import tornado.httpserver
 import tornado.options
 from dateutil.parser import parse as parse_date
@@ -3315,9 +3315,7 @@ class JupyterHub(Application):
         config_file_dir = os.path.dirname(os.path.abspath(self.config_file))
         if not os.path.isdir(config_file_dir):
             self.exit(
-                "{} does not exist. The destination directory must exist before generating config file.".format(
+                f"{config_file_dir} does not exist. The destination directory must exist before generating config file."
-                    config_file_dir
-                )
             )
         if os.path.exists(self.config_file) and not self.answer_yes:
             answer = ''

jupyterhub/auth.py

@@ -196,12 +196,7 @@ class Authenticator(LoggingConfigurable):
             # protects backward-compatible config from warnings
             # if they set the same value under both names
             self.log.warning(
-                "{cls}.{old} is deprecated in JupyterHub {version}, use {cls}.{new} instead".format(
+                f"{self.__class__.__name__}.{old_attr} is deprecated in JupyterHub {version}, use {self.__class__.__name__}.{new_attr} instead"
-                    cls=self.__class__.__name__,
-                    old=old_attr,
-                    new=new_attr,
-                    version=version,
-                )
             )
             setattr(self, new_attr, change.new)
 
@@ -377,9 +372,7 @@ class Authenticator(LoggingConfigurable):
                     break
                 if has_old_name and not has_new_name:
                     warnings.warn(
-                        "{0}.{1} should be renamed to {0}.{2} for JupyterHub >= 1.2".format(
+                        f"{cls.__name__}.{old_name} should be renamed to {cls.__name__}.{new_name} for JupyterHub >= 1.2",
-                            cls.__name__, old_name, new_name
-                        ),
                         DeprecationWarning,
                     )
 
@@ -399,19 +392,17 @@ class Authenticator(LoggingConfigurable):
             ):
                 # adapt to pre-1.0 signature for compatibility
                 warnings.warn(
-                    """
+                    f"""
-                    {0}.{1} does not support the authentication argument,
+                    {self.__class__.__name__}.{old_name} does not support the authentication argument,
-                    added in JupyterHub 1.0. and is renamed to {2} in JupyterHub 1.2.
+                    added in JupyterHub 1.0. and is renamed to {new_name} in JupyterHub 1.2.
 
                     It should have the signature:
 
-                    def {2}(self, username, authentication=None):
+                    def {new_name}(self, username, authentication=None):
                         ...
 
                     Adapting for compatibility.
-                    """.format(
+                    """,
-                        self.__class__.__name__, old_name, new_name
-                    ),
                     DeprecationWarning,
                 )
 

jupyterhub/handlers/base.py

@@ -1519,9 +1519,9 @@ class UserUrlHandler(BaseHandler):
             json.dumps(
                 {
                     "message": (
-                        "JupyterHub server no longer running at {}."
+                        f"JupyterHub server no longer running at {self.request.path[len(self.hub.base_url) - 1 :]}."
-                        " Restart the server at {}"
+                        f" Restart the server at {spawn_url}"
-                    ).format(self.request.path[len(self.hub.base_url) - 1 :], spawn_url)
+                    )
                 }
             )
         )

jupyterhub/handlers/pages.py

@@ -142,10 +142,8 @@ class SpawnHandler(BaseHandler):
                 if named_server_limit_per_user <= len(named_spawners):
                     raise web.HTTPError(
                         400,
-                        "User {} already has the maximum of {} named servers."
+                        f"User {user.name} already has the maximum of {named_server_limit_per_user} named servers."
-                        "  One must be deleted before a new server can be created".format(
+                        "  One must be deleted before a new server can be created",
-                            user.name, named_server_limit_per_user
-                        ),
                     )
 
         if not self.allow_named_servers and user.running:
@@ -554,7 +552,6 @@ class TokenPageHandler(BaseHandler):
 
 
 class AcceptShareHandler(BaseHandler):
-
     def _get_next_url(self, owner, spawner):
         """Get next_url for a given owner/spawner"""
         next_url = self.get_argument("next", "")

jupyterhub/orm.py

@@ -202,12 +202,7 @@ class Role(Base):
     groups = relationship('Group', secondary='group_role_map', back_populates='roles')
 
     def __repr__(self):
-        return "<{} {} ({}) - scopes: {}>".format(
+        return f"<{self.__class__.__name__} {self.name} ({self.description}) - scopes: {self.scopes}>"
-            self.__class__.__name__,
-            self.name,
-            self.description,
-            self.scopes,
-        )
 
     @classmethod
     def find(cls, db, name):
@@ -365,12 +360,7 @@ class User(Base):
     kind = "user"
 
     def __repr__(self):
-        return "<{cls}({name} {running}/{total} running)>".format(
+        return f"<{self.__class__.__name__}({self.name} {sum(bool(s.server) for s in self._orm_spawners)}/{len(self._orm_spawners)} running)>"
-            cls=self.__class__.__name__,
-            name=self.name,
-            total=len(self._orm_spawners),
-            running=sum(bool(s.server) for s in self._orm_spawners),
-        )
 
     def new_api_token(self, token=None, **kwargs):
         """Create a new API token
@@ -1098,13 +1088,7 @@ class APIToken(Hashed, Base):
             # this shouldn't happen
             kind = 'owner'
             name = 'unknown'
-        return "<{cls}('{pre}...', {kind}='{name}', client_id={client_id!r})>".format(
+        return f"<{self.__class__.__name__}('{self.prefix}...', {kind}='{name}', client_id={self.client_id!r})>"
-            cls=self.__class__.__name__,
-            pre=self.prefix,
-            kind=kind,
-            name=name,
-            client_id=self.client_id,
-        )
 
     @classmethod
     def find(cls, db, token, *, kind=None):

jupyterhub/proxy.py

@@ -686,7 +686,9 @@ class ConfigurableHTTPProxy(Proxy):
         cmd = []
         proxy_api = 'proxy-api'
         proxy_client = 'proxy-client'
-        api_key = self.app.internal_proxy_certs[proxy_api][
+        api_key = self.app.internal_proxy_certs[
+            proxy_api
+        ][
             'keyfile'
         ]  # Check content in next test and just patch manulaly or in the config of the file
         api_cert = self.app.internal_proxy_certs[proxy_api]['certfile']

jupyterhub/scopes.py

@@ -1270,9 +1270,7 @@ def define_custom_scopes(scopes):
                 },
             }
         )
-    """ % indent(
+    """ % indent(_custom_scope_description, " " * 8)
-        _custom_scope_description, " " * 8
-    )
     for scope, scope_definition in scopes.items():
         if scope in scope_definitions and scope_definitions[scope] != scope_definition:
             raise ValueError(

jupyterhub/singleuser/_disable_user_config.py

@@ -82,7 +82,10 @@ def _disable_user_config(serverapp):
     assert serverapp.config_file_paths == config_file_paths
 
     # patch jupyter_path to exclude $HOME
-    global _original_jupyter_paths, _jupyter_paths_without_home, _original_jupyter_config_dir
+    global \
+        _original_jupyter_paths, \
+        _jupyter_paths_without_home, \
+        _original_jupyter_config_dir
     _original_jupyter_paths = paths.jupyter_path()
     _jupyter_paths_without_home = list(_exclude_home(_original_jupyter_paths))
 

jupyterhub/singleuser/mixins.py

@@ -6,6 +6,7 @@ Meant to be compatible with jupyter_server and classic notebook
 Use make_singleuser_app to create a compatible Application class
 with JupyterHub authentication mixins enabled.
 """
+
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 import asyncio

jupyterhub/tests/test_named_servers.py

@@ -172,9 +172,7 @@ async def test_create_named_server(
                     'pending': None,
                     'ready': True,
                     'stopped': False,
-                    'progress_url': 'PREFIX/hub/api/users/{}/servers/{}/progress'.format(
+                    'progress_url': f'PREFIX/hub/api/users/{username}/servers/{escapedname}/progress',
-                        username, escapedname
-                    ),
                     'state': {'pid': 0},
                     'user_options': {},
                 }

jupyterhub/tests/test_orm.py

@@ -73,13 +73,13 @@ def test_user(db):
 
 
 def test_user_escaping(db):
-    orm_user = orm.User(name='company\\user@company.com,\"quoted\"')
+    orm_user = orm.User(name='company\\user@company.com,"quoted"')
     db.add(orm_user)
     db.commit()
     user = User(orm_user)
-    assert user.name == 'company\\user@company.com,\"quoted\"'
+    assert user.name == 'company\\user@company.com,"quoted"'
     assert user.escaped_name == 'company%5Cuser@company.com%2C%22quoted%22'
-    assert user.json_escaped_name == 'company\\\\user@company.com,\\\"quoted\\\"'
+    assert user.json_escaped_name == 'company\\\\user@company.com,\\"quoted\\"'
 
 
 def test_tokens(db):

jupyterhub/tests/test_proxy.py

@@ -10,9 +10,8 @@ import pytest
 from traitlets import TraitError
 from traitlets.config import Config
 
-from ..utils import random_port
+from ..utils import random_port, wait_for_http_server
 from ..utils import url_path_join as ujoin
-from ..utils import wait_for_http_server
 from .mocking import MockHub
 from .test_api import add_user, api_request
 from .utils import skip_if_ssl

jupyterhub/user.py

@@ -954,9 +954,7 @@ class User:
             else:
                 e.reason = 'error'
                 self.log.exception(
-                    "Unhandled error waiting for {user}'s server to show up at {url}: {error}".format(
+                    f"Unhandled error waiting for {self.name}'s server to show up at {server.url}: {e}"
-                        user=self.name, url=server.url, error=e
-                    )
                 )
                 self.settings['statsd'].incr('spawner.failure.http_error')
             try:

jupyterhub/utils.py

@@ -503,17 +503,14 @@ def print_ps_info(file=sys.stderr):
     threadlen = len('threads')
 
     print(
-        "{} {} {} {}".format('%CPU'.ljust(cpulen), 'MEM'.ljust(memlen), 'FDs'.ljust(fdlen), 'threads'),
+        "{} {} {} {}".format(
+            '%CPU'.ljust(cpulen), 'MEM'.ljust(memlen), 'FDs'.ljust(fdlen), 'threads'
+        ),
         file=file,
     )
 
     print(
-        "{} {} {} {}".format(
+        f"{cpu_s.ljust(cpulen)} {mem_s.ljust(memlen)} {fd_s.ljust(fdlen)} {str(p.num_threads()).ljust(7)}",
-            cpu_s.ljust(cpulen),
-            mem_s.ljust(memlen),
-            fd_s.ljust(fdlen),
-            str(p.num_threads()).ljust(7),
-        ),
         file=file,
     )