[Fix] try to fix errors

This commit is contained in:
nanoric 2019-04-15 01:26:45 -04:00
parent 080f0cc131
commit a7a80e0e9a
3 changed files with 41 additions and 87 deletions

View File

@ -12,8 +12,8 @@ services:
- postgresql - postgresql
before_script: before_script:
- psql -d postgresql://postgres:@localhost -c "create database vnpy;" - psql -d postgresql://postgres:${VNPY_TEST_POSTGRESQL_PASSWORD}@localhost -c "create database vnpy;"
- mysql -e 'CREATE DATABASE vnpy;' - mysql -u root --password=${VNPY_TEST_MYSQL_PASSWORD} -e 'CREATE DATABASE vnpy;'
script: script:
# todo: use python unittest # todo: use python unittest
@ -23,16 +23,6 @@ script:
matrix: matrix:
include: include:
- name: "code quality analysis: flake8"
services: [] # service is not need
before_script: []
before_install:
- pip install flake8
install:
- "" # prevent running "pip install -r requirements.txt"
script:
- flake8
- name: "pip install under Windows" - name: "pip install under Windows"
os: "windows" os: "windows"
services: [] # service is unavailable under windows services: [] # service is unavailable under windows
@ -42,7 +32,9 @@ matrix:
- PATH="/c/Python37:/c/Python37/Scripts:/c/tools/mysql/current/bin:/c/Program Files/PostgreSQL/10/bin:$PATH" - PATH="/c/Python37:/c/Python37/Scripts:/c/tools/mysql/current/bin:/c/Program Files/PostgreSQL/10/bin:$PATH"
before_install: before_install:
- choco install -yf mysql mongodb - choco install -yf mysql mongodb
- choco install -yf postgresql10 --params '/Password:' # I don't know how enable a "trust" auth method in choco installed psql
- choco install -yf postgresql10 --params '/Password:1234'
- export VNPY_TEST_POSTGRESQL_PASSWORD=1234
- choco install -yf python3 --version 3.7.2 - choco install -yf python3 --version 3.7.2
install: install:
- python -m pip install --upgrade pip wheel setuptools - python -m pip install --upgrade pip wheel setuptools
@ -51,22 +43,15 @@ matrix:
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install . - pip install .
- name: "pip install under Ubuntu: gcc-7" - name: "pip install under osx"
before_install: os: osx
# C++17 services: []
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test before_script: []
- sudo apt-get update -y language: shell # osx supports only shell
before_install: []
install: install:
# C++17 - pip3 install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
- sudo apt-get install -y gcc-7 g++-7 - bash ./install.sh python3 pip3
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
- sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-7 90
- sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-7 90
# 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
- bash ./install.sh
- name: "pip install under Ubuntu: gcc-8" - name: "pip install under Ubuntu: gcc-8"
before_install: before_install:
@ -84,48 +69,3 @@ matrix:
# Linux install script # Linux install script
- pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl - pip install https://pip.vnpy.com/colletion/ibapi-9.75.1-001-py3-none-any.whl
- bash ./install.sh - bash ./install.sh
- name: "sdist install under Windows"
os: "windows"
services: [] # service is not need
before_script: []
# language : cpp is necessary for windows
language: "cpp"
env:
- PATH="/c/Python37:/c/Python37/Scripts:/c/tools/mysql/current/bin:/c/Program Files/PostgreSQL/10/bin:$PATH"
before_install:
- choco install -yf mysql mongodb
- choco install -yf postgresql10 --params '/Password:'
- choco install -yf python3 --version 3.7.2
install:
- python -m pip install --upgrade pip wheel setuptools
- python setup.py sdist
- 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
- pip install dist/`ls dist`
- name: "sdist install under Ubuntu: gcc-8"
before_install:
# C++17
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -y
install:
# C++17
- sudo apt-get install -y gcc-8 g++-8
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
- sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-8 90
- sudo update-alternatives --install /usr/bin/gcc cc /usr/bin/gcc-8 90
# Linux install script
- python -m pip install --upgrade pip wheel setuptools
- pushd /tmp
- wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
- tar -xf ta-lib-0.4.0-src.tar.gz
- cd ta-lib
- ./configure --prefix=/usr
- make
- sudo make install
- popd
- pip install numpy
- 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`

View File

@ -11,7 +11,7 @@ pushd /tmp
wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
tar -xf ta-lib-0.4.0-src.tar.gz tar -xf ta-lib-0.4.0-src.tar.gz
cd ta-lib cd ta-lib
./configure --prefix=/usr ./configure --prefix=/usr/local
make make
sudo make install sudo make install
popd popd

View File

@ -1,16 +1,30 @@
#!/usr/bin/env bash #!/usr/bin/env bash
export VNPY_TEST_MYSQL_DATABASE=vnpy [[ -z ${VNPY_TEST_MYSQL_DATABASE} ]] && VNPY_TEST_MYSQL_DATABASE=vnpy
export VNPY_TEST_MYSQL_HOST=127.0.0.1 [[ -z ${VNPY_TEST_MYSQL_HOST} ]] && VNPY_TEST_MYSQL_HOST=127.0.0.1
export VNPY_TEST_MYSQL_PORT=3306 [[ -z ${VNPY_TEST_MYSQL_PORT} ]] && VNPY_TEST_MYSQL_PORT=3306
export VNPY_TEST_MYSQL_USER=root [[ -z ${VNPY_TEST_MYSQL_USER} ]] && VNPY_TEST_MYSQL_USER=root
export VNPY_TEST_MYSQL_PASSWORD= [[ -z ${VNPY_TEST_MYSQL_PASSWORD} ]] && VNPY_TEST_MYSQL_PASSWORD=
export VNPY_TEST_POSTGRESQL_DATABASE=vnpy [[ -z ${VNPY_TEST_POSTGRESQL_DATABASE} ]] && VNPY_TEST_POSTGRESQL_DATABASE=vnpy
export VNPY_TEST_POSTGRESQL_HOST=127.0.0.1 [[ -z ${VNPY_TEST_POSTGRESQL_HOST} ]] && VNPY_TEST_POSTGRESQL_HOST=127.0.0.1
export VNPY_TEST_POSTGRESQL_PORT=5432 [[ -z ${VNPY_TEST_POSTGRESQL_PORT} ]] && VNPY_TEST_POSTGRESQL_PORT=5432
export VNPY_TEST_POSTGRESQL_USER=postgres [[ -z ${VNPY_TEST_POSTGRESQL_USER} ]] && VNPY_TEST_POSTGRESQL_USER=postgres
export VNPY_TEST_POSTGRESQL_PASSWORD= [[ -z ${VNPY_TEST_POSTGRESQL_PASSWORD} ]] && VNPY_TEST_POSTGRESQL_PASSWORD=
export VNPY_TEST_MONGODB_DATABASE=vnpy [[ -z ${VNPY_TEST_MONGODB_DATABASE} ]] && VNPY_TEST_MONGODB_DATABASE=vnpy
export VNPY_TEST_MONGODB_HOST=127.0.0.1 [[ -z ${VNPY_TEST_MONGODB_HOST} ]] && VNPY_TEST_MONGODB_HOST=127.0.0.1
export VNPY_TEST_MONGODB_PORT=27017 [[ -z ${VNPY_TEST_MONGODB_PORT} ]] && VNPY_TEST_MONGODB_PORT=27017
export VNPY_TEST_MYSQL_DATABASE
export VNPY_TEST_MYSQL_HOST
export VNPY_TEST_MYSQL_PORT
export VNPY_TEST_MYSQL_USER
export VNPY_TEST_MYSQL_PASSWORD
export VNPY_TEST_POSTGRESQL_DATABASE
export VNPY_TEST_POSTGRESQL_HOST
export VNPY_TEST_POSTGRESQL_PORT
export VNPY_TEST_POSTGRESQL_USER
export VNPY_TEST_POSTGRESQL_PASSWORD
export VNPY_TEST_MONGODB_DATABASE
export VNPY_TEST_MONGODB_HOST
export VNPY_TEST_MONGODB_PORT