switch flake8 -> ruff

.gitignore

@@ -123,3 +123,7 @@ pip-wheel-metadata
 
 # VIM swap files
 *.swp
+
+
+# lint
+.ruff_cache/

.pre-commit-config.yaml

@@ -34,11 +34,6 @@ repos:
   #    - id: docformatter
   #      args: [--in-place, --wrap-summaries=120, --wrap-descriptions=120]
 
-  #- repo: https://github.com/PyCQA/isort
-  #  rev: 5.10.1
-  #  hooks:
-  #    - id: isort
-
   - repo: https://github.com/psf/black
     rev: 23.11.0
     hooks:
@@ -59,11 +54,8 @@ repos:
     hooks:
       - id: yesqa
 
-  - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.4
     hooks:
-      - id: flake8
-        arge:
-          - "--count"
-          - "--show-source"
-          - "--statistics"
+        - id: ruff
+          args: ["--fix"]

papermill/__init__.py

@@ -1,5 +1,4 @@
-from .version import version as __version__
-
-from .exceptions import PapermillException, PapermillExecutionError
-from .execute import execute_notebook
-from .inspection import inspect_notebook
+from .exceptions import PapermillException, PapermillExecutionError  # noqa: F401
+from .execute import execute_notebook  # noqa: F401
+from .inspection import inspect_notebook  # noqa: F401
+from .version import version as __version__  # noqa: F401

papermill/abs.py

@@ -1,9 +1,9 @@
 """Utilities for working with Azure blob storage"""
-import re
 import io
+import re
 
-from azure.storage.blob import BlobServiceClient
 from azure.identity import EnvironmentCredential
+from azure.storage.blob import BlobServiceClient
 
 
 class AzureBlobStore:
@@ -29,7 +29,7 @@ def _blob_service_client(self, account_name, sas_token=None):
     @classmethod
     def _split_url(self, url):
         """
-        see: https://docs.microsoft.com/en-us/azure/storage/common/storage-dotnet-shared-access-signature-part-1  # noqa: E501
+        see: https://docs.microsoft.com/en-us/azure/storage/common/storage-dotnet-shared-access-signature-part-1
         abs://myaccount.blob.core.windows.net/sascontainer/sasblob.txt?sastoken
         """
         match = re.match(r"abs://(.*)\.blob\.core\.windows\.net\/(.*?)\/([^\?]*)\??(.*)$", url)

papermill/cli.py

@@ -1,23 +1,21 @@
 """Main `papermill` interface."""
 
+import base64
+import logging
 import os
+import platform
 import sys
-from stat import S_ISFIFO
-import nbclient
 import traceback
-
-import base64
-import logging
+from stat import S_ISFIFO
 
 import click
-
+import nbclient
 import yaml
-import platform
 
 from .execute import execute_notebook
-from .iorw import read_yaml_file, NoDatesSafeLoader
 from .inspection import display_notebook_help
-from . import __version__ as papermill_version
+from .iorw import NoDatesSafeLoader, read_yaml_file
+from .version import version as papermill_version
 
 click.disable_unicode_literals_warning = True
 

papermill/clientwrap.py

@@ -1,5 +1,5 @@
-import sys
 import asyncio
+import sys
 
 from nbclient import NotebookClient
 from nbclient.exceptions import CellExecutionError

papermill/engines.py

@@ -1,16 +1,16 @@
 """Engines to perform different roles"""
-import sys
 import datetime
-import dateutil
-
+import sys
 from functools import wraps
+
+import dateutil
 import entrypoints
 
-from .log import logger
-from .exceptions import PapermillException
 from .clientwrap import PapermillNotebookClient
+from .exceptions import PapermillException
 from .iorw import write_ipynb
-from .utils import merge_kwargs, remove_args, nb_kernel_name, nb_language
+from .log import logger
+from .utils import merge_kwargs, nb_kernel_name, nb_language, remove_args
 
 
 class PapermillEngines:

papermill/execute.py

@@ -1,13 +1,14 @@
-import nbformat
 from pathlib import Path
 
-from .log import logger
-from .exceptions import PapermillExecutionError
-from .iorw import get_pretty_path, local_file_io_cwd, load_notebook_node, write_ipynb
+import nbformat
+
 from .engines import papermill_engines
-from .utils import chdir
-from .parameterize import add_builtin_parameters, parameterize_notebook, parameterize_path
+from .exceptions import PapermillExecutionError
 from .inspection import _infer_parameters
