Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -11,6 +11,10 @@ matrix:
     - python: 3.4
     - python: 3.5
     - python: 3.6
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
 install:
   # Install TA-Lib
   - wget http://prdownloads.sourceforge.net/ta-lib/ta-lib-0.4.0-src.tar.gz
@@ -30,6 +34,7 @@ install:
   - pip install coveralls
   - pip install -U setuptools
   - pip install git+https://github.com/Cuizi7/funcat.git
+  - pip install git+https://github.com/rkern/line_profiler.git
   - pip install ipython==5.3.0
   - pip install .
 script:

requirements.txt

@@ -1,19 +1,34 @@
 requests
-numpy>=1.11.1
-pandas>=0.18.1
-python-dateutil>=2.5.3
-pytz>=2016.4
-six>=1.10.0
-pytest>=2.9.2
-logbook>=1.0.0
-click>=7.0
-bcolz>=1.1.0
-matplotlib>=1.5.1
-jsonpickle==0.9.4
-simplejson>=3.10.0
-dill==0.2.5
-XlsxWriter>=0.9.6
-line-profiler>=2.0
-PyYAML>=3.12
-
+numpy >=1.11.1
+python-dateutil >=2.5.3
+pytz >=2016.4
+six >=1.10.0
+pytest >=2.9.2
+logbook >=1.0.0
+click >=7.0
+jsonpickle ==0.9.4
+simplejson >=3.10.0
+dill ==0.2.5
+XlsxWriter >=0.9.6
+PyYAML >=3.12
 tabulate
+
+pandas >=0.18.1 ; python_version != '3.4'
+pandas >=0.18.1,<=0.22.0 ; python_version == '3.4'
+
+bcolz >=1.1.0 ; python_version != '3.4'
+bcolz >=1.1.0,<=1.2.0 ; python_version =='3.4'
+
+matplotlib >=1.5.1 ; python_version >= '3.5'
+matplotlib >=1.5.1,<=2.2.3 ; python_version <= '3.4'
+
+ipython ==6.5.0 ; python_version == '3.4'
+ipython ==5.3.0 ; python_version == '2.7'
+
+line-profiler >=2.0
+
+enum34 >=1.1.6 ; python_version == '2.7'
+fastcache >=1.0.2 ; python_version == '2.7'
+funcsigs ; python_version == '2.7'
+backports.tempfile ; python_version == '2.7'
+mock ; python_version == '2.7'

rqalpha/VERSION.txt

@@ -1 +1 @@
-3.2.0.39995e
+3.3.0a0

rqalpha/__main__.py

@@ -89,7 +89,6 @@ def update_bundle(data_bundle_path, locale):
 @click.option('-f', '--strategy-file', 'base__strategy_file', type=click.Path(exists=True))
 @click.option('-s', '--start-date', 'base__start_date', type=Date())
 @click.option('-e', '--end-date', 'base__end_date', type=Date())
-@click.option('-bm', '--benchmark', 'base__benchmark', type=click.STRING, default=None)
 @click.option('-mm', '--margin-multiplier', 'base__margin_multiplier', type=click.FLOAT)
 @click.option('-a', '--account', 'base__accounts', nargs=2, multiple=True, help="set account type with starting cash")
 @click.option('--position', 'base__init_positions', type=click.STRING, help="set init position")

rqalpha/api/__init__.py

@@ -17,7 +17,9 @@
 
 from rqalpha.api.api_base import *
 from rqalpha.api.api_extension import *
+
 # noinspection PyUnresolvedReferences
 from rqalpha.mod.rqalpha_mod_sys_accounts.api.api_stock import *
+
 # noinspection PyUnresolvedReferences
 from rqalpha.mod.rqalpha_mod_sys_accounts.api.api_future import *