Merge 019116361f into b5c09e51d8

It now outputs the following:

```
build-linux                  Build linux packages (.rpm and .deb)
build-macos-arm              Build macOS Apple Silicon package (.dmg)
build-macos-intel            Build macOS intel package (.dmg)
Dockerfile                   Regenerate the Dockerfile from its template
fix                          apply all the suggestions from ruff
help                         Print this message and exit.
lint                         Check the code for linting, formatting, and typing issues with ruff and mypy
regenerate-reference-pdfs    Regenerate the reference PDFs
test                         Run the tests
test-large                   Run large test set
```

Makefile

@@ -22,7 +22,7 @@ fix: ## apply all the suggestions from ruff
 	ruff format
 
 .PHONY: test
-test:
+test: ## Run the tests
 	# Make each GUI test run as a separate process, to avoid segfaults due to
 	# shared state.
 	# See more in https://github.com/freedomofpress/dangerzone/issues/493
@@ -47,11 +47,11 @@ test-large: test-large-init  ## Run large test set
 	python -m pytest --tb=no tests/test_large_set.py::TestLargeSet -v $(JUNIT_FLAGS) --junitxml=$(TEST_LARGE_RESULTS)
 	python $(TEST_LARGE_RESULTS)/report.py $(TEST_LARGE_RESULTS)
 
-Dockerfile: Dockerfile.env Dockerfile.in
+Dockerfile: Dockerfile.env Dockerfile.in ## Regenerate the Dockerfile from its template
 	poetry run jinja2 Dockerfile.in Dockerfile.env > Dockerfile
 
 .PHONY: poetry-install
-poetry-install:
+poetry-install: ## Install project dependencies
 	poetry install
 
 .PHONY: build-clean
@@ -59,19 +59,19 @@ build-clean:
 	poetry run doit clean
 
 .PHONY: build-macos-intel
-build-macos-intel: build-clean poetry-install
+build-macos-intel: build-clean poetry-install ## Build macOS intel package (.dmg)
 	poetry run doit -n 8
 
 .PHONY: build-macos-arm
-build-macos-arm: build-clean poetry-install
+build-macos-arm: build-clean poetry-install ## Build macOS Apple Silicon package (.dmg)
 	poetry run doit -n 8 macos_build_dmg
 
 .PHONY: build-linux
-build-linux: build-clean poetry-install
+build-linux: build-clean poetry-install ## Build linux packages (.rpm and .deb)
 	poetry run doit -n 8 fedora_rpm debian_deb
 
 .PHONY: regenerate-reference-pdfs
-regenerate-reference-pdfs:
+regenerate-reference-pdfs: ## Regenerate the reference PDFs
 	pytest tests/test_cli.py -k regenerate --generate-reference-pdfs
 # Makefile self-help borrowed from the securedrop-client project
 # Explaination of the below shell command should it ever break.

dangerzone/cli.py

@@ -56,7 +56,7 @@ def print_header(s: str) -> None:
         "The name or full path of the container runtime you want Dangerzone to use."
         " You can specify the value 'default' if you want to take back your choice, and"
         " let Dangerzone use the default runtime for this OS"
-    )
+    ),
 )
 @click.version_option(version=get_version(), message="%(version)s")
 @errors.handle_document_errors

dangerzone/gui/__init__.py

@@ -10,7 +10,6 @@ from typing import List, Optional
 import click
 import colorama
 
-
 # FIXME: See https://github.com/freedomofpress/dangerzone/issues/320 for more details.
 if typing.TYPE_CHECKING:
     from PySide2 import QtCore, QtGui, QtWidgets

dangerzone/gui/main_window.py

@@ -227,9 +227,9 @@ class MainWindow(QtWidgets.QMainWindow):
                 if not is_version_valid:
                     self.handle_docker_desktop_version_check(is_version_valid, version)
             except errors.UnsupportedContainerRuntime as e:
-                pass  # It's catched later in the flow.
+                pass  # It's caught later in the flow.
             except errors.NoContainerTechException as e:
-                pass  # It's catched later in the flow.
+                pass  # It's caught later in the flow.
 
         self.show()