Merge pull request #1067 from jdebacker/eth

Merging

Author: rickecon

CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+## [0.14.11] - 2025-11-07 12:00:00
+
+### Added
+
+- Adds Ethiopia demographic data mapping ((PR #1054)[https://github.com/PSLmodels/OG-Core/pull/1063])
+-
 ## [0.14.10] - 2025-09-11 12:00:00
 
 ### Added
@@ -453,6 +459,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Any earlier versions of OG-USA can be found in the [`OG-Core`](https://github.com/PSLmodels/OG-Core) repository [release history](https://github.com/PSLmodels/OG-Core/releases) from [v.0.6.4](https://github.com/PSLmodels/OG-Core/releases/tag/v0.6.4) (Jul. 20, 2021) or earlier.
 
 
+[0.14.11]: https://github.com/PSLmodels/OG-Core/compare/v0.14.10...v0.14.11
 [0.14.10]: https://github.com/PSLmodels/OG-Core/compare/v0.14.9...v0.14.10
 [0.14.9]: https://github.com/PSLmodels/OG-Core/compare/v0.14.8...v0.14.9
 [0.14.8]: https://github.com/PSLmodels/OG-Core/compare/v0.14.7...v0.14.8

docs/templates/variables_template.md

@@ -0,0 +1,9 @@
+Model variables
+=================
+
+This section summarizes variables output from the model in a format
+that is easy to search and print.
+The model variables are grouped together in common categories and are
+available in both the dictionaries of steady-state and transition-path
+output, unless noted otherwise in these docs.
+

environment.yml

@@ -19,7 +19,7 @@ dependencies:
 - sphinxcontrib-bibtex>=2.0.0
 - sphinx-math-dollar
 - pydata-sphinx-theme
-- jupyter-book>=0.11.3
+- jupyter-book<2.0.0
 - jupyter
 - pytest>=6.0
 - pytest-cov

ogcore/__init__.py

@@ -20,4 +20,4 @@
 from ogcore.txfunc import *
 from ogcore.utils import *
 
-__version__ = "0.14.10"
+__version__ = "0.14.11"

ogcore/demographics.py

@@ -118,6 +118,7 @@ def get_un_data(
             "764": "THA",
             "076": "BRA",
             "410": "KOR",
+            "231": "ETH",
         }
         un_variable_dict = {
             "68": "fertility_rates",

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="ogcore",
-    version="0.14.10",
+    version="0.14.11",
     author="Jason DeBacker and Richard W. Evans",
     license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
     description="A general equilibrium overlapping generations model for fiscal policy analysis",