dev_scripts/env.py

@@ -139,7 +139,7 @@ RUN dnf install -y python3.12
 
 DOCKERFILE_BUILD_DEV_FEDORA_DEPS = r"""
 RUN dnf install -y git rpm-build podman python3 python3-devel uv \
-    make qt6-qtbase-gui python3-hatchling pipx \
+    pipx make qt6-qtbase-gui \
     && dnf clean all
 
 # FIXME: Drop this fix after it's resolved upstream.
@@ -182,9 +182,8 @@ ENV PATH="$PATH:/home/user/.local/bin"
 RUN pipx install uv
 
 COPY pyproject.toml uv.lock /home/user/dangerzone/
-RUN uv venv /home/user/.venv
+# XXX Not sure why, but permission problems with the command below. Commenting it out for now as `uv` will get the deps later on.
-ENV UV_PROJECT_ENVIRONMENT="/home/user/.venv"
+# RUN cd /home/user/dangerzone && uv venv .venv-{distro}-{version} && uv sync
-RUN cd /home/user/dangerzone && uv sync
 """
 
 DOCKERFILE_BUILD_DEBIAN_DEPS = r"""

pyproject.toml

@@ -16,7 +16,7 @@ dependencies = [
     "packaging",
     "pymupdf (>=1.23.3, <1.24.0)", # The version in Fedora 39
     "pyside6 (>=6.7.1, < 6.8)",
-    "pyxdg; sys_platform == 'linux'",
+    # "pyxdg; sys_platform == 'linux'",
     "requests",]
 
 dynamic = ["readme", "classifiers"]

uv.lock

@@ -258,7 +258,6 @@ dependencies = [
     { name = "packaging" },
     { name = "pymupdf" },
     { name = "pyside6" },
-    { name = "pyxdg", marker = "sys_platform == 'linux'" },
     { name = "requests" },
 ]
 
@@ -304,7 +303,6 @@ requires-dist = [
     { name = "packaging" },
     { name = "pymupdf", specifier = ">=1.23.3,<1.24.0" },
     { name = "pyside6", specifier = ">=6.7.1,<6.8" },
-    { name = "pyxdg", marker = "sys_platform == 'linux'" },
     { name = "requests" },
 ]
 
@@ -757,15 +755,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/de/3d/8161f7711c017e01ac9f008dfddd9410dff3674334c233bde66e7ba65bbf/pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8", size = 30756 },
 ]
 
-[[package]]
-name = "pyxdg"
-version = "0.28"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-0.28.tar.gz", hash = "sha256:3267bb3074e934df202af2ee0868575484108581e6f3cb006af1da35395e88b4", size = 77776 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/e5/8d/cf41b66a8110670e3ad03dab9b759704eeed07fa96e90fdc0357b2ba70e2/pyxdg-0.28-py2.py3-none-any.whl", hash = "sha256:bdaf595999a0178ecea4052b7f4195569c1ff4d344567bccdc12dfdf02d545ab", size = 49520 },
-]
-
 [[package]]
 name = "requests"
 version = "2.32.3"