better output from circle compare_reqs

nucypher · Jun 14, 2019 · e1e89f9 · e1e89f9
1 parent 70dc000
commit e1e89f9
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/scripts/circle/compare_reqs.sh b/scripts/circle/compare_reqs.sh
@@ -2,22 +2,40 @@
 
 set -e
 
+# update lock and build requirements files
 yes | ./scripts/installation/rebuild_pipenv.sh circlereqs
 
-if [ $(md5 -q requirements.txt) == $(md5 -q circlereqs.txt) ]; then
-    echo "requirements.txt is valid"
+echo "---- validating requirements.txt ----"
+REQSHASH=$(md5sum requirements.txt | cut -d ' ' -f1)
+TESTHASH=$(md5sum circlereqs.txt | cut -d ' ' -f1)
+
+echo "- $REQSHASH"
+echo "- $TESTHASH"
+if [ $REQSHASH == $TESTHASH ]; then
+    echo "- requirements.txt is valid ...."
 
 else
-    echo "requirements.txt contains inconsistencies"
+    echo "- requirements.txt contains inconsistencies ...."
+    echo "- you may want to run `pipenv sync --dev` and then ./scripts/installation/rebuild_pipenv.sh ...."
+    echo "- which will rebuild your *requirements.txt files ...."
     diff requirements.txt circlereqs.txt
     exit 2
 fi
 
-if [ $(md5 -q dev-requirements.txt) == $(md5 -q dev-circlereqs.txt) ]; then
-    echo "requirements.txt is valid"
+echo "---- validating dev-requirements.txt ----"
+REQSHASH=$(md5sum dev-requirements.txt | cut -d ' ' -f1)
+TESTHASH=$(md5sum dev-circlereqs.txt | cut -d ' ' -f1)
+
+echo "- $REQSHASH"
+echo "- $TESTHASH"
+
+if [ $REQSHASH == $TESTHASH ]; then
+    echo "- dev-requirements.txt is valid ...."
 
 else
-    echo "dev-requirements.txt contains inconsistencies"
+    echo "- dev-requirements.txt contains inconsistencies ...."
+    echo "- you may want to run `pipenv sync --dev` and then ./scripts/installation/rebuild_pipenv.sh ...."
+    echo "- which will rebuild your *requirements.txt files ...."
     diff dev-requirements.txt dev-circlereqs.txt
     exit 2
-fi
+fi
diff --git a/scripts/installation/rebuild_pipenv.sh b/scripts/installation/rebuild_pipenv.sh
@@ -4,7 +4,7 @@
 PREFIX=${1:-requirements}
 
 read -p "Ok if we update your pip and setuptools? (type y or Y) " -n 1 -r
-echo 
+echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
     pip install --upgrade pip
@@ -17,9 +17,12 @@ rm dev-$PREFIX.txt
 touch $PREFIX.txt
 touch dev-$PREFIX.txt
 
-set -e 
+set -e
 echo "rebuilding pipenv.lock... this will take awhile."
-pipenv lock --clear
 
-pipenv lock --clear --pre --requirements > $PREFIX.txt
+echo "bulding dev-$PREFIX.txt"
 pipenv lock --clear --pre --requirements --dev > dev-$PREFIX.txt
+
+echo "building $PREFIX.txt"
+pipenv lock --clear --pre --requirements > $PREFIX.txt
+