taxcalc 4.3.2__tar.gz → 4.3.4__tar.gz

{taxcalc-4.3.2 → taxcalc-4.3.4}/.github/workflows/build_and_test.yml

@@ -27,14 +27,16 @@ jobs:
       - name: Build
         shell: bash -l {0}
         run: |
-          pip install -e . --user
+          pip install -e .
           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
@@ -43,5 +45,6 @@ jobs:
           file: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
-          fail_ci_if_error: true
+          #fail_ci_if_error: true
+          fail_ci_if_error: false
           verbose: true

{taxcalc-4.3.2 → taxcalc-4.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taxcalc
-Version: 4.3.2
+Version: 4.3.4
 Summary: taxcalc
 Home-page: https://github.com/PSLmodels/Tax-Calculator
 Download-URL: https://github.com/PSLmodels/Tax-Calculator

{taxcalc-4.3.2 → taxcalc-4.3.4}/docs/about/releases.md

@@ -4,6 +4,42 @@ Go [here](https://github.com/PSLmodels/Tax-Calculator/pulls?q=is%3Apr+is%3Aclose
 for a complete commit history.
 
 
+2024-11-30 Release 4.3.4
+------------------------
+(last merged pull request is
+[#2844](https://github.com/PSLmodels/Tax-Calculator/pull/2844))
+
+**This is a bug-fix release.**
+
+**API Changes**
+
+**New Features**
+
+**Bug Fixes**
+- Fix deprecation warning when using pip to install an editable package
+[[#2840](https://github.com/PSLmodels/Tax-Calculator/pull/2840) by Jason DeBacker]
+- Fix weights precision in output file when using CLI tool with TMD input data
+[[#2841](https://github.com/PSLmodels/Tax-Calculator/pull/2841) by Martin Holmer]
+- Fix categorization of self-employment tax and additional Medicare tax
+[[#2844](https://github.com/PSLmodels/Tax-Calculator/pull/2844) by Martin Holmer]
+
+
+2024-11-14 Release 4.3.3
+------------------------
+(last merged pull request is
+[#2837](https://github.com/PSLmodels/Tax-Calculator/pull/2837))
+
+**This is a minor enhancement release.**
+
+**API Changes**
+
+**New Features**
+- Clarify TCJA-after-2025 documentation
+[[#2836](https://github.com/PSLmodels/Tax-Calculator/pull/2836) by Martin Holmer]
+- Add known values of 2025 policy parameters
+[[#2837](https://github.com/PSLmodels/Tax-Calculator/pull/2837) by Martin Holmer]
+
+
 2024-11-08 Release 4.3.2
 ------------------------
 (last merged pull request is

{taxcalc-4.3.2 → taxcalc-4.3.4}/docs/index.md

@@ -57,7 +57,7 @@ The cross-model validation work with NBER's TAXSIM-27 model is described
 
 ## Latest release
 
-{doc}`4.3.2 (2024-11-08) <about/releases>`
+{doc}`4.3.4 (2024-11-30) <about/releases>`
 
 If you are already using Tax-Calculator, upgrade using the following command:
 
@@ -68,7 +68,7 @@ conda update conda-forge::taxcalc
 or
 
 ```
-pip install -U taxcalc
+pip install --upgrade taxcalc
 ```
 
 If you're a new user, read {doc}`usage/starting`.

taxcalc-4.3.4/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=64.0"]
+build-backend = "setuptools.build_meta"

{taxcalc-4.3.2 → taxcalc-4.3.4}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 with open("README.md") as f:
     longdesc = f.read()
 
-version = "4.3.2"
+version = "4.3.4"
 
 config = {
     "description": "Tax Calculator",

{taxcalc-4.3.2 → taxcalc-4.3.4}/taxcalc/__init__.py

@@ -14,6 +14,6 @@ from taxcalc.taxcalcio import *
 from taxcalc.utils import *
 from taxcalc.cli import *
 
-__version__ = '4.3.2'
+__version__ = '4.3.4'
 __min_python3_version__ = 10
 __max_python3_version__ = 12

{taxcalc-4.3.2 → taxcalc-4.3.4}/taxcalc/calcfunctions.py

@@ -157,11 +157,11 @@ def EI_PayrollTax(SS_Earnings_c, e00200p, e00200s, pencon_p, pencon_s,
         Partner self-employment earnings/loss for spouse (included in e26270 total)
     payrolltax: float
         Total (employee and employer) payroll tax liability
-        payrolltax = ptax_was + setax + ptax_amc
+        payrolltax = ptax_was
     ptax_was: float
         Employee and employer OASDI plus HI FICA tax
     setax: float
-        Self-employment tax
+        Self-employment tax (included in othertaxes and iitax)
     c03260: float
         Deductible part of self-employment tax
         c03260 = (1 - ALD_SelfEmploymentTax_hc) * 0.5 * setax
@@ -187,11 +187,11 @@ def EI_PayrollTax(SS_Earnings_c, e00200p, e00200s, pencon_p, pencon_s,
         Total self-employment income for filing unit
     payrolltax: float
         Total (employee and employer) payroll tax liability
-        payrolltax = ptax_was + setax + ptax_amc
+        payrolltax = ptax_was
     ptax_was: float
         Employee and employer OASDI plus HI FICA tax
     setax: float
-        Self-employment tax
+        Self-employment tax (included in othertaxes and iitax)
     c03260: float
         Deductible part of self-employment tax
         c03260 = (1 - ALD_SelfEmploymentTax_hc) * 0.5 * setax
@@ -260,9 +260,7 @@ def EI_PayrollTax(SS_Earnings_c, e00200p, e00200s, pencon_p, pencon_s,
                         extra_ss_income_s * (FICA_ss_trt_employer + FICA_ss_trt_employee))
 
     # compute part of total payroll taxes for filing unit
-    # (the ptax_amc part of total payroll taxes for the filing unit is
-    # computed in the AdditionalMedicareTax function below)
-    payrolltax = ptax_was + setax + extra_payrolltax
+    payrolltax = ptax_was + extra_payrolltax
 
     # compute OASDI part of payroll taxes
     ptax_oasdi = (ptax_ss_was_p + ptax_ss_was_s +
@@ -1088,9 +1086,9 @@ def AdditionalMedicareTax(e00200, MARS,
                           AMEDT_ec, sey, AMEDT_rt,
                           FICA_mc_trt_employer, FICA_mc_trt_employee,
                           FICA_ss_trt_employer, FICA_ss_trt_employee,
-                          ptax_amc, payrolltax):
+                          ptax_amc):
     """
-    Computes Additional Medicare Tax (Form 8959) included in payroll taxes.
+    Computes Additional Medicare Tax (Form 8959) included in othertaxes.
 
     Parameters
     -----
@@ -1113,23 +1111,18 @@ def AdditionalMedicareTax(e00200, MARS,
     sey: float
         Self-employment income
     ptax_amc: float
-        Additional Medicare Tax
-    payrolltax: float
-        payroll tax augmented by Additional Medicare Tax
+        Additional Medicare Tax (included in othertaxes and iitax)
 
     Returns
     -------
     ptax_amc: float
-        Additional Medicare Tax
-    payrolltax: float
-        payroll tax augmented by Additional Medicare Tax
+        Additional Medicare Tax (included in othertaxes and iitax)
     """
     line8 = max(0., sey) * (1. - 0.5 * (FICA_mc_trt_employer + FICA_mc_trt_employee + FICA_ss_trt_employer + FICA_ss_trt_employee))
     line11 = max(0., AMEDT_ec[MARS - 1] - e00200)
     ptax_amc = AMEDT_rt * (max(0., e00200 - AMEDT_ec[MARS - 1]) +
                            max(0., line8 - line11))
-    payrolltax += ptax_amc
-    return (ptax_amc, payrolltax)
+    return ptax_amc
 
 
 @iterate_jit(nopython=True)
@@ -3150,8 +3143,8 @@ def AdditionalCTC(codtc_limited, ACTC_c, n24, earned, ACTC_Income_thd,
 
 @iterate_jit(nopython=True)
 def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300,
-          c07400, c07600, c08000, e09700, e09800, e09900, niit, othertaxes,
-          c07100, c09200, odc, charity_credit,
+          c07400, c07600, c08000, e09700, e09800, e09900, niit, setax,
+          ptax_amc, othertaxes, c07100, c09200, odc, charity_credit,
           personal_nonrefundable_credit,
           CTC_is_refundable, ODC_is_refundable):
     """
@@ -3190,8 +3183,12 @@ def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300,
         Penalty tax on qualified retirement plans
     niit: float
         Net Investment Income Tax from Form 8960
+    setax: float
+        Self-employment tax
+    ptax_amc: float
+        Additional Medicare tax
     othertaxes: float
-        Sum of niit, e09700, e09800, and e09900
+        Sum of niit, setax, ptax_amc, e09700, e09800, and e09900
     c07100: float
         Total non-refundable credits used to reduce positive tax liability
     c09200: float
@@ -3221,7 +3218,7 @@ def C1040(c05800, c07180, c07200, c07220, c07230, c07240, c07260, c07300,
     # tax after credits (2016 Form 1040, line 56)
     tax_net_nonrefundable_credits = max(0., c05800 - c07100)
     # tax (including othertaxes) before refundable credits
-    othertaxes = e09700 + e09800 + e09900 + niit
+    othertaxes = e09700 + e09800 + e09900 + niit + setax + ptax_amc
     c09200 = othertaxes + tax_net_nonrefundable_credits
     return (c07100, othertaxes, c09200)
 

{taxcalc-4.3.2 → taxcalc-4.3.4}/taxcalc/policy.py

@@ -38,7 +38,7 @@ class Policy(Parameters):
     DEFAULTS_FILE_NAME = 'policy_current_law.json'
     DEFAULTS_FILE_PATH = os.path.abspath(os.path.dirname(__file__))
     JSON_START_YEAR = 2013  # remains the same unless earlier data added
-    LAST_KNOWN_YEAR = 2024  # last year for which indexed param vals are known
+    LAST_KNOWN_YEAR = 2025  # last year for which indexed param vals are known
     # should increase LAST_KNOWN_YEAR by one every calendar year
     LAST_BUDGET_YEAR = 2034  # last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year