Lint: Enable isort (I) rules

- Use `ruff` instead of `black` and `isort` in the `lint` target for linting and code formatting.

- Add a new target `fix` which applies all suggestions from `ruff check` and `ruff format`.

.github/workflows/ci.yml

@@ -38,7 +38,7 @@ jobs:
           apt-get install -y git make python3 python3-poetry --no-install-recommends
           poetry install --only lint,test
       - name: Run linters to enforce code style
-        run: poetry run make check
+        run: poetry run make lint
       - name: Check that the QA script is up to date with the docs
         run: "./dev_scripts/qa.py --check-refs"
 

Makefile

@@ -1,19 +1,6 @@
 LARGE_TEST_REPO_DIR:=tests/test_docs_large
 GIT_DESC=$$(git describe)
 JUNIT_FLAGS := --capture=sys -o junit_logging=all
-
-lint-ruff: ## check the python source code with various linter rules through ruff
-	ruff check
-
-lint-ruff-apply: ## apply all fixes made by ruff to the source code 
-	ruff check --fix
-
-format-ruff: ## Check the formatting of the python source code with ruff
-	ruff format --check
-
-format-ruff-apply: ## apply all the formatting suggestions from ruff
-	ruff format
-
 MYPY_ARGS := --ignore-missing-imports \
 			 --disallow-incomplete-defs \
 			 --disallow-untyped-defs \
@@ -22,19 +9,17 @@ MYPY_ARGS := --ignore-missing-imports \
 			 --warn-unused-ignores \
 			 --exclude $(LARGE_TEST_REPO_DIR)/*.py
 
-mypy-host:
+.PHONY: lint
+lint: ## Check the code for linting, formatting, and typing issues with ruff and mypy
+	ruff check
+	ruff format --check
 	mypy $(MYPY_ARGS) dangerzone
-
-mypy-tests:
 	mypy $(MYPY_ARGS) tests
 
-mypy: mypy-host mypy-tests ## check type hints with mypy
-
-.PHONY: check
-check: lint-ruff format-ruff mypy ## check the code with ruff and mypy
-
 .PHONY: fix
-fix: lint-ruff-apply format-ruff-apply ## apply all the suggestions from ruff
+fix: ## apply all the suggestions from ruff
+	ruff check --fix
+	ruff format 
 
 .PHONY: test
 test: