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.

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

Develop #3518

Merged
merged 42 commits into from
Mar 3, 2023
Merged

Develop #3518

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
38b1ed3
Merge branch 'develop'
albertandking Jan 16, 2023
1a41df2
Merge branch 'develop'
albertandking Jan 17, 2023
dbfc3d5
Merge branch 'develop'
albertandking Jan 23, 2023
e58bf60
Merge branch 'develop'
albertandking Jan 28, 2023
b5e1f6e
Merge branch 'develop'
albertandking Jan 28, 2023
35d810b
Merge branch 'main' of github.com:akfamily/akshare
albertandking Jan 28, 2023
e0a9d15
Merge branch 'develop'
albertandking Jan 28, 2023
bdab5cc
Merge branch 'develop'
albertandking Jan 29, 2023
c7793d2
Merge branch 'develop'
albertandking Jan 29, 2023
1dc1ad0
Merge branch 'develop'
albertandking Jan 29, 2023
70a5bb0
Merge branch 'develop'
albertandking Jan 30, 2023
7e6b5ad
Merge branch 'develop'
albertandking Jan 30, 2023
1e902a3
Merge branch 'develop'
albertandking Jan 30, 2023
5f4ec8f
Merge branch 'develop'
albertandking Jan 30, 2023
e28ef80
Merge branch 'develop'
albertandking Feb 2, 2023
53e7ba0
Merge branch 'develop'
albertandking Feb 6, 2023
8bc4e12
Merge branch 'develop'
albertandking Feb 6, 2023
1c467d1
Merge branch 'develop'
albertandking Feb 7, 2023
ad01e3f
Merge branch 'develop'
albertandking Feb 7, 2023
c03e94c
Merge branch 'develop'
albertandking Feb 9, 2023
7e97651
Merge branch 'develop'
albertandking Feb 10, 2023
fb01f62
Merge branch 'develop'
albertandking Feb 10, 2023
c957a9e
Merge branch 'develop'
albertandking Feb 13, 2023
0e8c797
Merge branch 'main' of github.com:akfamily/akshare
albertandking Feb 14, 2023
89f5e31
Merge branch 'develop'
albertandking Feb 15, 2023
dd4f6fc
Merge branch 'develop'
albertandking Feb 16, 2023
204375c
Merge branch 'develop'
albertandking Feb 16, 2023
ace8116
Merge branch 'develop'
albertandking Feb 17, 2023
bb804fa
Merge branch 'develop'
albertandking Feb 18, 2023
90be432
Merge branch 'develop'
albertandking Feb 19, 2023
fc23d28
Merge branch 'develop'
albertandking Feb 20, 2023
be4c12c
Merge branch 'develop'
albertandking Feb 20, 2023
50b9a04
Merge branch 'develop'
albertandking Feb 21, 2023
6d5a2d8
Merge branch 'develop'
albertandking Feb 22, 2023
dbc65af
Merge branch 'develop'
albertandking Feb 22, 2023
f866176
Merge branch 'develop'
albertandking Feb 23, 2023
93e7430
Merge branch 'develop'
albertandking Feb 24, 2023
7d9da97
Merge branch 'develop'
albertandking Feb 26, 2023
717e93c
Merge branch 'develop'
albertandking Feb 26, 2023
4a23ce0
Merge branch 'main' of github.com:akfamily/akshare
albertandking Mar 3, 2023
775584a
Merge branch 'main' of github.com:akfamily/akshare
albertandking Mar 3, 2023
9bd2db8
fix(stock_zh_index_csindex.py): fix index_value_name_funddb interface
albertandking Mar 3, 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
3 changes: 2 additions & 1 deletion akshare/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2304,9 +2304,10 @@
1.8.85 fix: fix stock_info_sh_name_code interface
1.8.86 fix: fix stock_info_sh_delist interface
1.8.87 fix: fix stock_info_sz_change_name interface
1.8.88 fix: fix stock_info_sz_delist interface
"""

__version__ = "1.8.87"
__version__ = "1.8.88"
__author__ = "AKFamily"

import sys
Expand Down
15 changes: 10 additions & 5 deletions akshare/stock/stock_info.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding:utf-8 -*-
"""
Date: 2023/2/18 14:00
Date: 2023/2/19 19:00
Desc: 股票基本信息
"""
import json
Expand Down Expand Up @@ -320,12 +320,12 @@ def stock_info_sh_delist() -> pd.DataFrame:
return temp_df


def stock_info_sz_delist(indicator: str = "暂停上市公司") -> pd.DataFrame:
def stock_info_sz_delist(symbol: str = "暂停上市公司") -> pd.DataFrame:
"""
深证证券交易所-暂停上市公司-终止上市公司
http://www.szse.cn/market/stock/suspend/index.html
:param indicator: choice of {"暂停上市公司", "终止上市公司"}
:type indicator: str
:param symbol: choice of {"暂停上市公司", "终止上市公司"}
:type symbol: str
:return: 暂停上市公司 or 终止上市公司 的数据
:rtype: pandas.DataFrame
"""
Expand All @@ -334,14 +334,16 @@ def stock_info_sz_delist(indicator: str = "暂停上市公司") -> pd.DataFrame:
params = {
"SHOWTYPE": "xlsx",
"CATALOGID": "1793_ssgs",
"TABKEY": indicator_map[indicator],
"TABKEY": indicator_map[symbol],
"random": "0.6935816432433362",
}
r = requests.get(url, params=params)
with warnings.catch_warnings(record=True):
warnings.simplefilter("always")
temp_df = pd.read_excel(BytesIO(r.content))
temp_df["证券代码"] = temp_df["证券代码"].astype("str").str.zfill(6)
temp_df['上市日期'] = pd.to_datetime(temp_df['上市日期']).dt.date
temp_df['终止上市日期'] = pd.to_datetime(temp_df['终止上市日期']).dt.date
return temp_df


Expand Down Expand Up @@ -463,3 +465,6 @@ def stock_info_a_code_name() -> pd.DataFrame:

stock_info_bj_name_code_df = stock_info_bj_name_code()
print(stock_info_bj_name_code_df)

stock_info_sz_delist_df = stock_info_sz_delist(symbol="终止上市公司")
print(stock_info_sz_delist_df)
6 changes: 6 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@

## 更新说明

1.8.88 fix: fix stock_info_sz_delist interface

1. 修复 stock_info_sz_delist 接口

1.8.87 fix: fix stock_info_sz_change_name interface

1. 修复 stock_info_sz_change_name 接口
Expand Down Expand Up @@ -1898,6 +1902,8 @@

## 版本更新说明

1.8.88 fix: fix stock_info_sz_delist interface

1.8.87 fix: fix stock_info_sz_change_name interface

1.8.86 fix: fix stock_info_sh_delist interface
Expand Down
48 changes: 24 additions & 24 deletions docs/data/stock/stock.md
Original file line number Diff line number Diff line change
Expand Up @@ -12520,49 +12520,49 @@ print(stock_info_bj_name_code_df)

目标地址: http://www.szse.cn/market/stock/suspend/index.html

描述: 获取深证证券交易所终止(暂停)上市股票
描述: 深证证券交易所终止/暂停上市股票

限量: 单次获取深证证券交易所终止(暂停)上市股票
限量: 单次获取深证证券交易所终止/暂停上市数据

输入参数

| 名称 | 类型 | 必选 | 描述 |
| -------- | ---- | ---- | --- |
| indicator | str | Y | indicator="终止上市公司"; choice of {"暂停上市公司", "终止上市公司"}|
| 名称 | 类型 | 描述 |
|--------|-----|-------------------------------------------------|
| symbol | str | symbol="终止上市公司"; choice of {"暂停上市公司", "终止上市公司"} |

输出参数

| 名称 | 类型 | 描述 |
| ------------ | ----- | ---------------- |
| 证券代码 | str | - |
| 证券简称 | str | - |
| 上市日期 | str | - |
| 终止上市日期 | str | - |
| 名称 | 类型 | 描述 |
|--------|--------|-----|
| 证券代码 | object | - |
| 证券简称 | object | - |
| 上市日期 | object | - |
| 终止上市日期 | object | - |

接口示例

```python
import akshare as ak

stock_info_sz_delist_df = ak.stock_info_sz_delist(indicator="终止上市公司")
stock_info_sz_delist_df = ak.stock_info_sz_delist(symbol="终止上市公司")
print(stock_info_sz_delist_df)
```

数据示例

```
证券代码 证券简称 上市日期 终止上市日期
0 000003 PT金田A 1991-01-14 2002-06-14
1 000013 *ST石化A 1992-05-06 2004-09-20
2 000015 PT中浩A 1992-06-25 2001-10-25
3 000018 神城A退 1992-06-16 2020-01-07
4 000024 招商地产 1993-06-07 2015-12-30
.. ... ... ... ...
65 200418 小天鹅B 1996-07-18 2019-05-27
66 200513 丽 珠B 1993-07-20 2014-01-10
67 200770 武锅B退 1998-04-15 2015-07-13
68 300186 大华农 2011-03-08 2015-11-02
69 300372 欣泰退 2014-01-27 2017-08-28
证券代码 证券简称 上市日期 终止上市日期
0 000003 PT金田A 1991-01-14 2002-06-14
1 000013 *ST石化A 1992-05-06 2004-09-20
2 000015 PT中浩A 1992-06-25 2001-10-25
3 000018 神城A退 1992-06-16 2020-01-07
4 000024 招商地产 1993-06-07 2015-12-30
.. ... ... ... ...
111 300325 德威退 2012-06-01 2022-06-28
112 300362 天翔退 2014-01-21 2021-08-30
113 300367 网力退 2014-01-29 2022-06-30
114 300372 欣泰退 2014-01-27 2017-08-28
115 300431 暴风退 2015-03-24 2020-11-10
```

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

1. 本文档更新时间:**2023-02-18**;
1. 本文档更新时间:**2023-02-19**;
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. 如果您的问题未能在文档中找到答案,您也可以加入 **AKShare-VIP QQ 群**: 为了提高问答质量,此群为收费群(一杯咖啡钱即可入群,赠送[《AKShare-初阶-使用教学》](https://zmj.xet.tech/s/wck86)视频课),可以添加 **AKShare-小助手** QQ:1254836886,由小助手邀请入群! ![](https://jfds-1252952517.cos.ap-chengdu.myqcloud.com/akshare/readme/qrcode/qr_code_1254836886.jpg)
Expand Down