Merge a2972cf into 9f7e145

.github/workflows/test_push.yaml

@@ -18,8 +18,12 @@ jobs:
           python-version: '3.9'
           architecture: 'x64'
       - name: "Python Poetry Action"
-        uses: Gr1N/setup-poetry@v7
-      - name: "Run tests and linters"
+        uses: Gr1N/setup-poetry@v8
+      - name: "Install dev dependencies"
+        run: make install
+      - name: "Run linters"
+        run: make lint
+      - name: "Run tests"
         run: make test
       - name: Coveralls
         uses: AndreMiras/coveralls-python-action@develop

Makefile

@@ -1,33 +1,63 @@
+.PHONY: clean
 clean: clean-eggs clean-build
 	@find . -iname '*.pyc' -delete
 	@find . -iname '*.pyo' -delete
 	@find . -iname '*~' -delete
 	@find . -iname '*.swp' -delete
 	@find . -iname '__pycache__' -delete
 
+.PHONY: clean-eggs
 clean-eggs:
 	@find . -name '*.egg' -print0|xargs -0 rm -rf --
 	@rm -rf .eggs/
 
+.PHONY: clean-build
 clean-build:
 	@rm -fr build/
 	@rm -fr dist/
 	@rm -fr *.egg-info
 
+.PHONY: ruff
+ruff:
+	poetry run ruff . --fix
+
+.PHONY: ruffcheck
+ruffcheck:
+	@echo "Checking ruff..."
+	poetry run ruff .
+
+.PHONY: black
+black:
+	poetry run black .
+
+.PHONY: blackcheck
+blackcheck:
+	@echo "Checking black..."
+	poetry run black --check --diff .
+
+.PHONY: build
 build: clean
 	poetry build
 
+.PHONY: install
 install:
 	poetry install
 
-format: install
-	poetry run black .
-	poetry run isort .
+.PHONY: poetrycheck
+poetrycheck:
+	poetry lock --check
+
+.PHONY: pyformatcheck
+pyformatcheck: poetrycheck blackcheck ruffcheck
+
+.PHONY: lint
+lint: pyformatcheck
+
+.PHONY: format
+format: ruff black
 
-lint: install
-	poetry run flake8
-	poetry run black . --check
-	poetry run isort . --check-only --diff
+.PHONY: test
+test:
+	poetry run pytest -vv --cov=dojo_toolkit --cov-report=term-missing
 
-test: lint
-	poetry run pytest
+SHELL := bash

dojo_toolkit/code_handler.py

@@ -14,7 +14,7 @@ def __init__(self, *args, **kwargs):
         self.dojo = kwargs.pop("dojo")
         self.test_runner = kwargs.pop("test_runner")
 
-        super(DojoCodeHandler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         self.last_test_run_time = time.time()
 

dojo_toolkit/dojo.py

@@ -31,7 +31,7 @@ def __init__(self, code_path, round_time=None, mute=False, test_runner=None, run
 
     def start(self):
         self.observer.start()
-        print("\nWatching: {} folder".format(self.code_path))
+        print(f"\nWatching: {self.code_path} folder")
 
         self.is_running = True
         print("Dojo toolkit started!")

dojo_toolkit/main.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from pathlib import Path
-from typing import Optional
+from typing import Annotated, Optional
 
 import typer
 
@@ -13,29 +13,37 @@ class Runners(str, Enum):
 
 
 def main(
-    path: Optional[Path] = typer.Argument(
-        Path("."),
-        exists=True,
-        file_okay=False,
-        dir_okay=True,
-        readable=True,
-        help="The path to the folder containing the code used during the dojo",
-    ),
-    time: Optional[float] = typer.Option(
-        Dojo.ROUND_TIME,
-        "--time",
-        "-t",
-        help="The amount of time a dojo round lasts",
-    ),
-    mute: Optional[bool] = typer.Option(
-        False,
-        help="Mute all sounds, note: this only works in Linux",
-    ),
-    runner: Optional[Runners] = typer.Option(
-        Runners.doctest.value,
-        "--runner",
-        help="Name of the runner",
-    ),
+    path: Annotated[
+        Optional[Path],
+        typer.Argument(
+            exists=True,
+            file_okay=False,
+            dir_okay=True,
+            readable=True,
+            help="The path to the folder containing the code used during the dojo",
+        ),
+    ] = Path("."),
+    time: Annotated[
+        Optional[float],
+        typer.Option(
+            "--time",
+            "-t",
+            help="The amount of time a dojo round lasts",
+        ),
+    ] = Dojo.ROUND_TIME,
+    mute: Annotated[
+        Optional[bool],
+        typer.Option(
+            help="Mute all sounds, note: this only works in Linux",
+        ),
+    ] = False,
+    runner: Annotated[
+        Optional[Runners],
+        typer.Option(
+            "--runner",
+            help="Name of the runner",
+        ),
+    ] = Runners.doctest,
 ):
     dojo = Dojo(
         code_path=path.as_posix(),  # type: ignore

dojo_toolkit/notifier.py

@@ -28,7 +28,7 @@ def notify(self, message, image=None):
 
 class GnomeNotifier(BaseNotifier):
     def __init__(self):
-        super(GnomeNotifier, self).__init__()
+        super().__init__()
 
         self.fail_img = GdkPixbuf.Pixbuf.new_from_file(self.fail_img_path)
         self.success_img = GdkPixbuf.Pixbuf.new_from_file(self.success_img_path)