From 9a9ba80bbef031f96123f77ddb92d1c8aa90c933 Mon Sep 17 00:00:00 2001
From: quadrismegistus <ryan.heuser@gmail.com>
Date: Fri, 25 Sep 2020 14:11:46 +0100
Subject: [PATCH] updates

---
 bin/komrade-activate |  16 +++++++
 bin/komrade-app      |   2 +
 requirements.txt     | 106 ++++++++++++++-----------------------------
 3 files changed, 53 insertions(+), 71 deletions(-)

diff --git a/bin/komrade-activate b/bin/komrade-activate
index da63bf2..be7ad1c 100755
--- a/bin/komrade-activate
+++ b/bin/komrade-activate
@@ -1,10 +1,26 @@
 
 export KOMRADE_SHOW_LOG=0
 
+echo "`which python`"
+
+
+
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 pathvenv=`realpath "$SCRIPTPATH/../venv"`
 pathconda=`realpath "$SCRIPTPATH/../../lib/miniconda3"`
 
+echo $SCRIPTPATH
+echo $pathvenv
+echo $pathconda
+
+source $pathconda/etc/profile.d/conda.sh
+
 export PATH="$pathconda/bin:$PATH"
+#echo $PATH
 
+echo "`which conda`"
+conda activate
 conda activate "$pathvenv"
+
+
+#echo "`which python`"
\ No newline at end of file
diff --git a/bin/komrade-app b/bin/komrade-app
index 7aaed8d..13700e3 100755
--- a/bin/komrade-app
+++ b/bin/komrade-app
@@ -8,6 +8,8 @@ export KOMRADE_SHOW_LOG=0
 
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+$SCRIPTPATH/komrade-activate
+
 path=`realpath "$SCRIPTPATH/../komrade/app/main.py"`
 pathvenv=`realpath "$SCRIPTPATH/../../venv/bin/activate"`
 source $pathvenv
diff --git a/requirements.txt b/requirements.txt
index 6847b15..6e543aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,77 +1,41 @@
-art==4.7
-as==0.1
-astroid==2.4.2
-cachetools==4.1.1
+appdirs==1.4.4
+brotlipy==0.7.0
+Cartopy @ file:///tmp/build/80754af9/cartopy_1594325434356/work
 certifi==2020.6.20
-cffi==1.14.2
+cffi @ file:///tmp/build/80754af9/cffi_1600699180754/work
 chardet==3.0.4
-click==7.1.2
-colorama==0.4.3
-cryptography==3.0
-docutils==0.16
-fire==0.3.1
-Flask==1.1.2
-Flask-Classful==0.14.2
-h11==0.8.1
-h2==3.2.0
-hpack==3.0.0
-http3==0.6.7
-hyperframe==5.2.0
-idna==2.10
-import==0.0.1
-ipinfo==3.0.0
-isort==5.4.2
-itsdangerous==1.1.0
-Jinja2==2.11.2
-joblib==0.16.0
-Kivy==2.0.0rc3
-Kivy-Garden==0.1.4
-kivymd==0.104.1
-lazy-object-proxy==1.4.3
-MarkupSafe==1.1.1
-mccabe==0.6.1
-numpy==1.19.1
-pandas==1.1.2
-pathtools==0.1.2
-Pillow==7.2.0
-plyer==1.4.3
-pycparser==2.20
-pyfiglet==0.8.post1
-Pygments==2.6.1
-pylint==2.6.0
-pypng==0.0.20
+cryptography @ file:///tmp/build/80754af9/cryptography_1598892037289/work
+cycler==0.10.0
+distlib @ file:///tmp/build/80754af9/distlib_1600715912133/work
+filelock==3.0.12
+hirlite==0.3.1
+idna @ file:///tmp/build/80754af9/idna_1593446292537/work
+importlib-metadata @ file:///tmp/build/80754af9/importlib-metadata_1593446408836/work
+kiwisolver==1.2.0
+matplotlib @ file:///tmp/build/80754af9/matplotlib-base_1597876320876/work
+mkl-fft==1.2.0
+mkl-random==1.1.1
+mkl-service==2.3.0
+numpy @ file:///tmp/build/80754af9/numpy_and_numpy_base_1596233707986/work
+olefile==0.46
+OWSLib @ file:///tmp/build/80754af9/owslib_1594380045445/work
+Pillow @ file:///tmp/build/80754af9/pillow_1594307325547/work
+pycparser @ file:///tmp/build/80754af9/pycparser_1594388511720/work
+pyepsg==0.4.0
+pykdtree==1.3.1
+pyOpenSSL @ file:///tmp/build/80754af9/pyopenssl_1594392929924/work
+pyparsing==2.4.7
 pyproj==2.6.1.post1
-PyQRCode==1.2.1
-PySocks==1.7.1
-pythemis==0.13.0
+pyshp @ file:///tmp/build/80754af9/pyshp_1600141782871/work
+PySocks @ file:///tmp/build/80754af9/pysocks_1594394576006/work
 python-dateutil==2.8.1
 pytz==2020.1
-pyzbar==0.1.8
-qrcode==6.1
-redis==3.5.3
-requests==2.24.0
-requests-async==0.6.2
-requests-futures==1.0.0
-rfc3986==1.4.0
-rpcudp==4.0.1
-Rtree==0.8.3
-scikit-learn==0.23.2
-scipy==1.5.2
-Shapely==1.7.1
-simplekv==0.14.1
+PyYAML==5.3.1
+requests @ file:///tmp/build/80754af9/requests_1592841827918/work
+scipy @ file:///tmp/build/80754af9/scipy_1597686620742/work
+Shapely @ file:///tmp/build/80754af9/shapely_1599817087478/work
 six==1.15.0
-sklearn==0.0
-sqlitedict==1.6.0
-termcolor==1.1.0
-text2art==0.2.0
-threadpoolctl==2.1.0
-toml==0.10.1
-torpy==1.1.3
-typed-ast==1.4.1
-u-msgpack-python==2.7.0
-ujson==3.1.0
-urllib3==1.25.10
-utm==0.6.0
-watchdog==0.10.3
-Werkzeug==1.0.1
-wrapt==1.12.1
+tornado==6.0.4
+urllib3 @ file:///tmp/build/80754af9/urllib3_1597086586889/work
+virtualenv @ file:///tmp/build/80754af9/virtualenv_1600783079069/work
+zipp==3.1.0