address merge conflicts

.github/workflows/build_and_test.yml

@@ -35,12 +35,12 @@ jobs:
         working-directory: ./
         run: |
           pytest -m 'not requires_pufcsv and not pre_release and not local' --cov=./ --cov-report=xml
-      # - name: Upload coverage to Codecov
-      #   uses: codecov/codecov-action@v1
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-      #     file: ./coverage.xml
-      #     flags: unittests
-      #     name: codecov-umbrella
-      #     fail_ci_if_error: true
-      #     verbose: true
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+          file: ./coverage.xml
+          flags: unittests
+          name: codecov-umbrella
+          fail_ci_if_error: true
+          verbose: true

.github/workflows/build_new_test_benchmark.yml

@@ -0,0 +1,49 @@
+name: Build and commit new test statistics benchmark file
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Setup Miniconda using Python
+        uses: conda-incubator/setup-miniconda@v2
+        with:
+          activate-environment: taxcalc-dev
+          environment-file: environment.yml
+          python-version: 3.9
+          auto-activate-base: false
+
+      - name: Build
+        shell: bash -l {0}
+        run: |
+          pip install -e .
+          pip install pytest-cov
+          pip install pytest-pycodestyle
+
+      - name: Test
+        shell: bash -l {0}
+        working-directory: ./
+        run: |
+          pytest -m 'not requires_pufcsv and not pre_release and not local'
+          
+      - name: Commit new test stats benchmark
+        shell: bash -l {0}
+        working-directory: ./taxcalc/tests
+        run: |
+          rm test_stats_benchmark.csv
+          mv test_stats_current.csv test_stats_benchmark.csv
+
+          git config user.name github-actions
+          git config user.email [email protected]
+
+          git add test_stats_benchmark.csv
+          git commit -m "Update test benchmark $(date +'%Y-%m-%d')"
+          git push

.github/workflows/check_jupyterbook.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           activate-environment: taxcalc-dev
           environment-file: environment.yml
-          python-version: 3.9
+          python-version: 3.8
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book

.github/workflows/deploy_jupyterbook.yml

@@ -18,7 +18,7 @@ jobs:
         with:
           activate-environment: taxcalc-dev
           environment-file: environment.yml
-          python-version: 3.9
+          python-version: 3.8
           auto-activate-base: false
 
       - name: Build # Build Jupyter Book

docs/about/releases.md

