align black and ruff

Author: willingc

Diff for: papermill/__main__.py

@@ -1,4 +1,4 @@
 from papermill.cli import papermill
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     papermill()

Diff for: papermill/abs.py

@@ -32,7 +32,9 @@ def _split_url(self, url):
         see: https://docs.microsoft.com/en-us/azure/storage/common/storage-dotnet-shared-access-signature-part-1  # noqa: E501
         abs://myaccount.blob.core.windows.net/sascontainer/sasblob.txt?sastoken
         """
-        match = re.match(r"abs://(.*)\.blob\.core\.windows\.net\/(.*?)\/([^\?]*)\??(.*)$", url)
+        match = re.match(
+            r"abs://(.*)\.blob\.core\.windows\.net\/(.*?)\/([^\?]*)\??(.*)$", url
+        )
         if not match:
             raise Exception(f"Invalid azure blob url '{url}'")
         else:
@@ -48,22 +50,32 @@ def read(self, url):
         """Read storage at a given url"""
         params = self._split_url(url)
         output_stream = io.BytesIO()
-        blob_service_client = self._blob_service_client(params["account"], params["sas_token"])
-        blob_client = blob_service_client.get_blob_client(params['container'], params['blob'])
+        blob_service_client = self._blob_service_client(
+            params["account"], params["sas_token"]
+        )
+        blob_client = blob_service_client.get_blob_client(
+            params["container"], params["blob"]
+        )
         blob_client.download_blob().readinto(output_stream)
         output_stream.seek(0)
         return [line.decode("utf-8") for line in output_stream]
 
     def listdir(self, url):
         """Returns a list of the files under the specified path"""
         params = self._split_url(url)
-        blob_service_client = self._blob_service_client(params["account"], params["sas_token"])
+        blob_service_client = self._blob_service_client(
+            params["account"], params["sas_token"]
+        )
         container_client = blob_service_client.get_container_client(params["container"])
         return list(container_client.list_blobs(params["blob"]))
 
     def write(self, buf, url):
         """Write buffer to storage at a given url"""
         params = self._split_url(url)
-        blob_service_client = self._blob_service_client(params["account"], params["sas_token"])
-        blob_client = blob_service_client.get_blob_client(params['container'], params['blob'])
+        blob_service_client = self._blob_service_client(
+            params["account"], params["sas_token"]
+        )
+        blob_client = blob_service_client.get_blob_client(
+            params["container"], params["blob"]
+        )
         blob_client.upload_blob(data=buf, overwrite=True)

Diff for: papermill/adl.py

@@ -21,7 +21,7 @@ def __init__(self):
 
     @classmethod
     def _split_url(cls, url):
-        match = re.match(r'adl://(.*)\.azuredatalakestore\.net\/(.*)$', url)
+        match = re.match(r"adl://(.*)\.azuredatalakestore\.net\/(.*)$", url)
         if not match:
             raise Exception(f"Invalid ADL url '{url}'")
         else:
@@ -60,5 +60,5 @@ def write(self, buf, url):
         """Write buffer to storage at a given url"""
         (store_name, path) = self._split_url(url)
         adapter = self._create_adapter(store_name)
-        with adapter.open(path, 'wb') as f:
+        with adapter.open(path, "wb") as f:
             f.write(buf.encode())

Diff for: papermill/cli.py

@@ -36,112 +36,147 @@ def print_papermill_version(ctx, param, value):
     ctx.exit()
 
 
-@click.command(context_settings=dict(help_option_names=['-h', '--help']))
+@click.command(context_settings=dict(help_option_names=["-h", "--help"]))
 @click.pass_context
-@click.argument('notebook_path', required=not INPUT_PIPED)
-@click.argument('output_path', default="")
+@click.argument("notebook_path", required=not INPUT_PIPED)
+@click.argument("output_path", default="")
 @click.option(
-    '--help-notebook',
+    "--help-notebook",
     is_flag=True,
     default=False,
-    help='Display parameters information for the given notebook path.',
+    help="Display parameters information for the given notebook path.",
 )
-@click.option('--parameters', '-p', nargs=2, multiple=True, help='Parameters to pass to the parameters cell.')
-@click.option('--parameters_raw', '-r', nargs=2, multiple=True, help='Parameters to be read as raw string.')
-@click.option('--parameters_file', '-f', multiple=True, help='Path to YAML file containing parameters.')
-@click.option('--parameters_yaml', '-y', multiple=True, help='YAML string to be used as parameters.')
-@click.option('--parameters_base64', '-b', multiple=True, help='Base64 encoded YAML string as parameters.')
 @click.option(
-    '--inject-input-path',
+    "--parameters",
+    "-p",
+    nargs=2,
+    multiple=True,
+    help="Parameters to pass to the parameters cell.",
+)
+@click.option(
+    "--parameters_raw",
+    "-r",
+    nargs=2,
+    multiple=True,
+    help="Parameters to be read as raw string.",
+)
+@click.option(
+    "--parameters_file",
+    "-f",
+    multiple=True,
+    help="Path to YAML file containing parameters.",
+)
+@click.option(
+    "--parameters_yaml",
+    "-y",
+    multiple=True,
+    help="YAML string to be used as parameters.",
+)
+@click.option(
+    "--parameters_base64",
+    "-b",
+    multiple=True,
+    help="Base64 encoded YAML string as parameters.",
+)
+@click.option(
+    "--inject-input-path",
     is_flag=True,
     default=False,
     help="Insert the path of the input notebook as PAPERMILL_INPUT_PATH as a notebook parameter.",
 )
 @click.option(
-    '--inject-output-path',
+    "--inject-output-path",
     is_flag=True,
     default=False,
     help="Insert the path of the output notebook as PAPERMILL_OUTPUT_PATH as a notebook parameter.",
 )
 @click.option(
-    '--inject-paths',
+    "--inject-paths",
     is_flag=True,
     default=False,
     help=(
         "Insert the paths of input/output notebooks as PAPERMILL_INPUT_PATH/PAPERMILL_OUTPUT_PATH"
         " as notebook parameters."
     ),
 )
-@click.option('--engine', help='The execution engine name to use in evaluating the notebook.')
 @click.option(
-    '--request-save-on-cell-execute/--no-request-save-on-cell-execute',
+    "--engine", help="The execution engine name to use in evaluating the notebook."
+)
+@click.option(
+    "--request-save-on-cell-execute/--no-request-save-on-cell-execute",
     default=True,
-    help='Request save notebook after each cell execution',
+    help="Request save notebook after each cell execution",
 )
 @click.option(
-    '--autosave-cell-every',
+    "--autosave-cell-every",
     default=30,
     type=int,
-    help='How often in seconds to autosave the notebook during long cell executions (0 to disable)',
+    help="How often in seconds to autosave the notebook during long cell executions (0 to disable)",
 )
 @click.option(
-    '--prepare-only/--prepare-execute',
+    "--prepare-only/--prepare-execute",
     default=False,
     help="Flag for outputting the notebook without execution, but with parameters applied.",
 )
 @click.option(
-    '--kernel',
-    '-k',
-    help='Name of kernel to run. Ignores kernel name in the notebook document metadata.',
+    "--kernel",
+    "-k",
+    help="Name of kernel to run. Ignores kernel name in the notebook document metadata.",
+)
+@click.option(
+    "--language",
+    "-l",
+    help="Language for notebook execution. Ignores language in the notebook document metadata.",
 )
+@click.option("--cwd", default=None, help="Working directory to run notebook in.")
 @click.option(
-    '--language',
-    '-l',
-    help='Language for notebook execution. Ignores language in the notebook document metadata.',
+    "--progress-bar/--no-progress-bar",
+    default=None,
+    help="Flag for turning on the progress bar.",
 )
-@click.option('--cwd', default=None, help='Working directory to run notebook in.')
-@click.option('--progress-bar/--no-progress-bar', default=None, help="Flag for turning on the progress bar.")
 @click.option(
-    '--log-output/--no-log-output',
+    "--log-output/--no-log-output",
     default=False,
     help="Flag for writing notebook output to the configured logger.",
 )
 @click.option(
-    '--stdout-file',
-    type=click.File(mode='w', encoding='utf-8'),
+    "--stdout-file",
+    type=click.File(mode="w", encoding="utf-8"),
     help="File to write notebook stdout output to.",
 )
 @click.option(
-    '--stderr-file',
-    type=click.File(mode='w', encoding='utf-8'),
+    "--stderr-file",
+    type=click.File(mode="w", encoding="utf-8"),
     help="File to write notebook stderr output to.",
 )
 @click.option(
-    '--log-level',
-    type=click.Choice(['NOTSET', 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']),
-    default='INFO',
-    help='Set log level',
+    "--log-level",
+    type=click.Choice(["NOTSET", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]),
+    default="INFO",
+    help="Set log level",
 )
 @click.option(
-    '--start-timeout',
-    '--start_timeout',  # Backwards compatible naming
+    "--start-timeout",
+    "--start_timeout",  # Backwards compatible naming
     type=int,
     default=60,
     help="Time in seconds to wait for kernel to start.",
 )
 @click.option(
-    '--execution-timeout',
+    "--execution-timeout",
     type=int,
     help="Time in seconds to wait for each cell before failing execution (default: forever)",
 )
-@click.option('--report-mode/--no-report-mode', default=False, help="Flag for hiding input.")
 @click.option(
-    '--version',
+    "--report-mode/--no-report-mode", default=False, help="Flag for hiding input."
+)
+@click.option(
+    "--version",
     is_flag=True,
     callback=print_papermill_version,
     expose_value=False,
     is_eager=True,
-    help='Flag for displaying the version.',
+    help="Flag for displaying the version.",
 )
 def papermill(
     click_ctx,
@@ -189,28 +224,28 @@ def papermill(
 
     """
     # Jupyter deps use frozen modules, so we disable the python 3.11+ warning about debugger if running the CLI
-    if 'PYDEVD_DISABLE_FILE_VALIDATION' not in os.environ:
-        os.environ['PYDEVD_DISABLE_FILE_VALIDATION'] = '1'
+    if "PYDEVD_DISABLE_FILE_VALIDATION" not in os.environ:
+        os.environ["PYDEVD_DISABLE_FILE_VALIDATION"] = "1"
 
     if not help_notebook:
         required_output_path = not (INPUT_PIPED or OUTPUT_PIPED)
         if required_output_path and not output_path:
             raise click.UsageError("Missing argument 'OUTPUT_PATH'")
 
     if INPUT_PIPED and notebook_path and not output_path:
-        input_path = '-'
+        input_path = "-"
         output_path = notebook_path
     else:
-        input_path = notebook_path or '-'
-        output_path = output_path or '-'
+        input_path = notebook_path or "-"
+        output_path = output_path or "-"
 
-    if output_path == '-':
+    if output_path == "-":
         # Save notebook to stdout just once
         request_save_on_cell_execute = False
 
         # Reduce default log level if we pipe to stdout
-        if log_level == 'INFO':
-            log_level = 'ERROR'
+        if log_level == "INFO":
+            log_level = "ERROR"
 
     elif progress_bar is None:
         progress_bar = not log_output
@@ -220,11 +255,13 @@ def papermill(
     # Read in Parameters
     parameters_final = {}
     if inject_input_path or inject_paths:
-        parameters_final['PAPERMILL_INPUT_PATH'] = input_path
+        parameters_final["PAPERMILL_INPUT_PATH"] = input_path
     if inject_output_path or inject_paths:
-        parameters_final['PAPERMILL_OUTPUT_PATH'] = output_path
+        parameters_final["PAPERMILL_OUTPUT_PATH"] = output_path
     for params in parameters_base64 or []:
-        parameters_final.update(yaml.load(base64.b64decode(params), Loader=NoDatesSafeLoader) or {})
+        parameters_final.update(
+            yaml.load(base64.b64decode(params), Loader=NoDatesSafeLoader) or {}
+        )
     for files in parameters_file or []:
         parameters_final.update(read_yaml_file(files) or {})
     for params in parameters_yaml or []:

Diff for: papermill/clientwrap.py

@@ -27,7 +27,9 @@ def __init__(self, nb_man, km=None, raise_on_iopub_timeout=True, **kw):
             Optional kernel manager. If none is provided, a kernel manager will
             be created.
         """
-        super().__init__(nb_man.nb, km=km, raise_on_iopub_timeout=raise_on_iopub_timeout, **kw)
+        super().__init__(
+            nb_man.nb, km=km, raise_on_iopub_timeout=raise_on_iopub_timeout, **kw
+        )
         self.nb_man = nb_man
 
     def execute(self, **kwargs):
@@ -37,14 +39,18 @@ def execute(self, **kwargs):
         self.reset_execution_trackers()
 
         # See https://bugs.python.org/issue37373 :(
-        if sys.version_info[0] == 3 and sys.version_info[1] >= 8 and sys.platform.startswith('win'):
+        if (
+            sys.version_info[0] == 3
+            and sys.version_info[1] >= 8
+            and sys.platform.startswith("win")
+        ):
             asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
         with self.setup_kernel(**kwargs):
             self.log.info("Executing notebook with kernel: %s" % self.kernel_name)
             self.papermill_execute_cells()
             info_msg = self.wait_for_reply(self.kc.kernel_info())
-            self.nb.metadata['language_info'] = info_msg['content']['language_info']
+            self.nb.metadata["language_info"] = info_msg["content"]["language_info"]
             self.set_widgets_metadata()
 
         return self.nb
@@ -71,7 +77,9 @@ def papermill_execute_cells(self):
                 self.nb_man.cell_start(cell, index)
                 self.execute_cell(cell, index)
             except CellExecutionError as ex:
-                self.nb_man.cell_exception(self.nb.cells[index], cell_index=index, exception=ex)
+                self.nb_man.cell_exception(
+                    self.nb.cells[index], cell_index=index, exception=ex
+                )
                 break
             finally:
                 self.nb_man.cell_complete(self.nb.cells[index], cell_index=index)
@@ -100,7 +108,7 @@ def log_output_message(self, output):
                     self.stderr_file.write(content)
                     self.stderr_file.flush()
         elif self.log_output and ("data" in output and "text/plain" in output.data):
-            self.log.info("".join(output.data['text/plain']))
+            self.log.info("".join(output.data["text/plain"]))
 
     def process_message(self, *arg, **kwargs):
         output = super().process_message(*arg, **kwargs)