Merge pull request #481 from ricequant/feature/v4

Feature/v4

.gitattributes

@@ -0,0 +1 @@
+rqalpha/_version.py export-subst

.gitignore

@@ -20,3 +20,4 @@ persist/
 .tox
 rqalpha_test_coverage_report/
 .tmp.pkl
+.env

.travis.yml

@@ -7,10 +7,9 @@ branches:
     - master
 matrix:
   include:
-    - python: 2.7
-    - python: 3.5
     - python: 3.6
     - python: 3.7
+    - python: 3.8
       dist: xenial
       sudo: true
 
@@ -24,22 +23,17 @@ install:
   - sudo make install
   - cd ..
 
-  # Install bcolz
-  - pip install Cython
-  - pip install bcolz==1.2.0
-
   # Install Test Deps
   - pip install TA-Lib
   - pip install coveralls
   - pip install -U setuptools
-  - pip install git+https://github.com/ricequant/funcat.git
   - pip install git+https://github.com/rkern/line_profiler.git
   - pip install ipython==5.3.0
   - pip install .
 script:
   - ls -al $HOME/.rqalpha/
   - ls -al $HOME/.rqalpha/bundle/
-  - rqalpha update-bundle
+  - rqalpha download-bundle
   - coverage run --source=rqalpha test.py
 cache:
   directories:

MANIFEST.in

@@ -1,4 +1,8 @@
-include requirements.txt
-include requirements-py2.txt
-include rqalpha/VERSION.txt
 recursive-include rqalpha/resource *.png
+include versioneer.py
+include rqalpha/_version.py
+include README.rst
+include CHANGELOG.rst
+include LICENSE
+include rqalpha/utils/translations/zh_Hans_CN/LC_MESSAGES/*
+graft rqalpha/examples

README.rst

@@ -86,7 +86,6 @@ Mod名                        说明
 ========================    ==================================================================================
 `sys_accounts`_             【系统模块】为回测、模拟交易、实盘提供了股票和期货的账户模型及专用 API
 `sys_analyser`_             【系统模块】记录每天的下单、成交、投资组合、持仓等信息，并计算风险度指标，并以csv、plot图标等形式输出分析结果
-`sys_funcat`_               【系统模块】支持以通达信公式的方式写策略
 `sys_progress`_             【系统模块】在控制台输出当前策略的回测进度
 `sys_risk`_                 【系统模块】对订单进行事前风控校验
 `sys_simulation`_           【系统模块】支持回测、撮合、滑点控制等

docs/README.rst

@@ -15,10 +15,11 @@ Requirements
 *   sphinx_rtd_theme
 *   nbsphinx
 *   jupyter_client
+*   sphinx-autodoc-typehints
 
 .. code-block:: bash
 
-    pip install Sphinx watchdog sphinx_rtd_theme nbsphinx jupyter_client
+    pip install Sphinx watchdog sphinx_rtd_theme nbsphinx jupyter_client sphinx-autodoc-typehints
 
 # pandoc 需要下载 http://pandoc.org/installing.html 且重启pycharm（修改了环境变量）
 

docs/requirements.txt

@@ -3,3 +3,4 @@ watchdog
 sphinx_rtd_theme
 nbsphinx ==0.3.5
 jupyter_client
+sphinx-autodoc-typehints