From 7cc6b19a1c4f9289b32c4f287b8616ed5ac32cf7 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 26 Oct 2023 13:20:43 -0600 Subject: [PATCH 1/6] Update version in setup.py and cs-config/...functions.py --- cs-config/cs_config/functions.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cs-config/cs_config/functions.py b/cs-config/cs_config/functions.py index 75204036..9a1ac8c2 100644 --- a/cs-config/cs_config/functions.py +++ b/cs-config/cs_config/functions.py @@ -75,7 +75,7 @@ class MetaParams(paramtools.Parameters): def get_version(): - return "0.1.1" + return "0.1.2" def get_inputs(meta_param_dict): diff --git a/setup.py b/setup.py index be4d9243..c575886d 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name="ogusa", - version="0.1.1", + version="0.1.2", author="Jason DeBacker and Richard W. Evans", license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", description="USA calibration for OG-Core", From d8c743dc7905cd97b30fa0d82e26fd61630c42d9 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 26 Oct 2023 13:23:11 -0600 Subject: [PATCH 2/6] Updated CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa913aec..b0ecb1c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ 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.1.2] - 2023-10-26 14:00:00 + +### Added + +- Simple update of version in `setup.py` and `cs-config/cs_config/functions.py` to make sure that the `publish_to_pypi.yml` GitHub Action works + ## [0.1.1] - 2023-10-25 17:00:00 ### Added @@ -40,4 +46,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 +[0.1.2]: https://github.com/PSLmodels/OG-USA/compare/v0.1.1...v0.1.2 [0.1.1]: https://github.com/PSLmodels/OG-USA/compare/v0.1.0...v0.1.1 From eca63f7c9b7925166452d75e5f5046781d78c3db Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 26 Oct 2023 13:28:30 -0600 Subject: [PATCH 3/6] Removes Python 3.9 tests from build_and_test.yml --- .github/workflows/build_and_test.yml | 2 +- CHANGELOG.md | 1 + README.md | 2 +- setup.py | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 569c9f3b..5c8f020b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.9", "3.10"] + python-version: ["3.10"] steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index b0ecb1c5..7a72c76b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Simple update of version in `setup.py` and `cs-config/cs_config/functions.py` to make sure that the `publish_to_pypi.yml` GitHub Action works +- Removes Python 3.9 tests from `build_and_test.yml` to see if that allows the tests to run on all three operating system platforms. ## [0.1.1] - 2023-10-25 17:00:00 diff --git a/README.md b/README.md index 97649674..4ceb1a22 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | --- | --- | | Org | [![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/PSLmodels/OG-USA/blob/master/LICENSE) | -| Package | [![Python 3.9](https://img.shields.io/badge/python-3.10-blue.svg)](https://www.python.org/downloads/release/python-3917/) [![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/ogusa.svg)](https://pypi.org/project/ogusa/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogusa.svg?label=PyPI%20downloads)](https://pypi.org/project/fiscalsim-us/) | +| 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/ogusa.svg)](https://pypi.org/project/ogusa/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogusa.svg?label=PyPI%20downloads)](https://pypi.org/project/fiscalsim-us/) | | Testing | ![example event parameter](https://github.com/PSLmodels/OG-USA/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/OG-USA/actions/workflows/deploy_docs.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/OG-USA/actions/workflows/check_format.yml/badge.svg?branch=master) [![Codecov](https://codecov.io/gh/PSLmodels/OG-USA/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/OG-USA) | OG-USA is an overlapping-generations (OG) model that allows for dynamic general equilibrium analysis of fiscal policy for the United States. OG-USA is built on the [OG-Core](https://github.com/PSLmodels/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](https://pslmodels.github.io/OG-Core) and documentation of the specific United States calibration of the model is available at [https://pslmodels.github.io/OG-USA](https://pslmodels.github.io/OG-USA). diff --git a/setup.py b/setup.py index c575886d..1cbc8fcd 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,6 @@ "License :: OSI Approved :: Common Public License", "Operating System :: POSIX", "Programming Language :: Python", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Topic :: Scientific/Engineering :: Information Analysis", From d4f694f855b801e2aebbd80469d75b70eeda1493 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 26 Oct 2023 13:30:32 -0600 Subject: [PATCH 4/6] Updated title in build_and_test.yml --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 5c8f020b..fe4b884b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,4 +1,4 @@ -name: Build and test [Python 3.9, 3.10] +name: Build and test [Python 3.10] on: [push, pull_request] From d7b84dea4c21b1ec6649584ad5ff61cfe8672acc Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 26 Oct 2023 14:53:00 -0600 Subject: [PATCH 5/6] Added back Python 3.9 --- .github/workflows/build_and_test.yml | 4 ++-- CHANGELOG.md | 4 ++-- README.md | 2 +- setup.py | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index fe4b884b..87beb167 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -7,8 +7,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.10"] + os: [ubuntu-latest, macos-latest] + python-version: ["3.9", "3.10"] steps: - name: Checkout diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a72c76b..d8acdda0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,12 @@ 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.1.2] - 2023-10-26 14:00:00 +## [0.1.2] - 2023-10-26 15:00:00 ### Added - Simple update of version in `setup.py` and `cs-config/cs_config/functions.py` to make sure that the `publish_to_pypi.yml` GitHub Action works -- Removes Python 3.9 tests from `build_and_test.yml` to see if that allows the tests to run on all three operating system platforms. +- Removes Windows OS tests from `build_and_test.yml`, which are not working right now for some reason. ## [0.1.1] - 2023-10-25 17:00:00 diff --git a/README.md b/README.md index 4ceb1a22..10a73766 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | --- | --- | | Org | [![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/PSLmodels/OG-USA/blob/master/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/ogusa.svg)](https://pypi.org/project/ogusa/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogusa.svg?label=PyPI%20downloads)](https://pypi.org/project/fiscalsim-us/) | +| Package | [![Python 3.9](https://img.shields.io/badge/python-3.9-blue.svg)](https://www.python.org/downloads/release/python-3917/) [![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/ogusa.svg)](https://pypi.org/project/ogusa/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ogusa.svg?label=PyPI%20downloads)](https://pypi.org/project/fiscalsim-us/) | | Testing | ![example event parameter](https://github.com/PSLmodels/OG-USA/actions/workflows/build_and_test.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/OG-USA/actions/workflows/deploy_docs.yml/badge.svg?branch=master) ![example event parameter](https://github.com/PSLmodels/OG-USA/actions/workflows/check_format.yml/badge.svg?branch=master) [![Codecov](https://codecov.io/gh/PSLmodels/OG-USA/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/OG-USA) | OG-USA is an overlapping-generations (OG) model that allows for dynamic general equilibrium analysis of fiscal policy for the United States. OG-USA is built on the [OG-Core](https://github.com/PSLmodels/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](https://pslmodels.github.io/OG-Core) and documentation of the specific United States calibration of the model is available at [https://pslmodels.github.io/OG-USA](https://pslmodels.github.io/OG-USA). diff --git a/setup.py b/setup.py index 1cbc8fcd..c575886d 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ "License :: OSI Approved :: Common Public License", "Operating System :: POSIX", "Programming Language :: Python", + "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Topic :: Scientific/Engineering :: Information Analysis", From 7406d7899947596c5f3a3e6c58fd145685ea575a Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 26 Oct 2023 14:54:11 -0600 Subject: [PATCH 6/6] Updated title in build_and_test.yml --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 87beb167..890b04ab 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,4 +1,4 @@ -name: Build and test [Python 3.10] +name: Build and test [Python 3.9, 3.10] on: [push, pull_request]