Install missing hatchling dep for fedora

Add xdg to the linux dependencies
Make uv sync use a specific venv when building
2025-05-16 18:21:50 +02:00 · 2025-01-07 11:57:39 +01:00 · 2025-01-07 11:29:49 +01:00 · 2025-01-07 11:19:07 +01:00
3 changed files with 16 additions and 4 deletions
--- a/dev_scripts/env.py
+++ b/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 \
-    pipx make qt6-qtbase-gui \
+    make qt6-qtbase-gui python3-hatchling pipx \
    && dnf clean all

 # FIXME: Drop this fix after it's resolved upstream.
@ -182,8 +182,9 @@ ENV PATH="$PATH:/home/user/.local/bin"
 RUN pipx install uv

 COPY pyproject.toml uv.lock /home/user/dangerzone/
-# XXX Not sure why, but permission problems with the command below. Commenting it out for now as `uv` will get the deps later on.
-# RUN cd /home/user/dangerzone && uv venv .venv-{distro}-{version} && uv sync
+RUN uv venv /home/user/.venv
+ENV UV_PROJECT_ENVIRONMENT="/home/user/.venv"
+RUN cd /home/user/dangerzone && uv sync
 """

 DOCKERFILE_BUILD_DEBIAN_DEPS = r"""
--- a/pyproject.toml
+++ b/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"]
--- a/uv.lock
+++ b/uv.lock
@ -258,6 +258,7 @@ dependencies = [
    { name = "packaging" },
    { name = "pymupdf" },
    { name = "pyside6" },
+    { name = "pyxdg", marker = "sys_platform == 'linux'" },
    { name = "requests" },
 ]

@ -303,6 +304,7 @@ 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" },
 ]

@ -755,6 +757,15 @@ 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"
Author	SHA1	Message	Date
Alexis Métaireau	23f10778ef	Install missing hatchling dep for fedora Some checks failed Tests / macOS (x86_64) (push) Has been cancelled Details Tests / build-container-image (push) Has been cancelled Details Tests / Download and cache Tesseract data (push) Has been cancelled Details Tests / windows (push) Has been cancelled Details Tests / macOS (arch64) (push) Has been cancelled Details Tests / build-deb (ubuntu 22.04) (push) Has been cancelled Details Tests / build-deb (debian bookworm) (push) Has been cancelled Details Tests / build-deb (debian bullseye) (push) Has been cancelled Details Tests / build-deb (debian trixie) (push) Has been cancelled Details Tests / build-deb (ubuntu 20.04) (push) Has been cancelled Details Tests / build-deb (ubuntu 24.04) (push) Has been cancelled Details Tests / build-deb (ubuntu 24.10) (push) Has been cancelled Details Tests / install-deb (debian bookworm) (push) Has been cancelled Details Tests / install-deb (debian bullseye) (push) Has been cancelled Details Tests / install-deb (debian trixie) (push) Has been cancelled Details Tests / install-deb (ubuntu 20.04) (push) Has been cancelled Details Tests / install-deb (ubuntu 22.04) (push) Has been cancelled Details Tests / install-deb (ubuntu 24.04) (push) Has been cancelled Details Tests / install-deb (ubuntu 24.10) (push) Has been cancelled Details Tests / build-install-rpm (fedora 40) (push) Has been cancelled Details Tests / build-install-rpm (fedora 41) (push) Has been cancelled Details Tests / run tests (debian bookworm) (push) Has been cancelled Details Tests / run tests (debian bullseye) (push) Has been cancelled Details Tests / run tests (debian trixie) (push) Has been cancelled Details Tests / run tests (fedora 40) (push) Has been cancelled Details Tests / run tests (fedora 41) (push) Has been cancelled Details Tests / run tests (ubuntu 20.04) (push) Has been cancelled Details Tests / run tests (ubuntu 22.04) (push) Has been cancelled Details Tests / run tests (ubuntu 24.04) (push) Has been cancelled Details Tests / run tests (ubuntu 24.10) (push) Has been cancelled Details	2025-01-07 11:57:39 +01:00
Alexis Métaireau	bc603306a1	Add xdg to the linux dependencies	2025-01-07 11:29:49 +01:00
Alexis Métaireau	6b3dee58a3	Make `uv sync` use a specific venv when building If not specifying it, it tries to write a `.venv` in the current dir which isn't writeable, and fails.	2025-01-07 11:19:07 +01:00