diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 3d335ee14..60028ed73 100755 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -12,8 +12,7 @@ requirements: - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" - - "marshmallow<3.22" # to work around paramtools bug - - "paramtools>=0.18.2" # requires marshmallow>=3.0 + - "paramtools>=0.18.3" - numba - curl - openpyxl @@ -24,8 +23,7 @@ requirements: - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" - - "marshmallow<3.22" # to work around paramtools bug - - "paramtools>=0.18.2" # requires marshmallow>=3.0 + - "paramtools>=0.18.3" - numba - curl - openpyxl diff --git a/environment.yml b/environment.yml index bf9bf569e..e848d0284 100644 --- a/environment.yml +++ b/environment.yml @@ -6,8 +6,6 @@ dependencies: - "numpy>=1.26,<1.27" - "pandas>=2.2" - "bokeh>=2.4" -- "marshmallow<3.22" # to work around paramtools bug -- "paramtools>=0.18.2" # requires marshmallow>=3.0 - numba - curl - pytest @@ -20,3 +18,4 @@ dependencies: - pip - pip: - jupyter-book + - "paramtools>=0.18.3" diff --git a/setup.py b/setup.py index c5226a8ae..3147899bd 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ "bokeh", "numba", "requests", - "paramtools", + "paramtools>=0.18.3", ], "classifiers": [ "Development Status :: 4 - Beta", diff --git a/taxcalc.egg-info/PKG-INFO b/taxcalc.egg-info/PKG-INFO index fe2a5d517..ca46bf73d 100644 --- a/taxcalc.egg-info/PKG-INFO +++ b/taxcalc.egg-info/PKG-INFO @@ -19,13 +19,6 @@ Classifier: Programming Language :: Python :: 3.12 Classifier: Topic :: Software Development :: Libraries :: Python Modules Description-Content-Type: text/markdown License-File: LICENSE -Requires-Dist: setuptools -Requires-Dist: numpy -Requires-Dist: pandas -Requires-Dist: bokeh -Requires-Dist: numba -Requires-Dist: requests -Requires-Dist: paramtools | | | | --- | --- | diff --git a/taxcalc.egg-info/SOURCES.txt b/taxcalc.egg-info/SOURCES.txt index b9685d567..1d6021c0a 100644 --- a/taxcalc.egg-info/SOURCES.txt +++ b/taxcalc.egg-info/SOURCES.txt @@ -1,7 +1,104 @@ +.coveragerc +.gitignore LICENSE MANIFEST.in +Makefile +PSL_catalog.json README.md +codecov.yml +csv_show.sh +csv_vars.sh +environment.yml +extend_tcja.py +gitpr +gitpr.bat +gitsync +gitsync.bat +ppp.py +pytest.ini setup.py +tctest-nojit.sh +.github/FUNDING.yml +.github/workflows/build_and_test.yml +.github/workflows/check_jupyterbook.yml +.github/workflows/deploy_jupyterbook.yml +.github/workflows/deploy_parameters_docs.yml +conda.recipe/bld.bat +conda.recipe/build.sh +conda.recipe/meta.yaml +docs/PSL.svg +docs/_config.yml +docs/_toc.yml +docs/index.md +docs/use_cases.md +docs/_static/atr.png +docs/_static/mtr.png +docs/_static/pch.png +docs/about/LICENSE.md +docs/about/history.md +docs/about/releases.md +docs/about/roadmap.md +docs/api/calcfunctions.rst +docs/api/calculator.rst +docs/api/consumption.rst +docs/api/data.rst +docs/api/decorators.rst +docs/api/growdiff.rst +docs/api/growfactors.rst +docs/api/parameters.rst +docs/api/policy.rst +docs/api/public_api.rst +docs/api/records.rst +docs/api/taxcalcio.rst +docs/api/utils.rst +docs/api/utilsprvt.rst +docs/contributing/RELEASING.md +docs/contributing/contributor_guide.md +docs/contributing/dependencies.md +docs/contributing/param_naming.md +docs/contributing/pr_workflow.md +docs/contributing/testing.md +docs/guide/README.md +docs/guide/assumption_params.md +docs/guide/cli.md +docs/guide/index.md +docs/guide/input_vars.md +docs/guide/output_vars.md +docs/guide/policy_params.md +docs/guide/python_interface.md +docs/guide/make/make_io_vars.py +docs/guide/make/make_params.py +docs/guide/make/make_uguide.py +docs/guide/templates/assumption_params_template.md +docs/guide/templates/input_vars_template.md +docs/guide/templates/output_vars_template.md +docs/guide/templates/policy_params_template.md +docs/recipes/README.md +docs/recipes/convert_all.sh +docs/recipes/index.md +docs/recipes/recipe00.ipynb +docs/recipes/recipe01.ipynb +docs/recipes/recipe02.ipynb +docs/recipes/recipe03.ipynb +docs/recipes/recipe04.ipynb +docs/recipes/recipe04_pandas.ipynb +docs/recipes/recipe05.ipynb +docs/recipes/recipe06.ipynb +docs/recipes/_static/reformA.json +docs/recipes/_static/reformB.json +docs/recipes/_static/reformC.json +docs/recipes/md_src/recipe00.md +docs/recipes/md_src/recipe01.md +docs/recipes/md_src/recipe02.md +docs/recipes/md_src/recipe03.md +docs/recipes/md_src/recipe04.md +docs/recipes/md_src/recipe04_pandas.md +docs/recipes/md_src/recipe05.md +docs/recipes/md_src/recipe06.md +docs/usage/data.md +docs/usage/overview.md +docs/usage/starting.md +docs/usage/tcja_after_2025.md taxcalc/__init__.py taxcalc/calcfunctions.py taxcalc/calculator.py @@ -34,5 +131,115 @@ taxcalc.egg-info/dependency_links.txt taxcalc.egg-info/entry_points.txt taxcalc.egg-info/requires.txt taxcalc.egg-info/top_level.txt +taxcalc/assumptions/ASSUMPTIONS.md +taxcalc/assumptions/README.md +taxcalc/assumptions/economic_assumptions_template.json taxcalc/cli/__init__.py -taxcalc/cli/tc.py \ No newline at end of file +taxcalc/cli/tc.py +taxcalc/reforms/2017_law.json +taxcalc/reforms/2017_law.out.csv +taxcalc/reforms/ARPA.json +taxcalc/reforms/ARPA.out.csv +taxcalc/reforms/BrownKhanna.json +taxcalc/reforms/BrownKhanna.out.csv +taxcalc/reforms/CARES.json +taxcalc/reforms/CARES.out.csv +taxcalc/reforms/ConsolidatedAppropriationsAct2021.json +taxcalc/reforms/ConsolidatedAppropriationsAct2021.out.csv +taxcalc/reforms/Larson2019.json +taxcalc/reforms/Larson2019.out.csv +taxcalc/reforms/README.md +taxcalc/reforms/REFORMS.md +taxcalc/reforms/Renacci.json +taxcalc/reforms/Renacci.out.csv +taxcalc/reforms/SandersDeFazio.json +taxcalc/reforms/SandersDeFazio.out.csv +taxcalc/reforms/TCJA.json +taxcalc/reforms/TCJA.md +taxcalc/reforms/TCJA.out.csv +taxcalc/reforms/Trump2016.json +taxcalc/reforms/Trump2016.out.csv +taxcalc/reforms/Trump2017.json +taxcalc/reforms/Trump2017.out.csv +taxcalc/reforms/cases.csv +taxcalc/reforms/clp.out.csv +taxcalc/reforms/ext.json +taxcalc/reforms/growfactors_ext.csv +taxcalc/reforms/ptaxes0.json +taxcalc/reforms/ptaxes0.out.csv +taxcalc/reforms/ptaxes1.json +taxcalc/reforms/ptaxes1.out.csv +taxcalc/reforms/ptaxes2.json +taxcalc/reforms/ptaxes2.out.csv +taxcalc/reforms/ptaxes3.json +taxcalc/reforms/ptaxes3.out.csv +taxcalc/reforms/rounding2022.json +taxcalc/reforms/rounding2022.out.csv +taxcalc/reforms/archive/Clinton2016.json +taxcalc/reforms/archive/RyanBrady.json +taxcalc/reforms/archive/TCJA_House.json +taxcalc/reforms/archive/TCJA_House_Amended.json +taxcalc/reforms/archive/TCJA_Reconciliation.json +taxcalc/reforms/archive/TCJA_Senate.json +taxcalc/reforms/archive/TCJA_Senate_111417.json +taxcalc/reforms/archive/TCJA_Senate_120117.json +taxcalc/tests/benefits_expect.csv +taxcalc/tests/cmpi_cps_expect.txt +taxcalc/tests/cmpi_puf_expect.txt +taxcalc/tests/conftest.py +taxcalc/tests/cpscsv_agg_expect.csv +taxcalc/tests/puf_var_correl_coeffs_2016.csv +taxcalc/tests/puf_var_wght_means_by_year.csv +taxcalc/tests/pufcsv_agg_expect.csv +taxcalc/tests/pufcsv_mtr_expect.txt +taxcalc/tests/reforms.json +taxcalc/tests/reforms_expect.csv +taxcalc/tests/test_4package.py +taxcalc/tests/test_benefits.py +taxcalc/tests/test_calcfunctions.py +taxcalc/tests/test_calculator.py +taxcalc/tests/test_compare.py +taxcalc/tests/test_compatible_data.py +taxcalc/tests/test_consumption.py +taxcalc/tests/test_cpscsv.py +taxcalc/tests/test_data.py +taxcalc/tests/test_decorators.py +taxcalc/tests/test_growdiff.py +taxcalc/tests/test_growfactors.py +taxcalc/tests/test_parameters.py +taxcalc/tests/test_policy.py +taxcalc/tests/test_puf_var_stats.py +taxcalc/tests/test_pufcsv.py +taxcalc/tests/test_records.py +taxcalc/tests/test_reforms.py +taxcalc/tests/test_responses.py +taxcalc/tests/test_taxcalcio.py +taxcalc/tests/test_tmdcsv.py +taxcalc/tests/test_utils.py +taxcalc/validation/CSV_INPUT_VARS.md +taxcalc/validation/CSV_OUTPUT_VARS.md +taxcalc/validation/README.md +taxcalc/validation/tests_35.sh +taxcalc/validation/taxsim35/Differences_Explained.md +taxcalc/validation/taxsim35/README.md +taxcalc/validation/taxsim35/input_setup.py +taxcalc/validation/taxsim35/main_comparison.py +taxcalc/validation/taxsim35/prepare_taxcalc_input.py +taxcalc/validation/taxsim35/process_taxcalc_output.py +taxcalc/validation/taxsim35/taxsim_emulation.json +taxcalc/validation/taxsim35/taxsim_input.py +taxcalc/validation/taxsim35/tc_sims.py +taxcalc/validation/taxsim35/tests_35.py +taxcalc/validation/taxsim35/expected_differences/a17-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a18-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a19-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a20-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/a21-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b17-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b18-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b19-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b20-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/b21-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/c17-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/c18-taxdiffs-expect.csv +taxcalc/validation/taxsim35/expected_differences/c19-taxdiffs-expect.csv \ No newline at end of file