Commit Graph

2009 Commits

Author SHA1 Message Date
vn.py
9b216c1668 Merge branch 'v2.0.1-DEV' of https://github.com/vnpy/vnpy into v2.0.1-DEV 2019-03-29 16:14:01 +08:00
vn.py
9f9e721983 [Mod]cancel only allowd when cta template trading == true 2019-03-29 16:13:55 +08:00
nanoric
f1b92086b1 [Fix] try to fix travis 2019-03-29 04:06:25 -04:00
nanoric
7a3e7659c8 [Mod] fix matrix name 2019-03-29 02:53:28 -04:00
nanoric
d1c63bb05f [Fix] try fix travis.yml 2019-03-29 02:49:18 -04:00
vn.py
cc390e9ba7
Merge pull request #1531 from 1122455801/22
[FIX] 修改multi_signal, multi_timeframe 和test Strategy的代码风格
2019-03-29 14:39:28 +08:00
vn.py
b5fda56f55
Merge pull request #1530 from 1122455801/Fix_AtrRsi
[FIX] 修改Boll_Channel, Double_ma, Dual_thrust策略代码风格
2019-03-29 14:39:14 +08:00
1122455801
8fa9f2ae9c Update test_strategy.py 2019-03-29 12:56:44 +08:00
1122455801
29fe0b072c Update multi_timeframe_strategy.py 2019-03-29 12:56:04 +08:00
1122455801
3c884d9568 Update multi_signal_strategy.py 2019-03-29 12:55:57 +08:00
nanoric
816e4a17fb [Add] 增加travis测试脚本:sdist for win and linux 2019-03-28 23:02:46 -04:00
nanoric
85fc35e48a [Mod] 版本号改为v2.0.1b0 2019-03-28 23:00:26 -04:00
1122455801
6a0b0be02f Create genetic_algorithm.ipynb 2019-03-29 10:27:35 +08:00
vn.py
1a569dcf7f
Merge pull request #1529 from nanoric/wheel_use_cdn
[Mod] requirements.txt: use cdn for wheels
2019-03-29 08:42:32 +08:00
vn.py
d52b900876 [Add]MANIFEST.in file for source distribution 2019-03-28 22:35:45 +08:00
nanoric
6a7390328b [Mod] requirements.txt: use cdn for wheels 2019-03-28 05:19:33 -04:00
vn.py
97614f0463 Merge branch 'v2.0.1-DEV' of https://github.com/vnpy/vnpy into v2.0.1-DEV 2019-03-28 16:30:55 +08:00
vn.py
a872207c90 [Mod]update setup.py 2019-03-28 16:30:49 +08:00
vn.py
9314907e52
Merge pull request #1527 from nanoric/pip_from_oss
Pip from oss
2019-03-28 14:37:29 +08:00
nanoric
800055ba1a Merge remote-tracking branch 'remotes/origin/v2.0.1-DEV' into pip_from_oss
# Conflicts:
#	requirements.txt
2019-03-28 02:29:08 -04:00
nanoric
ed0ecca942 [Add] requirements.txt added tigeropen 2019-03-28 02:21:54 -04:00
vn.py
29b2911c18 [Mod]use pip to install ta-lib and ibapi 2019-03-28 14:00:17 +08:00
nanoric
7f12d6520f [Add] update setuptools for gcc-7 2019-03-28 01:58:50 -04:00
nanoric
80eda79efd [Mod] use oss instead of cdn 2019-03-28 01:56:46 -04:00
vn.py
44f6d376aa [Del]remove ibapi from vnpy source code 2019-03-28 13:55:44 +08:00
vn.py
4474e12e39 [Del]remove talib from vnpy source code 2019-03-28 13:54:23 +08:00
vn.py
cd716b4da8 [Mod]change ctp orderid format 2019-03-28 11:23:31 +08:00
vn.py
90682ab92d [Fix]bugs in king keltner strategy 2019-03-28 11:11:29 +08:00
nanoric
72d2a0f3f1 [Add] requirements.txt: added requests 2019-03-27 06:07:30 -04:00
nanoric
a5aa1fb338 [Add] travis-ci: update setuptools before pip install 2019-03-27 05:29:11 -04:00
nanoric
8ff166a315 [New] travis-ci: use unittest to check if all module were built successfully. 2019-03-27 04:21:25 -04:00
nanoric
c9f303bcc5 [Mod] make flake8 happy 2019-03-27 04:17:51 -04:00
nanoric
11f5db1b77 [Add] added a test to check if all module can be import without error. 2019-03-27 04:17:33 -04:00
nanoric
2e23f30f63 [Add] added wheels from oss 2019-03-27 04:12:05 -04:00
vn.py
003d903907 [Add]TestStrategy for testing cta strategy app 2019-03-27 14:45:16 +08:00
vn.py
1c601278ab [Fix]bugs in cta strategy app 2019-03-27 14:44:48 +08:00
vn.py
4a1af72300 [Mod]change demo strategies to support list result of send_order function 2019-03-27 11:42:22 +08:00
vn.py
15fbb54960 [Mod]change send order return data to vt_orderids (list) to support offset converter function 2019-03-27 11:31:44 +08:00
vn.py
353a9c0d8d [Mod]add offset converter function to cta strategy app 2019-03-27 11:31:11 +08:00
1122455801
ce64ede969 Update tiger_gateway.py 2019-03-26 15:53:25 +08:00
1122455801
fc1c76ce48 Update backtesting.py 2019-03-26 15:53:22 +08:00
1122455801
6359fac196 Create genetic_algorithm.ipynb 2019-03-26 15:53:15 +08:00
vn.py
873a8080ab [Fix]Close #1518 2019-03-26 10:07:31 +08:00
vn.py
e143f6582e Revert "Revert "[Add]net_position member of ContractData""
This reverts commit 289bcfa13e.
2019-03-25 23:11:12 +08:00
vn.py
0fa314faa8 [Fix]change brokerid to str in CtpGateway 2019-03-25 16:31:15 +08:00
vn.py
289bcfa13e Revert "[Add]net_position member of ContractData"
This reverts commit f5917b9cdc.
2019-03-25 16:28:06 +08:00
vn.py
f5917b9cdc [Add]net_position member of ContractData 2019-03-25 14:50:41 +08:00
vn.py
a6b4afecff
Merge pull request #1511 from nanoric/ctp_new_version
Ctp new version
2019-03-25 14:46:05 +08:00
vn.py
a97a41c645
Merge pull request #1520 from nanoric/oes_use_push
[Mod] OesGateway: 使用推送的初始化信息,而不是主动查询
2019-03-25 14:45:51 +08:00
nanoric
671dd88791 [Fix] 修复order.time类型不一致的问题 2019-03-25 02:30:28 -04:00