Make calculator.py code be same as on master branch #147

	name: Build Package and Test Source Code [Python 3.10, 3.11, 3.12]

	on: [push, pull_request]

	jobs:
	build:
	runs-on: ${{ matrix.os }}
	strategy:
	matrix:
	os: [ubuntu-latest, windows-latest]
	python-version: ['3.10', '3.11', '3.12']

	steps:
	- name: Checkout
	uses: actions/checkout@master
	with:
	persist-credentials: false

	- name: Setup Miniconda using Python ${{ matrix.python-version }}
	uses: conda-incubator/setup-miniconda@v2
	with:
	activate-environment: taxcalc-dev
	environment-file: environment.yml
	python-version: ${{ matrix.python-version }}
	auto-activate-base: false

	- name: Build
	shell: bash -l {0}
	run: \|
	pip install -e . --user
	pip install pytest-cov --user
	pip install pytest-pycodestyle --user

	- name: Test
	shell: bash -l {0}
	working-directory: ./
	run: \|
	pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml

	- name: Upload coverage to Codecov
	if: matrix.os == 'ubuntu-latest' && contains(github.repository, 'PSLmodels/Tax-Calculator')
	uses: codecov/codecov-action@v4
	with:
	token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
	file: ./coverage.xml
	flags: unittests
	name: codecov-umbrella
	#fail_ci_if_error: true
	fail_ci_if_error: false
	verbose: true

Provide feedback