From 237a4c20ab51e01f6adbb7a2a72fb85af060d2f2 Mon Sep 17 00:00:00 2001
From: Aaron Fiore <founder@evergreencrypto.co>
Date: Sat, 17 Aug 2024 17:13:23 -0700
Subject: [PATCH] client: Dockerfiles: remove `shyaml` package, add `yq`

- Replaces `shyaml` dependency with `yq`
  * Less dependency upon `pipx` (`csvcut` is next to go)
  * `yq` will be needed by a container plugin
---
 client/Dockerfiles/finance/Dockerfile.archlinux.in | 2 +-
 client/Dockerfiles/finance/Dockerfile.ubuntu.in    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/Dockerfiles/finance/Dockerfile.archlinux.in
index c9c6c98..11d1548 100644
--- a/client/Dockerfiles/finance/Dockerfile.archlinux.in
+++ b/client/Dockerfiles/finance/Dockerfile.archlinux.in
@@ -47,11 +47,11 @@ RUN pacman -Syu \
   vim \
   visidata \
   xsv \
+  yq \
   --noconfirm --disable-download-timeout
 
 USER @DOCKER_FINANCE_USER@
 WORKDIR /home/@DOCKER_FINANCE_USER@
-RUN pipx install shyaml
 RUN pipx install csvkit
 
 #
diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
index d812961..fab1cd1 100644
--- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in
+++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -52,6 +52,7 @@ RUN apt-get install -y \
   timewarrior \
   vim \
   visidata \
+  yq \
   zlib1g-dev
 
 RUN apt-get install -y cargo
@@ -59,7 +60,6 @@ RUN cargo install xsv --root /usr
 
 USER @DOCKER_FINANCE_USER@
 WORKDIR /home/@DOCKER_FINANCE_USER@
-RUN pipx install shyaml
 RUN pipx install csvkit
 
 #