From 4e1b0995471082a521ebef9c4ffaaca7518e503a Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Wed, 9 Mar 2022 22:02:42 +0100
Subject: [PATCH] Fixed optional dependencies

---
 APKBUILD                              | 2 +-
 Dockerfile                            | 2 +-
 dev/templates/install_alpine.sh.jinja | 3 ++-
 install/dependencies_basic.txt        | 1 -
 install/dependencies_build.txt        | 8 --------
 install/dependencies_run.txt          | 1 -
 install/dependencies_run_opt.txt      | 1 -
 install/install_dependencies.sh       | 4 ----
 pyproject.toml                        | 4 +++-
 9 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 install/dependencies_basic.txt
 delete mode 100644 install/dependencies_build.txt
 delete mode 100644 install/dependencies_run.txt
 delete mode 100644 install/dependencies_run_opt.txt
 delete mode 100644 install/install_dependencies.sh

diff --git a/APKBUILD b/APKBUILD
index 3f6dc70..5e118c2 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="Self-hosted music scrobble database"
 url="https://github.com/krateng/maloja"
 arch="noarch"
 license="GPL-3.0"
-depends="python3 tzdata vips"
+depends="python3 tzdata"
 pkgusers=$pkgname
 pkggroups=$pkgname
 depends_dev="gcc python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers"
diff --git a/Dockerfile b/Dockerfile
index 29989d1..441bedf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ COPY ./requirements.txt ./requirements.txt
 # Install everything before copying rest of the project, can be cached
 RUN \
 	apk add --no-cache --virtual .build-deps gcc python3-dev libxml2-dev libxslt-dev libffi-dev libc-dev py3-pip linux-headers && \
-	apk add --no-cache python3 tzdata vips && \
+	apk add --no-cache python3 tzdata && \
 	pip3 install --no-cache-dir -r requirements.txt && \
 	apk del .build-deps
 
diff --git a/dev/templates/install_alpine.sh.jinja b/dev/templates/install_alpine.sh.jinja
index d83f9c2..ce07a61 100644
--- a/dev/templates/install_alpine.sh.jinja
+++ b/dev/templates/install_alpine.sh.jinja
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 apk add \
 	{{ tool.osreqs.alpine.build | join(' \\\n\t') }} \
-	{{ tool.osreqs.alpine.run | join(' \\\n\t') }}
+	{{ tool.osreqs.alpine.run | join(' \\\n\t') }} \
+	{{ tool.osreqs.alpine.opt | join(' \\\n\t') }}
 pip3 install wheel
 pip3 install malojaserver
diff --git a/install/dependencies_basic.txt b/install/dependencies_basic.txt
deleted file mode 100644
index 273cd54..0000000
--- a/install/dependencies_basic.txt
+++ /dev/null
@@ -1 +0,0 @@
-python3
diff --git a/install/dependencies_build.txt b/install/dependencies_build.txt
deleted file mode 100644
index 7980da1..0000000
--- a/install/dependencies_build.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-gcc
-python3-dev
-libxml2-dev
-libxslt-dev
-libffi-dev
-libc-dev
-py3-pip
-linux-headers
diff --git a/install/dependencies_run.txt b/install/dependencies_run.txt
deleted file mode 100644
index 0883ff0..0000000
--- a/install/dependencies_run.txt
+++ /dev/null
@@ -1 +0,0 @@
-tzdata
diff --git a/install/dependencies_run_opt.txt b/install/dependencies_run_opt.txt
deleted file mode 100644
index c2850f6..0000000
--- a/install/dependencies_run_opt.txt
+++ /dev/null
@@ -1 +0,0 @@
-vips
diff --git a/install/install_dependencies.sh b/install/install_dependencies.sh
deleted file mode 100644
index bbdc570..0000000
--- a/install/install_dependencies.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-sed 's/#.*//' ./install/dependencies_basic.txt  | xargs apk add
-sed 's/#.*//' ./install/dependencies_build.txt  | xargs apk add
-sed 's/#.*//' ./install/dependencies_run.txt  | xargs apk add
-sed 's/#.*//' ./install/dependencies_run_opt.txt  | xargs apk add
diff --git a/pyproject.toml b/pyproject.toml
index 3c75c9e..fad301d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,6 +61,8 @@ build =[
 ]
 run = [
 	"python3",
-	"tzdata",
+	"tzdata"
+]
+opt = [
 	"vips"
 ]