Replace flake8 with ruff

commands.py

@@ -40,9 +40,9 @@ def activate_venv(root="./.venv"):
                 os.environ["VIRTUAL_ENV"] = os.path.abspath(venv_root)
                 for path in glob.glob(venv_site_packages):
                     sys.path.insert(0, path)
-                sys.stderr.write(f"activated\n")
+                sys.stderr.write("activated\n")
                 return True
-            sys.stderr.write(f"FAILED\n")
+            sys.stderr.write("FAILED\n")
             return False
 
         if not activate_venv():
@@ -147,7 +147,7 @@ def install_completion(
         if overwrite:
             printer.info(f"Overwriting:\n    {destination}")
         else:
-            confirm(f"File exists. Overwrite?", abort_on_unconfirmed=True)
+            confirm("File exists. Overwrite?", abort_on_unconfirmed=True)
 
     _copy_file(source, destination, template=template_type, context=template_context)
     printer.info(f"Installed; remember to:\n    source {destination}")
@@ -241,7 +241,7 @@ def lint(
 ):
     result = local(
         (
-            "flake8",
+            "ruff",
             ".",
             "--ignore=" if disable_ignore else None,
             "--disable-noqa" if disable_noqa else None,

pyproject.toml

@@ -29,10 +29,10 @@ rich = ">=10"
 toml = ">=0.10"
 "com.wyattbaldwin.cached_property" = "^1.0"
 
-[tool.poetry.dev-dependencies]
-black = { version = "*", allow-prereleases = true }
+[tool.poetry.group.dev.dependencies]
+black = "*"
 coverage = "*"
-flake8 = "<3.8"
+ruff = "*"
 Sphinx = "*"
 tox = "*"
 twine = "*"
@@ -51,6 +51,9 @@ target-version = ["py36"]
 [tool.make-release.args]
 test-command = "run test"
 
+[tool.ruff]
+ignore = [ "F722", "F821" ]
+
 [tool.runcommands.globals]
 package = "runcommands"
 distribution = "{{ package }}"

src/runcommands/args.py

@@ -464,7 +464,7 @@ def convert_value(self, value: str):
             elif value in ("0", "false"):
                 return False
             if self.is_bool:
-                raise ValueError(f"Bool value must be one of 1, true, 0, or false")
+                raise ValueError("Bool value must be one of 1, true, 0, or false")
         converter = self.add_argument_args[1]["type"]
         value = converter(value)
         return value

src/runcommands/commands/__init__.py

@@ -1,4 +1,4 @@
-# flake8: noqa: F401
+# ruff: noqa: F401
 from .copy_file import copy_file
 from .git_version import git_version
 from .local import local

src/runcommands/util/misc.py

@@ -45,7 +45,14 @@ def flatten_args(args: list, join=False, *, empty=(None, [], (), "")) -> list:
         []
         >>> flatten_args([(), (), [(), ()]])
         []
-        >>> flatten_args(['executable', '--flag' if True else None, ('--option', 'value'), [None]])
+        >>> flatten_args(
+        ...     [
+        ...         'executable',
+        ...         '--flag' if True else None,
+        ...         ('--option', 'value'),
+        ...         [None],
+        ...     ]
+        ... )
         ['executable', '--flag', '--option', 'value']
         >>> flatten_args(['executable', '--option', 0])
         ['executable', '--option', '0']

src/runcommands/util/path.py

@@ -83,7 +83,10 @@ def asset_path(path, format_kwargs={}, keep_slash=False):
     True
     >>> asset_path('runcommands.util:path.py') == file_path
     True
-    >>> asset_path('runcommands.util:{name}.py', format_kwargs={'name': 'path'}) == file_path
+    >>> asset_path(
+    ...     'runcommands.util:{name}.py',
+    ...     format_kwargs={'name': 'path'}
+    ... ) == file_path
     True
     >>> asset_path('runcommands.util:dir/') == (dir_name + '/dir')
     True

tox.ini

@@ -5,8 +5,8 @@ isolated_build = true
 [testenv]
 deps =
     .
-    flake8<3.8
+    ruff
     com.wyattbaldwin.make_release
 commands =
     python -m unittest discover .
-    flake8 .
+    ruff .