Merge 31e05cb10c into 23f3ad1f46

The previous library we were using for this (`appdirs`) is dead upstream
and not supported anymore in debian testing.

Fixes #1058

dangerzone/cli.py

@@ -302,7 +302,7 @@ def display_banner() -> None:
         + Back.BLACK
         + Fore.LIGHTWHITE_EX
         + Style.BRIGHT
-        + f"{' ' * left_spaces}Dangerzone v{get_version()}{' ' * right_spaces}"
+        + f"{' '*left_spaces}Dangerzone v{get_version()}{' '*right_spaces}"
         + Fore.YELLOW
         + Style.DIM
         + "│"

dangerzone/isolation_provider/base.py

@@ -335,9 +335,9 @@ class IsolationProvider(ABC):
         stderr_thread = self.start_stderr_thread(p, stderr)
 
         if platform.system() != "Windows":
-            assert os.getpgid(p.pid) != os.getpgid(os.getpid()), (
-                "Parent shares same PGID with child"
-            )
+            assert os.getpgid(p.pid) != os.getpgid(
+                os.getpid()
+            ), "Parent shares same PGID with child"
 
         try:
             yield p

dangerzone/util.py

@@ -5,14 +5,11 @@ import sys
 import traceback
 import unicodedata
 
-try:
-    import platformdirs
-except ImportError:
-    import appdirs as platformdirs
+import platformdir
 
 
 def get_config_dir() -> str:
-    return platformdirs.user_config_dir("dangerzone")
+    return platformdir.user_config_dir("dangerzone")
 
 
 def get_resource_path(filename: str) -> str:

debian/control

@@ -9,7 +9,7 @@ Rules-Requires-Root: no
 
 Package: dangerzone
 Architecture: any
-Depends: ${misc:Depends}, podman, python3, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-pyside2.qtsvg, python3-platformdirs | python3-appdirs, python3-click, python3-xdg, python3-colorama, python3-requests, python3-markdown, python3-packaging, tesseract-ocr-all
+Depends: ${misc:Depends}, ${python3:Depends}, podman, python3, python3-pyside2.qtcore, python3-pyside2.qtgui, python3-pyside2.qtwidgets, python3-pyside2.qtsvg, python3-appdirs, python3-click, python3-xdg, python3-colorama, python3-requests, python3-markdown, python3-packaging, tesseract-ocr-all
 Description: Take potentially dangerous PDFs, office documents, or images
   Dangerzone is an open source desktop application that takes potentially dangerous PDFs, office documents, or images and converts them to safe PDFs. It uses disposable VMs on Qubes OS, or container technology in other OSes, to convert the documents within a secure sandbox.
   .

install/linux/dangerzone.spec

@@ -226,11 +226,6 @@ convert the documents within a secure sandbox.
 sed -i 's/<3.13/<3.14/' pyproject.toml
 %endif
 
-# Bypass the version pin for Fedora as the 6.8.1.1 package is causing trouble
-# A 6.8.1.1 package was only released with a wheel for macOS, but was picked by
-# Fedora packagers. We cannot use "*" when PyPI is involved as it will fail to download the latest version.
-# For Fedora, we can pick any of the released versions.
- sed -i '/shiboken6 = \[/,/\]/c\shiboken6 = "*"' pyproject.toml
 
 %generate_buildrequires
 %pyproject_buildrequires -R

pyproject.toml

@@ -23,13 +23,6 @@ pyxdg = {version = "*", platform = "linux"}
 requests = "*"
 markdown = "*"
 packaging = "*"
-# shiboken6 released a 6.8.1.1 version only for macOS
-# and it's getting picked by poetry, so pin it instead.
-shiboken6 = [
-    {version = "*", platform = "darwin"},
-    {version = "<6.8.1.1", platform = "linux"},
-    {version = "<6.8.1.1", platform = "win32"},
-]
 
 [tool.poetry.scripts]
 dangerzone = 'dangerzone:main'

tests/test_util.py

@@ -12,9 +12,9 @@ VERSION_FILE_NAME = "version.txt"
 def test_get_resource_path() -> None:
     share_dir = Path("share").resolve()
     resource_path = Path(util.get_resource_path(VERSION_FILE_NAME)).parent
-    assert share_dir.samefile(resource_path), (
-        f"{share_dir} is not the same file as {resource_path}"
-    )
+    assert share_dir.samefile(
+        resource_path
+    ), f"{share_dir} is not the same file as {resource_path}"
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Windows-specific")