From 606efa7ea23011c0c4bc07d1fc70e7a4c55e2c9f Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Mon, 10 Mar 2025 23:24:43 +0200 Subject: [PATCH] fixup! Drop Ubuntu 20.04 (Focal) support --- dangerzone/gui/main_window.py | 9 --------- dev_scripts/env.py | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dangerzone/gui/main_window.py b/dangerzone/gui/main_window.py index 7ec0a85..280f68b 100644 --- a/dangerzone/gui/main_window.py +++ b/dangerzone/gui/main_window.py @@ -619,13 +619,6 @@ class ContentWidget(QtWidgets.QWidget): 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 @@ class ContentWidget(QtWidgets.QWidget): # 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 index a70de71..a739004 100755 --- a/dev_scripts/env.py +++ b/dev_scripts/env.py @@ -97,7 +97,7 @@ RUN apt-get update \ && 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/*