From a1a8a6e6959c9858efabeeda27f8c12da0c1671c Mon Sep 17 00:00:00 2001 From: AramJonghu Date: Fri, 14 Aug 2026 19:39:52 +0200 Subject: [PATCH 1/2] ci: add relevant dependencies; resolves MissingImport --- .gitea/workflows/python.yml | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/python.yml b/.gitea/workflows/python.yml index 2baf3ed..011ba51 100644 --- a/.gitea/workflows/python.yml +++ b/.gitea/workflows/python.yml @@ -97,7 +97,7 @@ jobs: py3-pip python3 -m venv .venv . .venv/bin/activate - pip install --no-cache-dir basedpyright + pip install --no-cache-dir basedpyright typer pillow materialyoucolor jinja2 - name: Type check run: | diff --git a/pyproject.toml b/pyproject.toml index 2c53644..9d0589d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,6 +13,9 @@ dependencies = [ "materialyoucolor" ] +[project.optional-dependencies] +dev = ["pytest"] + [project.scripts] zshell-cli = "zshell:main" -- 2.47.3 From abf7382771470397d45727bf8d62e03a53c5a55a Mon Sep 17 00:00:00 2001 From: AramJonghu Date: Fri, 14 Aug 2026 19:54:07 +0200 Subject: [PATCH 2/2] ci: libcava dev headers --- ci/Dockerfile | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index dd94cce..e080260 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -30,14 +30,24 @@ RUN pacman -S --noconfirm \ glib2 # AUR: libcava (provides development headers for cava) -RUN pacman -S --needed --noconfirm sudo && \ +RUN pacman -Syu --noconfirm && \ + pacman -S --needed --noconfirm \ + sudo \ + meson \ + autoconf-archive \ + python-tqdm && \ useradd -m builder && \ - echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ - su builder -c " \ - git clone https://aur.archlinux.org/libcava.git /tmp/libcava && \ - cd /tmp/libcava && \ - makepkg -si --noconfirm \ - " && \ + echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +RUN for i in 1 2 3 4 5; do \ + rm -rf /tmp/libcava && \ + git clone --depth 1 https://aur.archlinux.org/libcava.git /tmp/libcava && \ + break || sleep 5; \ + done && \ + test -d /tmp/libcava/.git && \ + chown -R builder /tmp/libcava + +RUN su builder -c "cd /tmp/libcava && makepkg -si --noconfirm" && \ rm -rf /tmp/libcava && \ userdel -r builder && \ sed -i '/^builder/d' /etc/sudoers -- 2.47.3