akshare 1.15.41__py3-none-any.whl → 1.15.43__py3-none-any.whl

akshare/__init__.py

@@ -2951,9 +2951,11 @@ amac_manager_cancelled_info # 中国证券投资基金业协会-信息公示-诚
 1.15.39 fix: fix macro_china_new_house_price interface
 1.15.40 fix: fix macro_china_fdi interface
 1.15.41 fix: fix macro_china_fdi interface
+1.15.42 fix: fix get_roll_yield_bar interface
+1.15.43 fix: fix macro_china_urban_unemployment interface
 """
 
-__version__ = "1.15.41"
+__version__ = "1.15.43"
 __author__ = "AKFamily"
 
 import sys

akshare/economic/macro_china.py

@@ -327,6 +327,7 @@ def macro_china_urban_unemployment() -> pd.DataFrame:
     temp_df.columns = ["date", "item", "value"]
     temp_df["item"] = temp_df["item"].map(code_item_map)
     temp_df["value"] = pd.to_numeric(temp_df["value"], errors="coerce")
+    temp_df.sort_values(by=["date"], ignore_index=True, inplace=True)
     return temp_df
 
 

akshare/futures/futures_roll_yield.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
 """
-Date: 2023/1/12 16:58
+Date: 2024/12/6 13:58
 Desc: 中国期货各合约展期收益率
 日线数据从 daily_bar 函数获取, 需要在收盘后运行
 """
+
 import datetime
 import re
 import warnings
@@ -31,9 +32,7 @@ def get_roll_yield(date=None, var="BB", symbol1=None, symbol2=None, df=None):
     df: DataFrame或None 从dailyBar得到合约价格，如果为空就在函数内部抓dailyBar，直接喂给数据可以让计算加快
     """
     # date = "20100104"
-    date = (
-        cons.convert_date(date) if date is not None else datetime.date.today()
-    )
+    date = cons.convert_date(date) if date is not None else datetime.date.today()
     if date.strftime("%Y%m%d") not in calendar:
         warnings.warn("%s非交易日" % date.strftime("%Y%m%d"))
         return None
@@ -46,9 +45,7 @@ def get_roll_yield(date=None, var="BB", symbol1=None, symbol2=None, df=None):
         df = df[
             ~df["symbol"].str.contains("efp")
         ]  # 20200304 由于交易所获取的数据中会有比如 "CUefp"，所以在这里过滤
-        df = df[df["variety"] == var].sort_values(
-            "open_interest", ascending=False
-        )
+        df = df[df["variety"] == var].sort_values("open_interest", ascending=False)
         # df["close"] = df["close"].astype("float")
         df["close"] = pd.to_numeric(df["close"])
         if len(df["close"]) < 2:
@@ -69,7 +66,7 @@ def get_roll_yield(date=None, var="BB", symbol1=None, symbol2=None, df=None):
     if close1 == 0 or close2 == 0:
         return False
     if c > 0:
-        return math.log(close2 / close1) / c * 12, symbol2, symbol1
+        return math.log(close1 / close2) / c * 12, symbol2, symbol1
     else:
         return math.log(close2 / close1) / c * 12, symbol1, symbol2
 
