From 970f0209991d0973392086bddb3dd213a1d5e55f Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 11 Apr 2024 00:11:02 -0600 Subject: [PATCH 1/5] Reinstate build_and_test.yml on push --- .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 54ca35cb4..5a4e8dab3 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,5 +1,5 @@ name: Build and test -on: [pull_request] +on: [push, pull_request] jobs: build: runs-on: ${{ matrix.os }} From f23244d01a5b4ab9de0593e6e8651a04769cf307 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 11 Apr 2024 00:12:25 -0600 Subject: [PATCH 2/5] Run docs_check.yml only on pull_request --- .github/workflows/docs_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs_check.yml b/.github/workflows/docs_check.yml index b8f803c73..fa344ba82 100644 --- a/.github/workflows/docs_check.yml +++ b/.github/workflows/docs_check.yml @@ -1,5 +1,5 @@ name: Check that docs build -on: [push, pull_request] +on: [pull_request] jobs: build: @@ -15,7 +15,7 @@ jobs: miniforge-variant: Mambaforge activate-environment: fiscalsim-us-dev environment-file: environment.yml - python-version: "3.10" + python-version: "3.11" auto-activate-base: false - name: Install package and build documentation shell: bash -l {0} From 8823ae863547f612c9fd6566888ab1488daa6cbf Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 11 Apr 2024 00:18:27 -0600 Subject: [PATCH 3/5] Updated version and CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ changelog.yaml | 6 ++++++ setup.py | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10733cb8b..09b83e65a 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.2.9] - 2024-04-11 00:30:00 + +### Added + +- Reinstates running `build_and_test.yml` on push after merge. +- Limits `docs_check.yml` to only run on pull request commits. + ## [0.2.8] - 2024-04-10 22:30:00 ### Added @@ -203,6 +210,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - First prototype version based off of openfisca-us and tax-calculator. +[0.2.9]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.8...v0.2.9 [0.2.8]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.7...v0.2.8 [0.2.7]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.6...v0.2.7 [0.2.6]: https://github.com/TheCGO/fiscalsim-us/compare/v0.2.5...v0.2.6 diff --git a/changelog.yaml b/changelog.yaml index fb3c43ae7..6076824bf 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -184,3 +184,9 @@ added: - Limits `build_and_test.yml` GH Action to pull requests and no pushes on merge. It also limits the codecov run to the Linux-OS tests on the latest version of Python (currently Python 3.11). date: 2024-04-10 22:30:00 +- bump: patch + changes: + added: + - Reinstates running `build_and_test.yml` on push after merge. + - Limits `docs_check.yml` to only run on pull request commits. + date: 2024-04-11 00:30:00 diff --git a/setup.py b/setup.py index a0974675a..3a6f532e9 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name="fiscalsim-us", - version="0.2.8", + version="0.2.9", author="Center for Growth and Opportunity at Utah State University (CGO)", author_email="fiscalsim@thecgo.org", long_description=readme, From 47117f8e525238b9c1e650973e9b8b8aff37ab07 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 11 Apr 2024 00:22:19 -0600 Subject: [PATCH 4/5] Updated tags in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51360e95a..82e462bef 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | --- | --- | | Org | [![CGO cataloged](https://img.shields.io/badge/CGO-catalogued-9cf)](https://github.com/TheCGO) [![OS License: AGPL-3.0](https://img.shields.io/badge/OS%20License-AGPL%203.0-yellow)](https://github.com/TheCGO/fiscalsim-us/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/) [![PyPI Latest Release](https://img.shields.io/pypi/v/fiscalsim-us.svg)](https://pypi.org/project/fiscalsim-us/) [![PyPI Downloads](https://img.shields.io/pypi/dm/fiscalsim-us.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-3119/) [![PyPI Latest Release](https://img.shields.io/pypi/v/fiscalsim-us.svg)](https://pypi.org/project/fiscalsim-us/) [![PyPI Downloads](https://img.shields.io/pypi/dm/fiscalsim-us.svg?label=PyPI%20downloads)](https://pypi.org/project/fiscalsim-us/) | | Testing | ![example event parameter](https://github.com/TheCGO/fiscalsim-us/actions/workflows/build_and_test.yml/badge.svg?branch=main) ![example event parameter](https://github.com/TheCGO/fiscalsim-us/actions/workflows/deploy_docs.yml/badge.svg?branch=main) ![example event parameter](https://github.com/TheCGO/fiscalsim-us/actions/workflows/check_format.yml/badge.svg?branch=main) [![Codecov](https://codecov.io/gh/TheCGO/fiscalsim-us/branch/main/graph/badge.svg)](https://codecov.io/gh/TheCGO/fiscalsim-us) | From 65105f65b87d76a23258cc2a0b98a7dc01184f22 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Thu, 11 Apr 2024 00:23:44 -0600 Subject: [PATCH 5/5] Added some lines in CHANGELOG.md --- CHANGELOG.md | 1 + changelog.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09b83e65a..39b17b239 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Reinstates running `build_and_test.yml` on push after merge. - Limits `docs_check.yml` to only run on pull request commits. +- Updates some tags in `README.md.` ## [0.2.8] - 2024-04-10 22:30:00 diff --git a/changelog.yaml b/changelog.yaml index 6076824bf..a26af9284 100644 --- a/changelog.yaml +++ b/changelog.yaml @@ -189,4 +189,5 @@ added: - Reinstates running `build_and_test.yml` on push after merge. - Limits `docs_check.yml` to only run on pull request commits. + - Updates some tags in `README.md.` date: 2024-04-11 00:30:00