[Mod] update install scripts

README.md

@@ -178,11 +178,15 @@ vn.py是一套基于Python的开源量化交易系统开发框架，在开源社
 
 **Windows**
 
-    install.bat
+```
+install.bat
+```
 
 **Ubuntu**
 
-    bash install.sh
+```
+. install.sh
+```
 
 **Macos**
 

README_ENG.md

@@ -150,11 +150,21 @@ Download the latest version from [here](https://github.com/vnpy/vnpy/releases),
 
 **Windows**
 
-    install.bat
+```
+install.bat
+```
 
 **Ubuntu**
 
-    bash install.sh
+```
+. install.sh
+```
+
+**Macos**
+
+```
+bash install_osx.sh
+```
 
 ## User's Guide
 

install.bat

@@ -1,5 +1,5 @@
 :: Upgrade pip & setuptools
-python -m pip install --upgrade pip setuptools
+python -m pip install --upgrade pip setuptools wheel
 
 ::Install prebuild wheel
 python -m pip install https://pip.vnpy.com/colletion/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl

install.sh

@@ -5,35 +5,37 @@ prefix=$2
 shift 2
 
 [[ -z $python ]] && python=python
-[[ -z $prefix ]] && prefix=/usr
+[[ -z $prefix ]] && prefix=~/usr/talib
 
 $python -m pip install --upgrade pip setuptools wheel
 
 # Get and build ta-lib
 function install-ta-lib()
-{
-    pushd /tmp
+{   
+    # install numpy first
+    $python -m pip install numpy==1.18.2
+
+    mkdir -p $prefix
+    pushd $prefix
     wget https://pip.vnpy.com/colletion/ta-lib-0.4.0-src.tar.gz
     tar -xf ta-lib-0.4.0-src.tar.gz
     cd ta-lib
     ./configure --prefix=$prefix
     make -j1
     make install
     popd
+
+    echo "export LD_LIBRARY_PATH=$prefix/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc
+    export LD_LIBRARY_PATH=$prefix/lib:\$LD_LIBRARY_PATH
+
+    CPPFLAGS="-I$prefix/include" LDFLAGS="-L$prefix/lib" pip install ta-lib==0.4.17
 }
 function ta-lib-exists()
 {
-    ta-lib-config --libs > /dev/null
+    $prefix/ta-lib-config --libs > /dev/null
 }
 ta-lib-exists || install-ta-lib
 
-# old versions of ta-lib imports numpy in setup.py
-$python -m pip install numpy
-
-# Install extra packages
-$python -m pip install ta-lib
-$python -m pip install psycopg2-binary
-
 # Install Python Modules
 $python -m pip install -r requirements.txt
 

install_osx.sh

@@ -1,37 +1,27 @@
 #!/usr/bin/env bash
 
 python=$1
-prefix=$2
-shift 2
+shift 1
 
 [[ -z $python ]] && python=python
-[[ -z $prefix ]] && prefix=/usr
 
 $python -m pip install --upgrade pip setuptools wheel
 
 # Get and build ta-lib
 function install-ta-lib()
 {
-    pushd /tmp
-    curl https://pip.vnpy.com/colletion/ta-lib-0.4.0-src.tar.gz --output ta-lib-0.4.0-src.tar.gz
-    tar -xf ta-lib-0.4.0-src.tar.gz
-    cd ta-lib
-    ./configure --prefix=$prefix
-    make -j
-    make install
-    popd
+    export HOMEBREW_NO_AUTO_UPDATE=true
+    brew install ta-lib
 }
 function ta-lib-exists()
 {
     ta-lib-config --libs > /dev/null
 }
 ta-lib-exists || install-ta-lib
 
-# old versions of ta-lib imports numpy in setup.py
-$python -m pip install numpy
-
-# Install extra packages
-$python -m pip install ta-lib
+# install ta-lib
+$python -m pip install numpy==1.18.2
+$python -m pip install ta-lib==0.4.17
 
 # Install Python Modules
 $python -m pip install -r requirements.txt