@@ -93,20 +90,14 @@ def get_roll_yield_bar(
     ry      展期收益率
     index   日期或品种
     """
-    date = (
-        cons.convert_date(date) if date is not None else datetime.date.today()
-    )
+    date = cons.convert_date(date) if date is not None else datetime.date.today()
     start_day = (
-        cons.convert_date(start_day)
-        if start_day is not None
-        else datetime.date.today()
+        cons.convert_date(start_day) if start_day is not None else datetime.date.today()
     )
     end_day = (
         cons.convert_date(end_day)
         if end_day is not None
-        else cons.convert_date(
-            cons.get_latest_data_date(datetime.datetime.now())
-        )
+        else cons.convert_date(cons.get_latest_data_date(datetime.datetime.now()))
     )
 
     if type_method == "symbol":
@@ -122,13 +113,11 @@ def get_roll_yield_bar(
             df = pd.concat(
                 [
                     df,
-                    get_futures_daily(
-                        start_date=date, end_date=date, market=market
-                    ),
+                    get_futures_daily(start_date=date, end_date=date, market=market),
                 ]
             )
         var_list = list(set(df["variety"]))
-        for i_remove in ['IO', 'MO', 'HO']:
+        for i_remove in ["IO", "MO", "HO"]:
             if i_remove in var_list:
                 var_list.remove(i_remove)
         df_l = pd.DataFrame()
@@ -165,7 +154,7 @@ def get_roll_yield_bar(
                             ),
                         ]
                     )
-            except:
+            except:  # noqa: E722
                 pass
             start_day += datetime.timedelta(days=1)
         return df_l
@@ -186,7 +175,5 @@ if __name__ == "__main__":
     )
     print(get_roll_yield_bar_range_df)
 
-    get_roll_yield_bar_symbol = get_roll_yield_bar(
-        type_method="var", date="20210201"
-    )
+    get_roll_yield_bar_symbol = get_roll_yield_bar(type_method="var", date="20210201")
     print(get_roll_yield_bar_symbol)

{akshare-1.15.41.dist-info → akshare-1.15.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: akshare
-Version: 1.15.41
+Version: 1.15.43
 Summary: AKShare is an elegant and simple financial data interface library for Python, built for human beings!
 Home-page: https://github.com/akfamily/akshare
 Author: AKFamily

{akshare-1.15.41.dist-info → akshare-1.15.43.dist-info}/RECORD

@@ -1,4 +1,4 @@
-akshare/__init__.py,sha256=LeHG3wPM_WM_m1_18naCMwQbJarUARRH-5S6ABncMWg,184739
+akshare/__init__.py,sha256=uxia6EqdSE8ySJmzG-tkP6xbZEwVKYQXA_jzhb13j84,184843
 akshare/datasets.py,sha256=-qdwaQjgBlftX84uM74KJqCYJYkQ50PV416_neA4uls,995
 akshare/exceptions.py,sha256=WEJjIhSmJ_xXNW6grwV4nufE_cfmmyuhmueVGiN1VAg,878
 akshare/request.py,sha256=HtFFf9MhfEibR-ETWe-1Tts6ELU4VKSqA-ghaXjegQM,4252
@@ -54,7 +54,7 @@ akshare/economic/cons.py,sha256=0JM61Eiro0xqXGnCaDSoLsw5iQWKAtqhRHcXmDfJgyw,1659
 akshare/economic/macro_australia.py,sha256=JKNaedN19Rw15dn8bPur1yrsQA5j6hfX4tjgh7OCBHY,10801
 akshare/economic/macro_bank.py,sha256=wG_u5w5YjeFRn1wr-Re7ty_s2CbQ0Qphxs_bIF_20UQ,11495
 akshare/economic/macro_canada.py,sha256=nNaZ3yZIvgTtRiQhwoEybMX6UpqszPKeixzYITv9ox0,15195
-akshare/economic/macro_china.py,sha256=vrlOrV0D88JPeJzL1yWzpLlVuoBoQL-UY_wVT6ooUMs,148785
+akshare/economic/macro_china.py,sha256=O3pgTke7VbHMJKY3ZRU6hC_noOXnaQFPr0u2qJsebEY,148855
 akshare/economic/macro_china_hk.py,sha256=dIBc9gAYiHZUjXLF4c3yBK-2s3iLx46GcgJGlVJpv4c,5974
 akshare/economic/macro_china_nbs.py,sha256=nP6dI-fawch8dz7GMcfGVJsTri-FfIAkvTf3h7DT-kc,9679
 akshare/economic/macro_constitute.py,sha256=cCfWupKJ86uUzg_pULsg1C2FleHb25mYbfE4x29VnKA,8197
@@ -120,7 +120,7 @@ akshare/futures/futures_inventory_99.py,sha256=Nvw39obGGhgOkk_C4jOrV4gdq78dtHPOn
 akshare/futures/futures_inventory_em.py,sha256=C5nt4F51WB-oc8o3GrMvEGo0SO2mIq_H1vHVl42vzT0,2340
 akshare/futures/futures_news_baidu.py,sha256=uqXUgQa7_aNjj1g4IBt6Ic4DhlsuBvjEEYC3OTPeqmA,1544
 akshare/futures/futures_news_shmet.py,sha256=NQXUo6bwsDwxWID-5CUgJxENWtiaDK4JgMaTEmurYvM,2464
-akshare/futures/futures_roll_yield.py,sha256=QOCZOmpGassI9sYfnC7Fj4d6_7iAxnIwQl5Tbq8GN7A,6272
+akshare/futures/futures_roll_yield.py,sha256=RiwN0yYwzYy8zGhmTopBwJ37aUQ7Llwh3eQRzn0apaE,6135
 akshare/futures/futures_rule.py,sha256=38fJnUTohGqbwE65ZR1id7Oy-0DS-ODrGYsmx2jtGZ8,1571
 akshare/futures/futures_settlement_price_sgx.py,sha256=R0PZOEkdYDf7H242iHYz70rxdvsMWoAL60bmGlj-0GY,2428
 akshare/futures/futures_spot_stock_em.py,sha256=43CPkAouDu691M6aCMdO1SGKglTak2aba2Np7ftkAdg,3523
@@ -383,8 +383,8 @@ akshare/utils/token_process.py,sha256=K4rGXjh_tgugbRcyOK2h2x0jP3PT65IIK7nxhUKhOe
 akshare/utils/tqdm.py,sha256=MuPNwcswkOGjwWQOMWXi9ZvQ_RmW4obCWRj2i7HM7FE,847
 tests/__init__.py,sha256=gNzhlO0UPjFq6Ieb38kaVIODXv4cTDByrdohAZnDYt4,82
 tests/test_func.py,sha256=j1MGYbZI2if2j_LY1S4FLsf4qfq4NwVqD5wmRlv5Log,832
-akshare-1.15.41.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
-akshare-1.15.41.dist-info/METADATA,sha256=ny57_HacSUG1p8NIwHlc6Hk0gys4TXmD5fPixQrX1BQ,13423
-akshare-1.15.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-akshare-1.15.41.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
-akshare-1.15.41.dist-info/RECORD,,
+akshare-1.15.43.dist-info/LICENSE,sha256=mmSZCPgfHiVw34LXuFArd-SUgQtBJ_QsIlh-kWlDHfs,1073
+akshare-1.15.43.dist-info/METADATA,sha256=5B4yFcajS1Zn5CFYJDXvjfhWWYlYIkd_N2qI51xOex8,13423
+akshare-1.15.43.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+akshare-1.15.43.dist-info/top_level.txt,sha256=jsf9ZzZPmHaISTVumQPsAw7vv7Yv-PdEVW70SMEelQQ,14
+akshare-1.15.43.dist-info/RECORD,,