fix python2 pip安装失败

Author: zhangyongsheng

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2019-03-18
+- MANIFEST.in添加md文件
+
 # 2019-03-12
 - 添加因子分层效果接口
 - 添加通用请求接口

MANIFEST.in

@@ -1 +1,2 @@
 include *.txt
+include *.md

jqdatasdk/__init__.py

@@ -21,7 +21,7 @@ def auth_by_token(token, host="39.107.190.114", port=7000):
     JQDataClient.set_auth_params(host=host, port=port, token=token)
 
 
-__version__ = "1.6.0"
+__version__ = "1.6.1"
 
 __all__ = ["auth", "auth_by_token", "alpha101", "alpha191", "technical_analysis", "__version__"]
 __all__.extend(api.__all__)

tests/test_api.py

@@ -5,15 +5,14 @@
 import pytest
 import numpy as np
 import pandas as pd
-from pandas.tslib import Timestamp
 from jqdatasdk import *
 
 logging.basicConfig()
 log = logging
 
 
 with open("/home/server/etc/jqdatasdk/import_debug_account.py") as f:
-   exec(f.read())
+    exec(f.read())
 
 def test_get_index_stocks():
     assert len(get_index_stocks('000300.XSHG')) == 300
@@ -575,7 +574,7 @@ def test_ticks():
     assert len(get_ticks("NI1804.XSGE", end_dt="2018-03-16", count=100)) == 100
     assert get_ticks("NI1804.XSGE", end_dt="2018-03-16", count=10, fields=["current", "volume", "position", "a1_v", "a1_p", "b1_v", "b1_p"]).shape == (10, 7)
     assert len(get_ticks("000001.XSHE", end_dt="2018-03-16", count=10)) == 10
-    assert get_ticks("SM1809.XZCE", '2018-07-06', '2018-07-07').iloc[3][0] == Timestamp('2018-07-06 09:00:01.500000')
+    assert str(get_ticks("SM1809.XZCE", '2018-07-06', '2018-07-07').iloc[3][0]) == '2018-07-06 09:00:01.500000'
     assert get_ticks("000001.XSHE", end_dt="2018-03-16", count=10, fields=["a1_v", "a2_v", "a3_v", "a4_v", "a5_v", "b1_v", "b2_v", "b3_v", "b4_v", "b5_v"]).shape == (10, 10)
 
 
@@ -640,6 +639,26 @@ def test_finance_tables():
     assert finance.STK_MONEY_FLOW != None
     with pytest.raises(Exception, message='finance 没有该表'):
         finance.STK
+    df = finance.run_query(query(finance.STK_STATUS_CHANGE))
+    stk_status_change_columns = ["id", "company_id", "code", "name",
+                                 "pub_date", "change_date", "change_reason",
+                                 "change_type_id", "change_type", "comments",
+                                 "public_status_id", "public_status"]
+    assert set(stk_status_change_columns) - set(df.columns) == set()
+    df = finance.run_query(query(finance.STK_FIN_FORCAST))
+    stk_fin_forcast_columns = ["id", "company_id", "code", "name",
+                               "end_date", "report_type_id", "report_type",
+                               "pub_date", "type_id", "type", "profit_min",
+                               "profit_max", "profit_last", "profit_ratio_min",
+                               "profit_ratio_max", "content",]
+    assert set(stk_fin_forcast_columns) - set(df.columns) == set()
+    df = finance.run_query(query(finance.STK_LIST))
+    stk_list_columns = ["id", "code", "name", "short_name",
+                        "category", "exchange", "start_date",
+                        "end_date", "company_id", "company_name",
+                        "ipo_shares", "book_price", "par_value",
+                        "state_id", "state", "status"]
+    assert set(stk_list_columns) - set(df.columns) == set(["status"])
 
 
 def test_get_factor_values():
@@ -835,4 +854,4 @@ def test_get_data():
 def test_api_limit():
     alpha191.alpha_001("000001.XSHE", end_date="2018-03-10")
     with pytest.raises(Exception) as e:
-        alpha191.alpha_001("000001.XSHE", end_date="2018-03-10")
+        alpha191.alpha_001("000001.XSHE", end_date="2018-03-10")