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

Dev #5395

Merged
merged 6 commits into from
Dec 2, 2024
Merged

Dev #5395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
905d73b
docs: fix incorrect link of macro_china_fdi
lofei117 Dec 1, 2024
29fc2d8
fix: fix macro_china_fdi
albertandking Dec 2, 2024
bbba3a6
fix: fix _check_information
albertandking Dec 2, 2024
5a6eb02
fix: fix stock_zygc_em
albertandking Dec 2, 2024
87dc85a
docs: update date
albertandking Dec 2, 2024
33d7c76
feat: add version 1.15.40
albertandking Dec 2, 2024
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
3 changes: 2 additions & 1 deletion akshare/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,9 +2949,10 @@
1.15.37 fix: fix stock_individual_spot_xq interface
1.15.38 fix: fix futures_contract_info_ine interface
1.15.39 fix: fix macro_china_new_house_price interface
1.15.40 fix: fix macro_china_fdi interface
"""

__version__ = "1.15.39"
__version__ = "1.15.40"
__author__ = "AKFamily"

import sys
Expand Down
4 changes: 2 additions & 2 deletions akshare/economic/macro_china.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding:utf-8 -*-
"""
Date: 2024/5/17 16:20
Date: 2024/12/2 15:20
Desc: 宏观数据-中国
"""

Expand Down Expand Up @@ -237,7 +237,7 @@ def macro_china_fdi() -> pd.DataFrame:
def macro_china_shrzgm() -> pd.DataFrame:
"""
商务数据中心-国内贸易-社会融资规模增量统计
http://data.mofcom.gov.cn/gnmy/shrzgm.shtml
https://data.mofcom.gov.cn/gnmy/shrzgm.shtml
:return: 社会融资规模增量统计
:rtype: pandas.DataFrame
"""
Expand Down
2 changes: 1 addition & 1 deletion akshare/futures/futures_basis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def _check_information(df_data, date):
news = "PTA"
else:
news = "".join(re.findall(r"[\u4e00-\u9fa5]", string))
"""
"""

if news != "" and news not in [
"商品",
Expand Down
2 changes: 1 addition & 1 deletion akshare/stock_fundamental/stock_zygc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def stock_zygc_em(symbol: str = "SH688041") -> pd.DataFrame:


if __name__ == "__main__":
stock_zygc_ym_df = stock_zygc_ym(symbol="000001")
stock_zygc_ym_df = stock_zygc_ym(symbol="000338")
print(stock_zygc_ym_df)

stock_zygc_em_df = stock_zygc_em(symbol="SH688041")
Expand Down
6 changes: 6 additions & 0 deletions docs/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@

## 更新说明详情

1.15.40 fix: fix macro_china_fdi interface

1. 修复 macro_china_fdi 接口

1.15.39 fix: fix macro_china_new_house_price interface

1. 修复 macro_china_new_house_price 接口
Expand Down Expand Up @@ -4822,6 +4826,8 @@

## 版本更新说明

1.15.40 fix: fix macro_china_fdi interface

1.15.39 fix: fix macro_china_new_house_price interface

1.15.38 fix: fix futures_contract_info_ine interface
Expand Down
2 changes: 1 addition & 1 deletion docs/data/macro/macro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ print(macro_china_qyspjg_df)

接口: macro_china_fdi

目标地址: https://data.eastmoney.com/cjsj/qyspjg.html
目标地址: https://data.eastmoney.com/cjsj/fdi.html

描述: 东方财富-经济数据一览-中国-外商直接投资数据, 数据区间从 200801-202012

Expand Down
2 changes: 1 addition & 1 deletion docs/introduction.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
**风险提示**：[AKShare](https://github.com/akfamily/akshare) 开源财经数据接口库所采集的数据皆来自公开的数据源，不涉及任何个人隐私数据和非公开数据。
同时本项目提供的数据接口及相关数据仅用于学术研究，任何个人、机构及团体使用本项目的数据接口及相关数据请注意商业风险。

1. 本文档更新时间：**2024-11-30**；
1. 本文档更新时间：**2024-12-02**；
2. 如有 [AKShare](https://github.com/akfamily/akshare) 库、文档及数据的相关问题，请在 [AKShare Issues](https://github.com/akfamily/akshare/issues) 中提 Issues；
3. 欢迎关注 **数据科学实战** 微信公众号；<div><img src="https://jfds-1252952517.cos.ap-chengdu.myqcloud.com/akshare/readme/qrcode/ds.png"></div>
4. **知识星球【数据科学实战】** 2024 全新改版，聚焦于量化投资内容，欢迎加入 **知识星球【数据科学实战】** 高质量社区，里面有丰富的视频课程、问答、文章、书籍及代码等内容：
Expand Down