Skip to content

Commit

Permalink
Merged in previous PR's and updated version
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchellpound committed Sep 20, 2023
2 parents ebff04f + 6f5f132 commit 33104d6
Show file tree
Hide file tree
Showing 58 changed files with 1,221 additions and 229 deletions.
8 changes: 0 additions & 8 deletions .github/changelog_template.md

This file was deleted.

4 changes: 0 additions & 4 deletions .github/get-changelog-diff.sh

This file was deleted.

12 changes: 0 additions & 12 deletions .github/has-functional-changes.sh

This file was deleted.

33 changes: 0 additions & 33 deletions .github/is-version-number-acceptable.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .github/publish-git-tag.sh

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Build and test [Python 3.9]
on: [push, pull_request]
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
python-version: ["3.9"]

steps:
- name: Checkout
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install package
run: make install
- name: Run tests
run: make test
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
with:
files: ./coverage.xml
flags: unittests
name: codecov-umbrella
fail_ci_if_error: true
verbose: true
14 changes: 14 additions & 0 deletions .github/workflows/check_format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Check code formatting

on: [push, pull_request]

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- uses: psf/black@stable
with:
options: "-l 79 --check"
src: "."
37 changes: 37 additions & 0 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build and Deploy Jupyter Book documentation
on:
push:
branches:
- main
jobs:
build-and-deploy:
if: github.repository == 'TheCGO/fiscalsim-us'
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-variant: Mambaforge
activate-environment: fiscalsim-us-dev
environment-file: environment.yml
python-version: "3.9"
auto-activate-base: false
- name: Install package and build documentation
shell: bash -l {0}
run: |
pip install -e .[dev]
pip install jupyter-book>=0.11.3
pip install sphinxcontrib-bibtex>=2.0.0
python -m ipykernel install --user --name=fiscalsim-us-dev
jb build ./docs/book
- name: Deploy documentation
uses: JamesIves/github-pages-deploy-action@releases/v4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: docs/book/_build/html # The folder the action should deploy.
27 changes: 27 additions & 0 deletions .github/workflows/docs_check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Check that docs build
on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-variant: Mambaforge
activate-environment: fiscalsim-us-dev
environment-file: environment.yml
python-version: "3.9"
auto-activate-base: false
- name: Install package and build documentation
shell: bash -l {0}
run: |
pip install -e .[dev]
pip install jupyter-book>=0.11.3
pip install sphinxcontrib-bibtex>=2.0.0
python -m ipykernel install --user --name=fiscalsim-us-dev
jb build ./docs/book
55 changes: 0 additions & 55 deletions .github/workflows/pr.yaml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/publish_to_pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Publish package to PyPI

on:
push:
branches:
- main

jobs:
deploy:
name: Publish to PyPI
if: github.repository == 'TheCGO/fiscalsim-us'
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Build package
run: make pip-package
- name: Publish a Python distribution to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI }}
skip_existing: true
99 changes: 0 additions & 99 deletions .github/workflows/push.yaml

This file was deleted.

16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,21 @@ 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.4] - 2023-09-20 16:00:00

### Added

- Added Louisiana state income tax logic with credits and refunds

## [0.1.3] - 2023-09-19 12:00:00

### Added

- Updates the GH Actions files and adds two dependencies to `setup.py`
- Updates in PR #50 that updates the SNAP and TANF documentation
- Updates in PR #33 that update the VA tax logic
- Updates in PR #32 that update the MN tax logic

## [0.1.2] - 2023-07-31 18:22:17

### Added
Expand Down Expand Up @@ -139,4 +154,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[0.0.3]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.2...0.0.3
[0.0.2]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.1...0.0.2
[0.0.1]: https://github.com/TheCGO/fiscalsim-us/compare/0.0.0...0.0.1

Loading

0 comments on commit 33104d6

Please sign in to comment.