Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dependency broken due to websocket-client version conflict between requirements.txt and tushare's required #1833

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix dependency broken due to websocket-client version conflict between requirements.txt and tushare's required #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
060f648
fix dep broken due to websocket-client
Jun 22, 2023
bf2df67
misci
Jun 25, 2023
06c566d
fix warning SettingWithCopyWarning: A value is trying to be set on a …
Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions QUANTAXIS/QAUtil/QATransform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
def QA_util_to_json_from_pandas(data):
"""
explanation:
将pandas数据转换成json格式
将pandas数据转换成json格式

params:
* data ->:
Expand All @@ -52,9 +52,11 @@ def QA_util_to_json_from_pandas(data):

"""需要对于datetime 和date 进行转换, 以免直接被变成了时间戳"""
if 'datetime' in data.columns:
data.datetime = data.datetime.apply(str)
# data.datetime = data.datetime.apply(str)
data['datetime'] = data['datetime'].astype(str)
if 'date' in data.columns:
data.date = data.date.apply(str)
# data.date = data.date.apply(str)
data['date'] = data['date'].astype(str)
return json.loads(data.to_json(orient='records'))


Expand All @@ -69,7 +71,7 @@ def QA_util_to_json_from_list(data):
def QA_util_to_list_from_pandas(data):
"""
explanation:
将pandas数据转换成列表
将pandas数据转换成列表

params:
* data ->:
Expand All @@ -93,7 +95,7 @@ def QA_util_to_list_from_pandas(data):
def QA_util_to_list_from_numpy(data):
"""
explanation:
将numpy数据转换为列表
将numpy数据转换为列表

params:
* data ->:
Expand All @@ -117,7 +119,7 @@ def QA_util_to_list_from_numpy(data):
def QA_util_to_pandas_from_json(data):
"""
explanation:
将json数据载入为pandas数据
将json数据载入为pandas数据

params:
* data ->:
Expand All @@ -143,7 +145,7 @@ def QA_util_to_pandas_from_json(data):
def QA_util_to_pandas_from_list(data):
"""
explanation:
将列表数据转换为pandas
将列表数据转换为pandas

params:
* data ->:
Expand Down
2 changes: 1 addition & 1 deletion config/update_x.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
QA_SU_save_stock_min('tdx')
QA_SU_save_index_day('tdx')
QA_SU_save_index_min('tdx')
QA_SU_save_etf_day('tdx')
QA_SU_save_etf_day('tdx')
QA_SU_save_etf_min('tdx')
QA_SU_save_stock_list('tdx')
QA_SU_save_stock_block('tdx')
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async_timeout
IPython
numba
tushare
websocket-client
# websocket-client
statsmodels>=0.12.1
scipy
pytdx>=1.67
Expand All @@ -41,4 +41,4 @@ clickhouse-cityhash
alphalens
qanotify

pyarrow>=6.0.1
pyarrow>=6.0.1