From 1285fe1561c5498c2671bdf255b34f1ee054d828 Mon Sep 17 00:00:00 2001
From: marxzuckerburg <mz@marxzuckerburg.com>
Date: Mon, 5 Oct 2020 08:41:08 +0100
Subject: [PATCH] ???

---
 requirements.txt          |  2 +-
 script/install-windows.sh | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 111bd06..4bf03c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -65,4 +65,4 @@ utm==0.6.0
 watchdog==0.10.3
 Werkzeug==1.0.1
 wrapt==1.12.1
-hirlite
\ No newline at end of file
+# hirlite
\ No newline at end of file
diff --git a/script/install-windows.sh b/script/install-windows.sh
index 7fecb60..072852b 100644
--- a/script/install-windows.sh
+++ b/script/install-windows.sh
@@ -72,7 +72,7 @@ echo '
 #### 
 # Package manager setups
 # 
-pacman -S curl wget unzip gcc make openssl-devel git
+pacman -S curl wget unzip gcc make openssl-devel git libcrypt-devel python3 python3-pip mingw-w64-x86_64-python-pandas
 
 
 
@@ -117,14 +117,11 @@ echo '
 path_venv="$path_repo/venv"
 echo "Now using python (t1): `which python`"
 
-conda config --add channels conda-forge
-conda create -y -p "$path_venv" python=3.7 cartopy pip virtualenv rtree pyzbar wxpython
-# source "$path_conda/etc/profile.d/conda.sh"
-
-conda activate "$path_venv"
+python -m virtualenv "$path_venv"
+source "$path_venv/bin/activate"
 
 echo "Now using python (t2): `which python`"
-python -m pip install -U setuptools
+python -m pip install -U setuptools pip wheel