v0.8.10

Py4Macro · Jul 6, 2024 · 4fcf4fd · 4fcf4fd
1 parent 5544e7c
commit 4fcf4fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+v0.8.10, 2024-07-6
+* `weo`の変数の説明をアルファベット順に変更
+* `debts`の変数の説明を更新
+
 v0.8.9, 2024-07-5
 * `mad-regions`を`mad-region`に変更
 * `mad`と`mad-region`のデータを更新

diff --git a/py4macro/__init__.py b/py4macro/__init__.py
@@ -7,7 +7,7 @@
 __all__ = ['data','trend','show','xvalues','recessions','fukyo', 'see']
 
 __author__ = 'Tetsu Haruyama'
-__version__ = '0.8.9'
+__version__ = '0.8.10'
 __copyright__ = 'Copyright (c) 2024 Tetsu Haruyama'
 
 __doc__ = """

diff --git a/py4macro/py4macro.py b/py4macro/py4macro.py
@@ -177,6 +177,9 @@
     | Surveys, pp.1-41."""
 
 debts_definitions = """
+    | `countrycode`:    ISO3国名コード
+    | `country`:        国名
+    | `year`:           年
     | `revenue`:        Government revenue, percent of GDP
     | `expenditure`:    Government expenditure, percent of GDP
     | `interest_exp`:   Government interest expense, percent of GDP
@@ -661,7 +664,7 @@ def data(dataset=None, description=0):
     elif (dataset == 'weo') & (description == 1):
         df = pd.read_csv(join(_get_path(__file__),
                             "data/weo_description.csv.bz2"),
-                         compression="bz2").set_index("WEO Subject Code")
+                         compression="bz2").set_index("WEO Subject Code").sort_index()
 
         with pd.option_context('display.max_colwidth', None,
                                'display.max_rows', None):
@@ -670,7 +673,7 @@ def data(dataset=None, description=0):
     elif (dataset == 'weo') & (description == 2):
         df = pd.read_csv(join(_get_path(__file__),
                             "data/weo_description.csv.bz2"),
-                         compression="bz2").set_index("WEO Subject Code")
+                         compression="bz2").set_index("WEO Subject Code").sort_index()
         return df
 
     elif (dataset == 'weo') & (description not in [0, 1, 2]):

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='py4macro',
-    version='0.8.9',
+    version='0.8.10',
     author='Tetsu Haruyama',
     author_email='haruyama@econ.kobe-u.ac.jp',
     packages=find_packages(exclude=("data_generation",)),