From 9a6cc1ece0462eb86ba30af40c02473b501c34e3 Mon Sep 17 00:00:00 2001
From: merspieler <merspieler@airmail.cc>
Date: Sun, 9 Jun 2019 13:37:43 +0000
Subject: [PATCH] Use requirements.txt for installing pip packages

Signed-off-by: merspieler <merspieler@airmail.cc>
---
 create-venv     | 13 ++-----------
 update-programs |  5 +++++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/create-venv b/create-venv
index 81acdce..ac2a2c9 100755
--- a/create-venv
+++ b/create-venv
@@ -39,20 +39,11 @@ done
 
 python3 -m venv venv/
 source venv/bin/activate
-pip install descartes matplotlib networkx numpy requests pillow pyproj scipy shapely psycopg2-binary
+pip install -r osm2city/requirements.txt
 if [ $? == 1 ]; then
 	echo "pip had problems installing some packages"
 	echo "Please make sure that all of the following packages are installed in the venv"
-	echo "descartes"
-	echo "matplotlib"
-	echo "networkx"
-	echo "numpy"
-	echo "requests"
-	echo "pillow"
-	echo "pyproj"
-	echo "scipy"
-	echo "shapely"
-	echo "psycopg2-binary"
+	cat osm2city/requirements.txt
 	echo "NOTE: use 'source venv/bin/activate' before you install the packages"
 	exit 3
 fi
diff --git a/update-programs b/update-programs
index 68d1cc5..87e240f 100755
--- a/update-programs
+++ b/update-programs
@@ -46,3 +46,8 @@ git pull --rebase
 echo "Updating osm2city-data..."
 cd ../osm2city-data
 git pull --rebase
+
+echo "Updating venv..."
+cd ../
+source venv/bin/activate
+pip install -r osm2city/requirements.txt