From 4ab7997c163822c497db848fd99e1ed71cdaa071 Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Sun, 3 Aug 2025 16:17:26 -0400 Subject: [PATCH 1/3] remove initial_guess_w_SS from default params --- ogphl/ogphl_default_parameters.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ogphl/ogphl_default_parameters.json b/ogphl/ogphl_default_parameters.json index 113f040..baee66d 100644 --- a/ogphl/ogphl_default_parameters.json +++ b/ogphl/ogphl_default_parameters.json @@ -2454,7 +2454,6 @@ "RC_TPI": 0.001, "reform_use_baseline_solution": true, "initial_guess_r_SS": 0.04, - "initial_guess_w_SS": 1.1617041226785383, "initial_guess_TR_SS": 0.042, "initial_guess_factor_SS": 71707.0, "omega": [ From 707c8959fc54f5b0e7f800cf8ce6659ca578990c Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Fri, 15 Aug 2025 21:07:39 -0400 Subject: [PATCH 2/3] update for python 3.13 --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/deploy_docs.yml | 2 +- .github/workflows/docs_check.yml | 2 +- .github/workflows/publish_to_pypi.yml | 2 +- CHANGELOG.md | 8 ++++++++ README.md | 2 +- docs/book/content/intro/intro.md | 2 +- environment.yml | 2 +- ogphl/__init__.py | 2 +- pyproject.toml | 2 +- setup.py | 6 +++--- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 292513d..38c8586 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.11", "3.12"] + python-version: ["3.12", "3.13"] steps: - name: Checkout diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml index 3bc6681..cff0a88 100644 --- a/.github/workflows/deploy_docs.yml +++ b/.github/workflows/deploy_docs.yml @@ -28,7 +28,7 @@ jobs: miniconda-version: "latest" activate-environment: ogphl-dev environment-file: environment.yml - python-version: "3.12" + python-version: "3.13" auto-activate-base: false - name: Build # Build Jupyter Book diff --git a/.github/workflows/docs_check.yml b/.github/workflows/docs_check.yml index 38d9dc8..51a7f94 100644 --- a/.github/workflows/docs_check.yml +++ b/.github/workflows/docs_check.yml @@ -26,7 +26,7 @@ jobs: miniconda-version: "latest" activate-environment: ogphl-dev environment-file: environment.yml - python-version: "3.12" + python-version: "3.13" auto-activate-base: false - name: Build # Build Jupyter Book diff --git a/.github/workflows/publish_to_pypi.yml b/.github/workflows/publish_to_pypi.yml index 249004a..18968b8 100644 --- a/.github/workflows/publish_to_pypi.yml +++ b/.github/workflows/publish_to_pypi.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.12" + python-version: "3.13" - name: Build package shell: bash -l {0} run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 21236c1..052725d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. 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.0.13] - 2025-08-15 21:00:00 + +### Added + +- Updates for Python 3.13 compatibility +- Removes the deprecated `initial_guess_w_SS` parameter from the default parameters file + ## [0.0.12] - 2025-06-18 12:00:00 ### Added @@ -85,6 +92,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - This version is a pre-release alpha. The example run script `OG-PHL/examples/run_og_phl.py` runs, but the model is not currently calibrated to represent the Philippines economy and population. +[0.0.13]: https://github.com/EAPD-DRB/OG-PHL/compare/v0.0.12...v0.0.13 [0.0.12]: https://github.com/EAPD-DRB/OG-PHL/compare/v0.0.11...v0.0.12 [0.0.11]: https://github.com/EAPD-DRB/OG-PHL/compare/v0.0.10...v0.0.11 [0.0.10]: https://github.com/EAPD-DRB/OG-PHL/compare/v0.0.9...v0.0.10 diff --git a/README.md b/README.md index 49014b4..ae83136 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | --- | --- | | Org | [![United Nations DESA](https://img.shields.io/badge/United%20Nations%20DESA-blue)](https://www.un.org/en/desa) [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CC0-1.0](https://img.shields.io/badge/OS%20License-CC0%201.0-yellow)](https://github.com/EAPD-DRB/OG-PHL/blob/main/LICENSE) | -| Package | [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3116/) [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3129/) [![PyPI Latest Release](https://img.shields.io/pypi/v/ogphl.svg)](https://pypi.org/project/ogphl/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogphl.svg?label=PyPI%20downloads)](https://pypi.org/project/ogphl/) | +| Package | [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3129/) [![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3137/) [![PyPI Latest Release](https://img.shields.io/pypi/v/ogphl.svg)](https://pypi.org/project/ogphl/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogphl.svg?label=PyPI%20downloads)](https://pypi.org/project/ogphl/) | | Testing | ![example event parameter](https://github.com/EAPD-DRB/OG-PHL/actions/workflows/build_and_test.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-PHL/actions/workflows/deploy_docs.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-PHL/actions/workflows/check_format.yml/badge.svg?branch=main) [![Codecov](https://codecov.io/gh/EAPD-DRB/OG-PHL/branch/main/graph/badge.svg)](https://codecov.io/gh/EAPD-DRB/OG-PHL) | OG-PHL is an overlapping-generations (OG) model that allows for dynamic general equilibrium analysis of fiscal policy for the Philippines. OG-PHL is built on the OG-Core framework. The model output includes changes in macroeconomic aggregates (GDP, investment, consumption), wages, interest rates, and the stream of tax revenues over time. Regularly updated documentation of the model theory--its output, and solution method--and the Python API is available at https://pslmodels.github.io/OG-Core and documentation of the specific Philippines calibration of the model is available at https://eapd-drb.github.io/OG-PHL. diff --git a/docs/book/content/intro/intro.md b/docs/book/content/intro/intro.md index 7c7e8ea..e50a992 100644 --- a/docs/book/content/intro/intro.md +++ b/docs/book/content/intro/intro.md @@ -4,7 +4,7 @@ | | | | --- | --- | | Org | [![United Nations DESA](https://img.shields.io/badge/United%20Nations%20DESA-blue)](https://www.un.org/en/desa) [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org) [![OS License: CC0-1.0](https://img.shields.io/badge/OS%20License-CC0%201.0-yellow)](https://github.com/EAPD-DRB/OG-PHL/blob/main/LICENSE) | -| Package | [![Python 3.10](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-31013/) [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-3116/) [![PyPI Latest Release](https://img.shields.io/pypi/v/ogphl.svg)](https://pypi.org/project/ogphl/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogphl.svg?label=PyPI%20downloads)](https://pypi.org/project/ogphl/) | +| Package | [![Python 3.12](https://img.shields.io/badge/python-3.12-blue.svg)](https://www.python.org/downloads/release/python-3129/) [![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/release/python-3137/) [![PyPI Latest Release](https://img.shields.io/pypi/v/ogphl.svg)](https://pypi.org/project/ogphl/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogphl.svg?label=PyPI%20downloads)](https://pypi.org/project/ogphl/) | | Testing | ![example event parameter](https://github.com/EAPD-DRB/OG-PHL/actions/workflows/build_and_test.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-PHL/actions/workflows/deploy_docs.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-PHL/actions/workflows/check_format.yml/badge.svg?branch=main) [![Codecov](https://codecov.io/gh/EAPD-DRB/OG-PHL/branch/main/graph/badge.svg)](https://codecov.io/gh/EAPD-DRB/OG-PHL) | [`OG-PHL`](https://github.com/EAPD-DRB/OG-PHL) is a Python package that provides code and data to calibrate an overlapping-generations (OG) model to the economy of the Philippines (PHL), the code of which is hosted on GitHub at https://github.com/EAPD-DRB/OG-PHL. `OG-PHL` uses as a dependency the [`OG-Core`](https://pslmodels.github.io/OG-Core/) package, which contains the core theory and logic of a general OG model. The `OG-PHL` calibration package and the `OG-Core` theory and logic make the model that allows for dynamic general equilibrium analysis of federal fiscal policy in the Republic of the Philippines. The model output focuses on changes in macroeconomic aggregates (GDP, investment, consumption), wages, interest rates, and the stream of tax revenues over time. This documentation of the `OG-PHL` package contains the following major sections, which are regularly updated. diff --git a/environment.yml b/environment.yml index b2c27ae..5f76e7b 100644 --- a/environment.yml +++ b/environment.yml @@ -2,7 +2,7 @@ name: ogphl-dev channels: - conda-forge dependencies: -- python>=3.11, <3.13 +- python>3.11, <3.14 - numpy - setuptools - wheel diff --git a/ogphl/__init__.py b/ogphl/__init__.py index 1ff5451..8529ca1 100644 --- a/ogphl/__init__.py +++ b/ogphl/__init__.py @@ -8,4 +8,4 @@ from ogphl.macro_params import * from ogphl.utils import * -__version__ = "0.0.12" +__version__ = "0.0.13" diff --git a/pyproject.toml b/pyproject.toml index e033eb0..bd1d328 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,5 +11,5 @@ build-backend = "setuptools.build_meta" [tool.black] line-length = 79 -target-version = ["py311", "py312"] +target-version = ["py312", "py313"] include = '\.pyi?$' diff --git a/setup.py b/setup.py index 456fe69..b279c24 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="ogphl", - version="0.0.12", + version="0.0.13", author="Marcelo LaFleur, Richard W. Evans, and Jason DeBacker", license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", description="Philippines Calibration for OG-Core", @@ -20,7 +20,7 @@ packages=["ogphl"], package_data={"ogphl": ["ogphl_default_parameters.json", "data/*"]}, include_packages=True, - python_requires=">=3.11, <3.13", + python_requires=">3.11, <3.14", install_requires=[ "numpy", "psutil", @@ -48,8 +48,8 @@ "License :: OSI Approved :: Common Public License", "Operating System :: POSIX", "Programming Language :: Python", - "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Software Development :: Libraries :: Python Modules", ], From 4d374152ed4a7a8c053ae37e1b3063a0e0bdb1f6 Mon Sep 17 00:00:00 2001 From: Jason DeBacker Date: Mon, 8 Sep 2025 15:12:39 -0400 Subject: [PATCH 3/3] remove replacement_rate_adjust that conflicts with OG-Core --- ogphl/ogphl_default_parameters.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/ogphl/ogphl_default_parameters.json b/ogphl/ogphl_default_parameters.json index baee66d..ff02138 100644 --- a/ogphl/ogphl_default_parameters.json +++ b/ogphl/ogphl_default_parameters.json @@ -2415,9 +2415,6 @@ "PIA_rate_bkt_3": 0.0, "PIA_maxpayment": 0.0, "PIA_minpayment": 0.0, - "replacement_rate_adjust": [ - 1.0 - ], "budget_balance": false, "baseline_spending": false, "start_year": 2025,