From 5e11804e7f123533713ee97eb57d9015fed42cec Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Wed, 30 Jun 2021 15:44:33 +0200
Subject: [PATCH] Replace merge with update in requirements script, upgrade
 test reqs in cic-cache

---
 apps/cic-cache/test_requirements.txt  | 2 +-
 apps/cic-notify/test_requirements.txt | 1 -
 apps/cic-ussd/test_requirements.txt   | 2 +-
 apps/util/requirements/update_base.sh | 4 +++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/cic-cache/test_requirements.txt b/apps/cic-cache/test_requirements.txt
index 3582004c..f0c5fd81 100644
--- a/apps/cic-cache/test_requirements.txt
+++ b/apps/cic-cache/test_requirements.txt
@@ -6,5 +6,5 @@ sqlparse==0.4.1
 pytest-celery==0.0.0a1
 eth_tester==0.5.0b3
 py-evm==0.3.0a20
-cic-base[full]==0.1.3a1
+cic_base[full]==0.1.3a3+build.4aa03607
 sarafu-faucet~=0.0.4a1
diff --git a/apps/cic-notify/test_requirements.txt b/apps/cic-notify/test_requirements.txt
index fda03d35..41c5f099 100644
--- a/apps/cic-notify/test_requirements.txt
+++ b/apps/cic-notify/test_requirements.txt
@@ -2,4 +2,3 @@ pytest~=6.0.1
 pytest-celery~=0.0.0a1
 pytest-mock~=3.3.1
 pysqlite3~=0.4.3
-
diff --git a/apps/cic-ussd/test_requirements.txt b/apps/cic-ussd/test_requirements.txt
index 76aa808a..59af6564 100644
--- a/apps/cic-ussd/test_requirements.txt
+++ b/apps/cic-ussd/test_requirements.txt
@@ -8,4 +8,4 @@ pytest-mock==3.3.1
 pytest-ordering==0.6
 pytest-redis==2.0.0
 requests-mock==1.8.0
-tavern==1.14.2
\ No newline at end of file
+tavern==1.14.2
diff --git a/apps/util/requirements/update_base.sh b/apps/util/requirements/update_base.sh
index 709baa59..938867be 100644
--- a/apps/util/requirements/update_base.sh
+++ b/apps/util/requirements/update_base.sh
@@ -14,6 +14,8 @@ repos=(../../cic-cache ../../cic-eth ../../cic-ussd ../../data-seeding ../../cic
 for r in ${repos[@]}; do
 	f="$r/requirements.txt"
 	>&2 echo updating $f
-	pyreq-merge $f base_requirement.txt > $t
+	f="$r/test_requirements.txt"
+	>&2 echo updating $f
+	pyreq-update $f base_requirement.txt > $t
 	cp $t $f
 done