@@ -4,6 +4,27 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2021-03-01 Release 3.1.0
+------------------------
+(last merged pull request is
+[#2566](https://github.com/PSLmodels/Tax-Calculator/pull/2566))
+
+**This is an enhancement and bug-fix release.**
+
+**API Changes**
+
+**New Features**
+- Package for Python 3.9. [[#2522](https://github.com/PSLmodels/tax-calculator/pull/2522) by Max Ghenis]
+- Parameters for QBI deduction phaseout. [[#2508](https://github.com/PSLmodels/tax-calculator/pull/2508) by Peter Metz]
+- Switch for QBI deduction wage and capital limitations. [[#2497(https://github.com/PSLmodels/tax-calculator/pull/2497) by Peter Metz]
+- Interaction with `calcfunctions.py` functions and unit tests without `@jit` decorator. [[#2515](https://github.com/PSLmodels/tax-calculator/pull/2515) by Jacob Chuslo]
+
+**Bug Fixes**
+- Fix default parameter value for deduction for blind and aged widowed taxpayers. [[#2537](https://github.com/PSLmodels/tax-calculator/pull/2537) by Jacob Chuslo, reported by Jason DeBacker]
+- Include self-employment tax in calculation of partnership-specific marginal tax rates. [[#2486](https://github.com/PSLmodels/tax-calculator/pull/2486) by Cody Kallen]
+- Fix stacking of an optional capital gains tax bracket. [[#2500](https://github.com/PSLmodels/tax-calculator/pull/2500) by Peter Metz]
+- Fix bug caused by adjusting the indexed status of a parameter while also adjusting the parameter's value and a related parameter's value. [[#2532](https://github.com/PSLmodels/tax-calculator/pull/2532) by Hank Doupe]
+
 2020-08-24 Release 3.0.0
 ------------------------
 (last merged pull request is

docs/index.md

@@ -9,7 +9,7 @@ You can install it with [Anaconda](https://www.anaconda.com/products/individual)
 via:
 
 ```
-conda install -c pslmodels taxcalc
+conda install -c conda-forge taxcalc
 ```
 
 When using
@@ -51,12 +51,12 @@ The cross-model validation work with NBER's TAXSIM-27 model is described
 
 ## Latest release
 
-{doc}`3.0.0 (2020-08-22) <about/releases>`
+{doc}`3.1.0 (2020-03-01) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 
 ```
-conda update -c PSLmodels taxcalc
+conda update -c conda-forge taxcalc
 ```
 
 If you're a new user, read {doc}`usage/starting`.

docs/use_cases.md

@@ -316,3 +316,30 @@ families. January 2021. URL:
 Allowance. February 2021. URL:
 <https://www.niskanencenter.org/wp-content/uploads/2021/02/Analysis-of-the-Romney-Child-Allowance_final.pdf>
 (visited on 2021-02-12).
+
+\[65\] Alex Brill, Kyle Pomerleau, and Grant Seiter. The tax benefits of
+parenthood: A history and analysis of current proposals. February 2021.
+Section: Economics. URL:
+<https://www.aei.org/research-products/report/the-tax-benefits-of-parenthood-a-history-and-analysis-of-current-proposals/>
+(visited on 2021-02-25).
+
+\[66\] Alex Brill, Kyle Pomerleau, and Grant Seiter. Pick your Child Tax
+Credit. March 2021. Section: Economics. URL:
+<https://www.aei.org/economics/pick-your-child-tax-credit/> (visited on
+2021-04-05).
+
+\[67\] Alex Brill. The American Rescue Plan's likely cost is way more
+than \$1.9 trillion. March 2021. URL:
+<https://www.aei.org/economics/the-american-rescue-plans-likely-cost-is-way-more-than-1-9-trillion/>
+(visited on 2021-03-05).
+
+\[68\] Alex Brill, Kyle Pomerleau, and Grant Seiter. How will the
+American Rescue Plan impact your 2021 tax liability? March 2021.
+Section: Economics. URL:
+<https://www.aei.org/economics/how-will-the-american-rescue-plan-impact-your-2021-tax-liability/>
+(visited on 2021-04-05).
+
+\[69\] Max Gehnis. California's basic income bill still needs work.
+April 2021. URL:
+<https://blog.ubicenter.org/20210403/california-ab65-calubi.html>
+(visited on 2021-04-06).

environment.yml

@@ -10,6 +10,7 @@ dependencies:
 - requests
 - aiohttp
 - numba
+- "fsspec<=0.8.7"
 - pytest
 - pytest-pep8
 - pytest-xdist
@@ -19,4 +20,5 @@ dependencies:
 - "paramtools>=0.18.0"
 - pip
 - pip:
-    - jupyter-book
+    - jupyter-book
+    - pytest_harvest

setup.py

@@ -6,7 +6,7 @@
 with open('README.md') as f:
     longdesc = f.read()
 
-version = '3.0.0'
+version = '3.1.0'
 
 config = {
     'description': 'Tax Calculator',

taxcalc.egg-info/PKG-INFO

@@ -0,0 +1,39 @@
+Metadata-Version: 1.1
+Name: taxcalc
+Version: 3.1.0
+Summary: taxcalc
+Home-page: https://github.com/PSLmodels/Tax-Calculator
+Author: UNKNOWN
+Author-email: UNKNOWN
+License: CC0 1.0 Universal public domain dedication
+Download-URL: https://github.com/PSLmodels/Tax-Calculator
+Description: [![PSL cataloged](https://img.shields.io/badge/PSL-cataloged-a0a0a0.svg)](https://www.PSLmodels.org)
+        [![Python 3.6+](https://img.shields.io/badge/python-3.6%2B-blue.svg)](https://www.python.org/downloads/release/python-360/)
+        [![Build Status](https://travis-ci.org/PSLmodels/Tax-Calculator.svg?branch=master)](https://travis-ci.org/PSLmodels/Tax-Calculator)
+        [![Codecov](https://codecov.io/gh/PSLmodels/Tax-Calculator/branch/master/graph/badge.svg)](https://codecov.io/gh/PSLmodels/Tax-Calculator)
+
+
+        Tax-Calculator
+        ==============
+
+        Tax-Calculator is an open-source microsimulation model for static
+        analysis of USA federal income and payroll taxes.
+
+        We are seeking contributors and maintainers. If you are interested in joining the project as a contributor or maintainer, 
+        contact [email protected] or jump right in. 
+
+        Complete documentation is available
+        [here](https://PSLmodels.github.io/Tax-Calculator/).
+
+Platform: UNKNOWN
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: License :: CC0 1.0 Universal public domain dedication
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Topic :: Software Development :: Libraries :: Python Modules

taxcalc.egg-info/SOURCES.txt

@@ -0,0 +1,35 @@
+MANIFEST.in
+README.md
+setup.py
+taxcalc/__init__.py
+taxcalc/calcfunctions.py
+taxcalc/calculator.py
+taxcalc/conftest.py
+taxcalc/consumption.json
+taxcalc/consumption.py
+taxcalc/cps.csv.gz
+taxcalc/cps_weights.csv.gz
+taxcalc/data.py
+taxcalc/decorators.py
+taxcalc/growdiff.json
+taxcalc/growdiff.py
+taxcalc/growfactors.csv
+taxcalc/growfactors.py
+taxcalc/parameters.py
+taxcalc/policy.py
+taxcalc/policy_current_law.json
+taxcalc/puf_ratios.csv
+taxcalc/puf_weights.csv.gz
+taxcalc/records.py
+taxcalc/records_variables.json
+taxcalc/taxcalcio.py
+taxcalc/utils.py
+taxcalc/utilsprvt.py
+taxcalc.egg-info/PKG-INFO
+taxcalc.egg-info/SOURCES.txt
+taxcalc.egg-info/dependency_links.txt
+taxcalc.egg-info/entry_points.txt
+taxcalc.egg-info/requires.txt
+taxcalc.egg-info/top_level.txt
+taxcalc/cli/__init__.py
+taxcalc/cli/tc.py

taxcalc.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

taxcalc.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+tc = taxcalc.cli.tc:cli_tc_main
+

taxcalc.egg-info/requires.txt

@@ -0,0 +1,4 @@
+numpy
+pandas
+bokeh
+numba

taxcalc.egg-info/top_level.txt

@@ -0,0 +1 @@
+taxcalc

taxcalc/__init__.py

@@ -14,4 +14,4 @@
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '3.0.0'
+__version__ = '3.1.0'