Skip to content

Commit

Permalink
Replace PySide2-stubs with types-PySide2
Browse files Browse the repository at this point in the history
Replace PySide2-stubs with types-PySide2, both of which are projects
that provide PySide2 typing hints, for the following reasons:

1. types-PySide2 is more complete and allows us to ditch some 'type:
   ignore' comments for Mypy.
2. PySide2-stubs also brings PySide2 as a dependency, which cannot be
   installed in MacOS M1 machines.

Refs #177
  • Loading branch information
apyrgio committed Jan 25, 2023
1 parent 724dd2a commit dd8389b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 28 deletions.
4 changes: 2 additions & 2 deletions dangerzone/gui/logic.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@ def __init__(
self.setLayout(layout)

def clicked_ok(self) -> None:
self.done(QtWidgets.QDialog.Accepted)
self.done(int(QtWidgets.QDialog.Accepted))

def clicked_extra(self) -> None:
self.done(2)

def clicked_cancel(self) -> None:
self.done(QtWidgets.QDialog.Rejected)
self.done(int(QtWidgets.QDialog.Rejected))

def launch(self) -> int:
return self.exec_()
8 changes: 3 additions & 5 deletions dangerzone/gui/main_window.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(self, dangerzone: DangerzoneGui) -> None:
header_label.setFont(self.dangerzone.fixed_font)
header_label.setStyleSheet("QLabel { font-weight: bold; font-size: 50px; }")
header_version_label = QtWidgets.QLabel(get_version())
header_version_label.setProperty("class", "version") # type: ignore [arg-type]
header_version_label.setProperty("class", "version")
header_version_label.setAlignment(QtCore.Qt.AlignBottom)

header_layout = QtWidgets.QHBoxLayout()
Expand Down Expand Up @@ -363,7 +363,7 @@ def __init__(self, dangerzone: DangerzoneGui) -> None:
self.docs_selected_label = QtWidgets.QLabel("No documents selected")
self.docs_selected_label.setAlignment(QtCore.Qt.AlignCenter)
self.docs_selected_label.setContentsMargins(0, 0, 0, 20)
self.docs_selected_label.setProperty("class", "docs-selection") # type: ignore [arg-type]
self.docs_selected_label.setProperty("class", "docs-selection")

# Save safe version
self.save_checkbox = QtWidgets.QCheckBox()
Expand All @@ -373,9 +373,7 @@ def __init__(self, dangerzone: DangerzoneGui) -> None:
self.safe_extension_label = QtWidgets.QLabel("Save as")
self.safe_extension_filename = QtWidgets.QLabel("document")
self.safe_extension_filename.setAlignment(QtCore.Qt.AlignRight)
self.safe_extension_filename.setProperty(
"style", "safe_extension_filename" # type: ignore
)
self.safe_extension_filename.setProperty("style", "safe_extension_filename")
self.safe_extension = QtWidgets.QLineEdit()
self.safe_extension.setStyleSheet("margin-left: -6px;") # no left margin
self.safe_extension.textChanged.connect(self.update_ui)
Expand Down
32 changes: 12 additions & 20 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pyinstaller = {version = "*", platform = "darwin"}
black = "*"
isort = "*"
mypy = "*"
PySide2-stubs = "*"
types-PySide2 = "*"

# Dependencies required for testing the code.
[tool.poetry.group.test.dependencies]
Expand Down

0 comments on commit dd8389b

Please sign in to comment.