From 4573424e0cc16424658b8a0909dfb1b0414d6b05 Mon Sep 17 00:00:00 2001
From: nanoric <nanoric@qq.com>
Date: Wed, 15 May 2019 16:36:56 +0800
Subject: [PATCH] [Mod] use python -m pip instead of pip

ibapi & rqdatac is installed from 3rd-party source. old version of pip can't handle this correctly.
upgrading pip might make /usr/bin/pip(3) unable to execute. So python -m pip is safer to run pip.
---
 .travis.yml  | 14 +++++++-------
 appveyor.yml |  8 ++++----
 install.bat  | 13 ++++++++-----
 install.sh   | 16 ++++++++--------
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7ed6924eda..62ea3a44dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ matrix:
   include:
     - name: "code quality analysis: flake8"
       before_install:
-        - pip install flake8
+        - python -m pip install flake8
       install:
         - ""  # prevent running "pip install -r requirements.txt"
       script:
@@ -48,7 +48,7 @@ matrix:
         # update pip & setuptools
         - python -m pip install --upgrade pip wheel setuptools
         # Linux install script
-        - pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
+        - python -m pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
         - bash ./install.sh
 
     - name: "sdist install under Ubuntu: gcc-7"
@@ -73,11 +73,11 @@ matrix:
         -   make
         -   sudo make install
         - popd
-        - pip install numpy
-        - pip install --pre --extra-index-url https://rquser:ricequant99@py.ricequant.com/simple/ rqdatac
-        - pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
+        - python -m pip install numpy
+        - python -m pip install --pre --extra-index-url https://rquser:ricequant99@py.ricequant.com/simple/ rqdatac
+        - python -m pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
         - python setup.py sdist
-        - pip install dist/`ls dist`
+        - python -m pip install dist/`ls dist`
 
     - name: "pip install under osx"
       os: osx
@@ -85,7 +85,7 @@ matrix:
       services: []
       before_install: []
       install:
-        - pip3 install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
+        - python -m pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
         - bash ./install_osx.sh
       before_script: []
       script:
diff --git a/appveyor.yml b/appveyor.yml
index 6edca690d4..2d29e995ab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -53,10 +53,10 @@ for:
         - configuration: sdist
     build_script:
       - python setup.py sdist
-      - pip install --pre --extra-index-url https://rquser:ricequant99@py.ricequant.com/simple/ rqdatac
-      - pip install https://pip.vnpy.com/colletion/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl
-      - pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
-      - ps: $name=(ls dist).name; pip install "dist/$name"
+      - python -m pip install --pre --extra-index-url https://rquser:ricequant99@py.ricequant.com/simple/ rqdatac
+      - python -m pip install https://pip.vnpy.com/colletion/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl
+      - python -m pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
+      - ps: $name=(ls dist).name; python -m pip install "dist/$name"
 
 test_script:
   - cd tests
diff --git a/install.bat b/install.bat
index bc984aaed2..75002ef9f5 100644
--- a/install.bat
+++ b/install.bat
@@ -1,10 +1,13 @@
+:: Upgrade pip & setuptools
+python -m pip install --upgrade pip setuptools
+
 ::Install talib and ibapi
-pip install https://pip.vnpy.com/colletion/rqdatac-2.1.0.tar.gz
-pip install https://pip.vnpy.com/colletion/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl
-pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
+python -m pip install https://pip.vnpy.com/colletion/rqdatac-2.1.0.tar.gz
+python -m pip install https://pip.vnpy.com/colletion/TA_Lib-0.4.17-cp37-cp37m-win_amd64.whl
+python -m pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
 
 ::Install Python Modules
-pip install -r requirements.txt
+python -m pip install -r requirements.txt
 
 :: Install vn.py
-pip install .
\ No newline at end of file
+python -m pip install .
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 0ca3b777d6..25ef59da1e 100644
--- a/install.sh
+++ b/install.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 python=$1
-pip=$2
 prefix=$3
 
 [[ -z $python ]] && python=python
-[[ -z $pip ]] && pip=pip
 [[ -z $prefix ]] && prefix=/usr
 
+$python -m pip install --upgrade pip setuptools wheel
+
 # Get and build ta-lib
 pushd /tmp
 wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
@@ -19,18 +19,18 @@ sudo make install
 popd
 
 # old versions of ta-lib imports numpy in setup.py
-$pip install numpy
+$python -m pip install numpy
 
 # Install extra packages
-$pip install --pre --extra-index-url https://rquser:ricequant99@py.ricequant.com/simple/ rqdatac
-$pip install ta-lib
-$pip install https://vnpy-pip.oss-cn-shanghai.aliyuncs.com/colletion/ibapi-9.75.1-py3-none-any.whl
+$python -m pip install --pre --extra-index-url https://rquser:ricequant99@py.ricequant.com/simple/ rqdatac
+$python -m pip install ta-lib
+$python -m pip install https://vnpy-pip.oss-cn-shanghai.aliyuncs.com/colletion/ibapi-9.75.1-py3-none-any.whl
 
 # Install Python Modules
-$pip install -r requirements.txt
+$python -m pip install -r requirements.txt
 
 # Install local Chinese language environment
 sudo locale-gen zh_CN.GB18030
 
 # Install vn.py
-$pip install .
\ No newline at end of file
+$python -m pip install .
\ No newline at end of file