Merge branch 'develop' into money_mgt

This commit is contained in:
misagh 2018-10-25 17:37:46 +02:00
commit 8a316aba35
3 changed files with 12 additions and 9 deletions

View File

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

View File

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

View File

@ -35,10 +35,13 @@ function updateenv () {
# Install tab lib # Install tab lib
function install_talib () { 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 tar zxvf ta-lib-0.4.0-src.tar.gz
cd ta-lib && ./configure --prefix=/usr && make && sudo make install cd ta-lib
cd .. && rm -rf ./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 # Install bot MacOS
@ -50,8 +53,8 @@ function install_macos () {
echo "-------------------------" echo "-------------------------"
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
fi fi
brew install python3 wget ta-lib brew install python3 wget
install_talib
test_and_fix_python_on_mac test_and_fix_python_on_mac
} }