From 705dc55addd83be24a4d840fa9d8dee040011b52 Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Wed, 30 Jun 2021 23:32:53 +0200
Subject: [PATCH] Add piptools step after stripped compile

---
 apps/util/requirements/compile.sh       | 16 +++++++++++++---
 apps/util/requirements/requirements.txt |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/util/requirements/compile.sh b/apps/util/requirements/compile.sh
index 775602c2..c88c2945 100644
--- a/apps/util/requirements/compile.sh
+++ b/apps/util/requirements/compile.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
+set +x
 which pyreq-merge &> /dev/null
 if [ $? -gt 0 ]; then
 	>&2 echo pyreq-merge missing, please install requirements
 	exit 1
 fi
 
+PIP_INDEX_URL=${PIP_INDEX_URL:-http://localhost/python}
 in=$(mktemp)
 out=$(mktemp)
 >&2 echo using tmp $t
@@ -31,10 +33,18 @@ cp -v $out compiled_requirements.txt
 
 outd=$(mktemp -d)
 for r in ${repos[@]}; do
-	f="$r/requirements.txt"
+	f=$(realpath $r/requirements.txt)
 	b=$(basename $f)
+	b_in=$b.in
 	d=$(basename $r)
-	echo output to $outd/$d/$b
+	echo output to $outd/$d/$b_in
 	mkdir -vp $outd/$d
-	pyreq-update -v $f compiled_requirements.txt > $outd/$d/$b
+	echo "-r $f" > $outd/$d/$b_in
+	pyreq-update -v $f compiled_requirements.txt >> $outd/$d/$b_in
+	pip-compile -v --extra-index-url $PIP_INDEX_URL $outd/$d/$b_in -o $outd/$d/$b
+	if [ $? -gt 0 ]; then
+		>&2 echo requirement compile failed for $f
+		exit 1
+	fi
 done
+set -x
diff --git a/apps/util/requirements/requirements.txt b/apps/util/requirements/requirements.txt
index bfa3e14d..c021326c 100644
--- a/apps/util/requirements/requirements.txt
+++ b/apps/util/requirements/requirements.txt
@@ -1 +1,2 @@
 requirements-magic~=0.0.3a1
+pip-tools==6.2.0