Merge branch 'develop' into money_mgt

docs/installation.md

@@ -251,7 +251,7 @@ python3 -m pip install -e .
 
 ### MacOS
 
-#### Install Python 3.6, git, wget and ta-lib
+#### Install Python 3.6, git and wget
 
 ```bash
 brew install python3 git wget
@@ -268,9 +268,9 @@ wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
 tar xvzf ta-lib-0.4.0-src.tar.gz
 cd ta-lib
 sed -i.bak "s|0.00000001|0.000000000000000001 |g" src/ta_func/ta_utility.h
-./configure --prefix=/usr
+./configure --prefix=/usr/local
 make
-make install
+sudo make install
 cd ..
 rm -rf ./ta-lib*
 ```

requirements.txt

@@ -1,4 +1,4 @@
-ccxt==1.17.402
+ccxt==1.17.411
 SQLAlchemy==1.2.12
 python-telegram-bot==11.1.0
 arrow==0.12.1

setup.sh

@@ -35,10 +35,13 @@ function updateenv () {
 
 # Install tab lib
 function install_talib () {
-    curl -O -L http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
     tar zxvf ta-lib-0.4.0-src.tar.gz
-    cd ta-lib && ./configure --prefix=/usr && make && sudo make install
-    cd .. && rm -rf ./ta-lib*
+    cd ta-lib
+    sed -i.bak "s|0.00000001|0.000000000000000001 |g" src/ta_func/ta_utility.h
+    ./configure --prefix=/usr/local
+    make
+    sudo make install
+    cd .. && rm -rf ./ta-lib/
 }
 
 # Install bot MacOS
@@ -50,8 +53,8 @@ function install_macos () {
         echo "-------------------------"
         /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
     fi
-    brew install python3 wget ta-lib
-
+    brew install python3 wget
+    install_talib
     test_and_fix_python_on_mac
 }