fixup! Drop Ubuntu 20.04 (Focal) support

freedomofpress · Mar 10, 2025 · 606efa7 · 606efa7
1 parent 47bc5cd
commit 606efa7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py
@@ -619,13 +619,6 @@ def __init__(self, dangerzone: DangerzoneGui) -> None:
         self.dangerzone = dangerzone
         self.conversion_started = False
 
-        self.warning_label = None
-        if platform.system() == "Linux":
-            # Add the warning message only for ubuntu focal
-            os_release_path = Path("/etc/os-release")
-            if os_release_path.exists():
-                os_release = os_release_path.read_text()
-
         # Doc selection widget
         self.doc_selection_widget = DocSelectionWidget(self.dangerzone)
         self.doc_selection_widget.documents_selected.connect(self.documents_selected)
@@ -651,8 +644,6 @@ def __init__(self, dangerzone: DangerzoneGui) -> None:
 
         # Layout
         layout = QtWidgets.QVBoxLayout()
-        if self.warning_label:
-            layout.addWidget(self.warning_label)  # Add warning at the top
         layout.addWidget(self.settings_widget, stretch=1)
         layout.addWidget(self.documents_list, stretch=1)
         layout.addWidget(self.doc_selection_wrapper, stretch=1)

diff --git a/dev_scripts/env.py b/dev_scripts/env.py
@@ -97,7 +97,7 @@
     && apt-get install -y --no-install-recommends dh-python make build-essential \
         git {qt_deps} pipx python3 python3-pip python3-venv dpkg-dev debhelper python3-setuptools \
     && rm -rf /var/lib/apt/lists/*
-RUN pix install poetry
+RUN pipx install poetry
 RUN apt-get update \
     && apt-get install -y --no-install-recommends mupdf thunar \
     && rm -rf /var/lib/apt/lists/*