Skip to content

Remove initial_guess_w_SS from default parameters #35

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove initial_guess_w_SS from default parameters #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d7b8c4
remove initial_guess_wSS from default params
jdebacker Aug 3, 2025
a3a4549
Merge remote-tracking branch 'upstream/main' into env_update
jdebacker Aug 3, 2025
35d5dad
updates for python 313
jdebacker Aug 16, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
miniconda-version: "latest"
activate-environment: ogidn-dev
environment-file: environment.yml
python-version: "3.11"
python-version: "3.13"
auto-activate-base: false

- name: Build # Build Jupyter Book
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
miniconda-version: "latest"
activate-environment: ogidn-dev
environment-file: environment.yml
python-version: "3.11"
python-version: "3.13"
auto-activate-base: false

- name: Build # Build Jupyter Book
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_to_pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.11"
python-version: "3.13"
- name: Build package
shell: bash -l {0}
run: |
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ 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.8] - 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.7] - 2025-04-28 12:00:00

### Added
Expand Down Expand Up @@ -48,6 +55,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-IDN/examples/run_og_idn.py runs, but the model is not currently calibrated to represent the Indonesian economy and population.

[0.0.8]: https://github.com/EAPD-DRB/OG-IDN/compare/v0.0.7...v0.0.8
[0.0.7]: https://github.com/EAPD-DRB/OG-IDN/compare/v0.0.6...v0.0.7
[0.0.6]: https://github.com/EAPD-DRB/OG-IDN/compare/v0.0.5...v0.0.6
[0.0.5]: https://github.com/EAPD-DRB/OG-IDN/compare/v0.0.4...v0.0.5
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-IDN/blob/main/LICENSE) |
| Package | [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-31111/) [![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/ogidn.svg)](https://pypi.org/project/ogidn/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogidn.svg?label=PyPI%20downloads)](https://pypi.org/project/ogidn/) |
| 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/ogidn.svg)](https://pypi.org/project/ogidn/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogidn.svg?label=PyPI%20downloads)](https://pypi.org/project/ogidn/) |
| Testing | ![example event parameter](https://github.com/EAPD-DRB/OG-IDN/actions/workflows/build_and_test.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-IDN/actions/workflows/deploy_docs.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-IDN/actions/workflows/check_format.yml/badge.svg?branch=main) [![Codecov](https://codecov.io/gh/EAPD-DRB/OG-IDN/branch/main/graph/badge.svg)](https://codecov.io/gh/EAPD-DRB/OG-IDN) |

OG-IDN is an overlapping-generations (OG) model that allows for dynamic general equilibrium analysis of fiscal policy for Indonesia. OG-IDN 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 Indonesian calibration of the model is available at https://eapd-drb.github.io/OG-IDN.
Expand Down
2 changes: 1 addition & 1 deletion docs/book/content/intro/intro.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-IDN/blob/main/LICENSE) |
| Package | [![Python 3.11](https://img.shields.io/badge/python-3.11-blue.svg)](https://www.python.org/downloads/release/python-31111/) [![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/ogidn.svg)](https://pypi.org/project/ogidn/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogidn.svg?label=PyPI%20downloads)](https://pypi.org/project/ogidn/) |
| 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/ogidn.svg)](https://pypi.org/project/ogidn/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogidn.svg?label=PyPI%20downloads)](https://pypi.org/project/ogidn/) |
| Testing | ![example event parameter](https://github.com/EAPD-DRB/OG-IDN/actions/workflows/build_and_test.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-IDN/actions/workflows/deploy_docs.yml/badge.svg?branch=main) ![example event parameter](https://github.com/EAPD-DRB/OG-IDN/actions/workflows/check_format.yml/badge.svg?branch=main) [![Codecov](https://codecov.io/gh/EAPD-DRB/OG-IDN/branch/main/graph/badge.svg)](https://codecov.io/gh/EAPD-DRB/OG-IDN) |

[`OG-IDN`](https://github.com/EAPD-DRB/OG-IDN) is a Python package that provides code and data to calibrate an overlapping-generations (OG) model to the economy of Indonesia (IDN), the code of which is hosted on GitHub at https://github.com/EAPD-DRB/OG-IDN. `OG-IDN` 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-IDN` calibration package and the `OG-Core` theory and logic make the model that allows for dynamic general equilibrium analysis of federal fiscal policy in Indonesia. 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-IDN` package contains the following major sections, which are regularly updated.
Expand Down
5 changes: 2 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ogidn-dev
channels:
- conda-forge
dependencies:
- python>=3.7.7, <3.13
- python>3.11, <3.14
- numpy
- setuptools
- wheel
Expand All @@ -13,8 +13,7 @@ dependencies:
- dask>=2.30.0
- dask-core>=2.30.0
- distributed>=2.30.1
- marshmallow<4.0.0
- paramtools>=0.15.0
- paramtools>=0.20.0
- sphinx>=3.5.4
- sphinx-book-theme>=0.1.3
- sphinx-argparse
Expand Down
1 change: 0 additions & 1 deletion ogidn/ogidn_default_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3183,7 +3183,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": [
Expand Down
1 change: 0 additions & 1 deletion ogidn/ogidn_multisector_default_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3229,7 +3229,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": [
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ build-backend = "setuptools.build_meta"

[tool.black]
line-length = 79
target-version = ["py311", "py312"]
target-version = ["py312", "py313"]
include = '\.pyi?$'
9 changes: 4 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="ogidn",
version="0.0.7",
version="0.0.8",
author="Marcelo LaFleur, Richard W. Evans, and Jason DeBacker",
license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
description="Indonesia (IDN) Calibration for OG-Core",
Expand All @@ -26,7 +26,7 @@
]
},
include_packages=True,
python_requires=">=3.7.7, <3.13",
python_requires=">3.11, <3.14",
install_requires=[
"numpy",
"psutil",
Expand All @@ -35,8 +35,7 @@
"matplotlib",
"dask>=2.30.0",
"distributed>=2.30.1",
"marshmallow<4.0.0",
"paramtools>=0.15.0",
"paramtools>=0.20.0",
"requests",
"pandas-datareader",
"xlwt",
Expand All @@ -55,8 +54,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",
],
Expand Down
Loading