Use ruff

mscxyz/__init__.py

@@ -211,7 +211,6 @@ def execute(args: typing.Sequence = None):
     files = list_scores(path=args.path, glob=args.general_glob)
 
     for file in files:
-
         print("\n" + color(file, "red"))
 
         if args.general_backup:

mscxyz/cli.py

@@ -404,9 +404,7 @@ def list_fields(fields: typing.Sequence, prefix: str = "", suffix: str = "") ->
     help="Show help. Use “{} help all” to show help \
     messages of all subcommands. Use \
     “{} help <subcommand>” to show only help messages \
-    for the given subcommand.".format(
-        parser.prog, parser.prog
-    ),
+    for the given subcommand.".format(parser.prog, parser.prog),
 )
 
 sub_help.add_argument(

mscxyz/meta.py

@@ -326,7 +326,7 @@ def _split(field):
             raise ValueError("Field “" + field + "” can’t be splitted!")
         matches = match.groups()
 
-        if not matches[0] in InterfaceReadWrite.objects:
+        if matches[0] not in InterfaceReadWrite.objects:
             raise ValueError(matches[0] + ": Not a supported object!")
         return {"object": matches[0], "field": matches[1]}
 

mscxyz/rename.py

@@ -106,7 +106,6 @@ def rename_filename(source: str) -> Meta:
     show(source, target)
 
     if not args.general_dry_run:
-
         create_dir(target)
         # Invalid cross-device link:
         # os.rename(source, target)

mscxyz/score_file_classes.py

@@ -315,7 +315,6 @@ def save(self, new_name: str = "", mscore: bool = False):
                 "//StaffText/text",
                 "//Jump/continueAt",
             ):
-
                 for tag in self.xml_tree.xpath(xpath):
                     if not tag.text:
                         tag.text = ""

mscxyz/settings.py

@@ -4,7 +4,6 @@
 
 
 class DefaultArguments:
-
     clean_style = None
     export_extension = None
     general_backup = False

pyproject.toml

@@ -25,8 +25,7 @@ lxml-stubs = "^0.4.0"
 [tool.poetry.group.dev.dependencies]
 readme-patcher = "^0.6.0"
 tox = "^4.11.4"
-black = "^22.6.0"
-isort = "^5.10.1"
+ruff = "^0.1.9"
 
 [build-system]
 requires = ["poetry>=1.2.0b2"]

tox.ini

@@ -13,11 +13,11 @@ passenv = XDG_RUNTIME_DIR
 
 [testenv:format]
 deps =
-    isort==5.10.1
-    black==22.6.0
+    ruff==0.1.9
 commands =
-    isort .
-    black .
+    ; sort imports
+    ruff check --select I --fix .
+    ruff format
 
 [testenv:docs]
 deps =
@@ -30,8 +30,8 @@ commands =
 
 [testenv:lint]
 deps =
-    flake8==4.0.1
-commands = flake8 mscxyz tests
+    ruff==0.1.9
+commands = ruff check
 
 [gh-actions]
 python =