Merge in recent changes on master branch

MANIFEST.in

@@ -7,5 +7,3 @@ include taxcalc/policy_current_law.json
 include taxcalc/puf_weights.csv.gz
 include taxcalc/puf_ratios.csv
 include taxcalc/records_variables.json
-include taxcalc/tmd_weights.csv.gz
-include taxcalc/tmd_growfactors.csv

Makefile

@@ -13,7 +13,7 @@ help:
 	@echo "clean      : remove .pyc files and local taxcalc package"
 	@echo "package    : build and install local package"
 	@echo "pytest-cps : generate report for and cleanup after"
-	@echo "             pytest -m 'not requires_pufcsv and not requires_tmdcsv and not pre_release'"
+	@echo "             pytest -m 'not requires_pufcsv and not pre_release'"
 	@echo "pytest     : generate report for and cleanup after"
 	@echo "             pytest -m 'not pre_release'"
 	@echo "pytest-all : generate report for and cleanup after"
@@ -51,7 +51,7 @@ endef
 .PHONY=pytest-cps
 pytest-cps:
 	@$(pytest-setup)
-	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m "not requires_pufcsv and not requires_tmdcsv and not pre_release"
+	@cd taxcalc ; pytest -n4 --disable-warnings --durations=0 --durations-min=2 -m "not requires_pufcsv and not pre_release"
 	@$(pytest-cleanup)
 
 .PHONY=pytest
@@ -103,7 +103,7 @@ define coverage-cleanup
 rm -f .coverage htmlcov/*
 endef
 
-COVMARK = "not requires_pufcsv and not requires_tmdcsv and not pre_release"
+COVMARK = "not requires_pufcsv and not pre_release"
 
 OS := $(shell uname -s)
 

codecov.yml

@@ -21,5 +21,6 @@ comment:
 
 ignore:
   - "setup.py"
+  - "update_pcl.py"
   - "ppp.py"
   - "extend_tcja.py"

docs/usage/data.md

@@ -61,13 +61,16 @@ file.
 
 The [tax-microdata
 repository](https://github.com/PSLmodels/tax-microdata-benchmarking)
-produces an input variables file (`tmd.csv`) and a
-`tmd_weights.csv.gz` file that is included in the Tax-Calculator
+produces an input variables file (`tmd.csv`), a national weights file
+(`tmd_weights.csv.gz`), and a variable growth factors file
+(`tmd_growfactors.csv`) that can be used with the Tax-Calculator
 package beginning with the 3.6.0 release.  The `tmd.csv` file is
 available only to Tax-Calculator users who have purchased their own
-version of the 2015 IRS-SOI PUF.  For those users, the
-`Records.tmd_constructor()` method creates a `Records` class object
-containing the `tmd` variables and weights.
+version of the 2015 IRS-SOI PUF.  For those users, those three files
+are avaiable from the tax-microdata repository.  These three tmd files
+can be used with the Tax-Calculator Python API (using the 
+`Records.tmd_constructor()` static method) or with the Tax-Calculator
+CLI tool, `tc`.
 
 ## Using other data with Tax-Calculator
 

pytest.ini

@@ -3,7 +3,6 @@ testpaths =
     taxcalc
 markers =
     requires_pufcsv
-    requires_tmdcsv
     pre_release
     compatible_data
     local

taxcalc.egg-info/SOURCES.txt

@@ -121,8 +121,6 @@ taxcalc/puf_weights.csv.gz
 taxcalc/records.py
 taxcalc/records_variables.json
 taxcalc/taxcalcio.py
-taxcalc/tmd_growfactors.csv
-taxcalc/tmd_weights.csv.gz
 taxcalc/utils.py
 taxcalc/utilsprvt.py
 taxcalc.egg-info/PKG-INFO
@@ -173,8 +171,6 @@ 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
@@ -214,7 +210,6 @@ 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/policy.py

@@ -37,7 +37,7 @@ class instance: Policy
     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 = 2022  # last year for which indexed param vals are known
+    LAST_KNOWN_YEAR = 2023  # last year for which indexed param vals are known
     # should increase LAST_KNOWN_YEAR by one every calendar year
     LAST_BUDGET_YEAR = 2074  # last extrapolation year
     # should increase LAST_BUDGET_YEAR by one every calendar year