+from .iorw import get_pretty_path, load_notebook_node, local_file_io_cwd, write_ipynb
+from .log import logger
+from .parameterize import add_builtin_parameters, parameterize_notebook, parameterize_path
+from .utils import chdir
 
 
 def execute_notebook(

papermill/inspection.py

@@ -1,7 +1,8 @@
 """Deduce parameters of a notebook from the parameters cell."""
-import click
 from pathlib import Path
 
+import click
+
 from .iorw import get_pretty_path, load_notebook_node, local_file_io_cwd
 from .log import logger
 from .parameterize import add_builtin_parameters, parameterize_path

papermill/iorw.py

@@ -1,18 +1,16 @@
+import fnmatch
+import json
 import os
 import sys
-import json
-import yaml
-import fnmatch
-import nbformat
-import requests
 import warnings
-import entrypoints
-
 from contextlib import contextmanager
 
+import entrypoints
+import nbformat
+import requests
+import yaml
 from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_exponential
 
-from . import __version__
 from .exceptions import (
     PapermillException,
     PapermillRateLimitException,
@@ -21,6 +19,7 @@
 )
 from .log import logger
 from .utils import chdir
+from .version import version as __version__
 
 try:
     from .s3 import S3
@@ -48,7 +47,7 @@
     GCSFileSystem = missing_dependency_generator("gcsfs", "gcs")
 
 try:
-    from pyarrow.fs import HadoopFileSystem, FileSelector
+    from pyarrow.fs import FileSelector, HadoopFileSystem
 except ImportError:
     HadoopFileSystem = missing_dependency_generator("pyarrow", "hdfs")
 

papermill/parameterize.py

@@ -1,15 +1,15 @@
+from datetime import datetime
+from uuid import uuid4
+
 import nbformat
 
 from .engines import papermill_engines
-from .log import logger
 from .exceptions import PapermillMissingParameterException
 from .iorw import read_yaml_file
+from .log import logger
 from .translators import translate_parameters
 from .utils import find_first_tagged_cell_index
 
-from uuid import uuid4
-from datetime import datetime
-
 
 def add_builtin_parameters(parameters):
     """Add built-in parameters to a dictionary of parameters

papermill/s3.py

@@ -1,8 +1,7 @@
 """Utilities for working with S3."""
 
-import os
-
 import logging
+import os
 import threading
 import zlib
 
@@ -11,7 +10,6 @@
 from .exceptions import AwsError
 from .utils import retry
 
-
 logger = logging.getLogger('papermill.s3')
 
 

papermill/tests/__init__.py

@@ -1,8 +1,5 @@
 import os
 
-from io import StringIO
-
-
 kernel_name = 'python3'
 
 

papermill/tests/test_abs.py

@@ -1,8 +1,9 @@
 import os
 import unittest
-
 from unittest.mock import Mock, patch
+
 from azure.identity import EnvironmentCredential
+
 from ..abs import AzureBlobStore
 
 

papermill/tests/test_adl.py

@@ -1,8 +1,9 @@
 import unittest
+from unittest.mock import MagicMock, Mock, patch
 
-from unittest.mock import Mock, MagicMock, patch
-
-from ..adl import ADL, core as adl_core, lib as adl_lib
+from ..adl import ADL
+from ..adl import core as adl_core
+from ..adl import lib as adl_lib
 
 
 class ADLTest(unittest.TestCase):

papermill/tests/test_autosave.py

@@ -1,15 +1,15 @@
-import nbformat
 import os
 import tempfile
 import time
 import unittest
 from unittest.mock import patch
 
-from . import get_notebook_path
+import nbformat
 
 from .. import engines
 from ..engines import NotebookExecutionManager
 from ..execute import execute_notebook
+from . import get_notebook_path
 
 
 class TestMidCellAutosave(unittest.TestCase):

papermill/tests/test_cli.py

@@ -2,23 +2,22 @@
 """ Test the command line interface """
 
 import os
-from pathlib import Path
-import sys
 import subprocess
+import sys
 import tempfile
-import uuid
-import nbclient
-
-import nbformat
 import unittest
+import uuid
+from pathlib import Path
 from unittest.mock import patch
 
+import nbclient
+import nbformat
 import pytest
 from click.testing import CliRunner
 
-from . import get_notebook_path, kernel_name
 from .. import cli
-from ..cli import papermill, _is_int, _is_float, _resolve_type
+from ..cli import _is_float, _is_int, _resolve_type, papermill
+from . import get_notebook_path, kernel_name
 
 
 @pytest.mark.parametrize(

papermill/tests/test_clientwrap.py

@@ -1,13 +1,12 @@
-import nbformat
 import unittest
-
 from unittest.mock import call, patch
 
-from . import get_notebook_path
+import nbformat
 
-from ..log import logger
-from ..engines import NotebookExecutionManager
 from ..clientwrap import PapermillNotebookClient
+from ..engines import NotebookExecutionManager
+from ..log import logger
+from . import get_notebook_path
 
 
 class TestPapermillClientWrapper(unittest.TestCase):

papermill/tests/test_engines.py

@@ -1,17 +1,16 @@
 import copy
-import dateutil
 import unittest
-
 from abc import ABCMeta
-from unittest.mock import Mock, patch, call
-from nbformat.notebooknode import NotebookNode
+from unittest.mock import Mock, call, patch
 
-from . import get_notebook_path
+import dateutil
+from nbformat.notebooknode import NotebookNode
 
 from .. import engines, exceptions
-from ..log import logger
+from ..engines import Engine, NBClientEngine, NotebookExecutionManager
 from ..iorw import load_notebook_node
-from ..engines import NotebookExecutionManager, Engine, NBClientEngine
+from ..log import logger
+from . import get_notebook_path
 
 
 def AnyMock(cls):

papermill/tests/test_execute.py

@@ -3,20 +3,19 @@
 import tempfile
 import unittest
 from copy import deepcopy
-from unittest.mock import patch, ANY
-
 from functools import partial
 from pathlib import Path
+from unittest.mock import ANY, patch
 
 import nbformat
 from nbformat import validate
 
 from .. import engines, translators
-from ..log import logger
+from ..exceptions import PapermillExecutionError
+from ..execute import execute_notebook
 from ..iorw import load_notebook_node
+from ..log import logger
 from ..utils import chdir
-from ..execute import execute_notebook
-from ..exceptions import PapermillExecutionError
 from . import get_notebook_path, kernel_name
 
 execute_notebook = partial(execute_notebook, kernel_name=kernel_name)

papermill/tests/test_inspect.py

@@ -6,7 +6,6 @@
 
 from papermill.inspection import display_notebook_help, inspect_notebook
 
-
 NOTEBOOKS_PATH = Path(__file__).parent / "notebooks"