taxcalc 5.2.0__py3-none-any.whl → 5.3.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (42) hide show
  1. taxcalc/__init__.py +3 -3
  2. taxcalc/calcfunctions.py +2 -2
  3. taxcalc/calculator.py +3 -3
  4. taxcalc/cli/tc.py +15 -11
  5. taxcalc/data.py +1 -1
  6. taxcalc/decorators.py +9 -8
  7. taxcalc/growfactors.py +2 -1
  8. taxcalc/policy.py +6 -5
  9. taxcalc/policy_current_law.json +31 -631
  10. taxcalc/puf_ratios.csv +24 -24
  11. taxcalc/puf_weights.csv.gz +0 -0
  12. taxcalc/reforms/ARPA.out.csv +9 -9
  13. taxcalc/taxcalcio.py +41 -26
  14. taxcalc/tests/conftest.py +1 -1
  15. taxcalc/tests/puf_var_correl_coeffs_2016.csv +24 -24
  16. taxcalc/tests/puf_var_wght_means_by_year.csv +11 -11
  17. taxcalc/tests/pufcsv_agg_expect.csv +20 -20
  18. taxcalc/tests/pufcsv_mtr_expect.txt +21 -21
  19. taxcalc/tests/reforms.json +3 -1
  20. taxcalc/tests/reforms_expect.csv +48 -48
  21. taxcalc/tests/test_4package.py +8 -9
  22. taxcalc/tests/test_calculator.py +151 -151
  23. taxcalc/tests/test_compare.py +2 -2
  24. taxcalc/tests/test_consumption.py +2 -2
  25. taxcalc/tests/test_cpscsv.py +2 -2
  26. taxcalc/tests/test_decorators.py +57 -52
  27. taxcalc/tests/test_growdiff.py +2 -2
  28. taxcalc/tests/test_parameters.py +59 -53
  29. taxcalc/tests/test_policy.py +154 -154
  30. taxcalc/tests/test_puf_var_stats.py +1 -1
  31. taxcalc/tests/test_pufcsv.py +3 -3
  32. taxcalc/tests/test_records.py +5 -1
  33. taxcalc/tests/test_reforms.py +101 -99
  34. taxcalc/tests/test_taxcalcio.py +10 -4
  35. taxcalc/utils.py +3 -3
  36. {taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/METADATA +3 -6
  37. {taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/RECORD +41 -42
  38. taxcalc/reforms/clp.out.csv +0 -10
  39. {taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/WHEEL +0 -0
  40. {taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/entry_points.txt +0 -0
  41. {taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/licenses/LICENSE +0 -0
  42. {taxcalc-5.2.0.dist-info → taxcalc-5.3.0.dist-info}/top_level.txt +0 -0
taxcalc/tests/pufcsv_mtr_expect.txt CHANGED
@@ -5,59 +5,59 @@ PTAX mtr histogram bin edges:
5
5
  ITAX mtr histogram bin edges:
6
6
  [-1.0, -0.3, -0.2, -0.1, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 1.0]
7
7
  PTAX and ITAX mtr histogram bin counts for e00200p:
8
- 252868 : 0 27604 0 0 0 0 0 225264 0 0
9
- 252868 : 7375 73 2056 13084 45744 76630 50857 31265 25017 767
8
+ 252868 : 0 27589 0 0 0 0 0 225279 0 0
9
+ 252868 : 7375 73 2056 13092 45752 76594 50874 31261 25021 770
10
10
  PTAX and ITAX mtr histogram bin counts for e00200s:
11
- 119177 : 0 19575 0 0 0 0 0 99602 0 0
12
- 119177 : 1449 22 793 2752 11456 31297 26219 22344 22285 560
11
+ 119177 : 0 19601 0 0 0 0 0 99576 0 0
12
+ 119177 : 1449 22 792 2760 11456 31293 26220 22338 22285 562
13
13
  PTAX and ITAX mtr histogram bin counts for e00900p:
14
14
  252868 : 252868 0 0 0 0 0 0 0 0 0
15
- 252868 : 6835 305 1552 11855 42865 71246 52250 30592 31272 4096
15
+ 252868 : 6835 305 1552 11868 42851 71250 52249 30574 31283 4101
16
16
  PTAX and ITAX mtr histogram bin counts for e00300:
17
17
  252868 : 252868 0 0 0 0 0 0 0 0 0
18
- 252868 : 0 0 0 0 67629 76854 46561 31869 29137 818
18
+ 252868 : 0 0 0 0 67638 76842 46566 31860 29142 820
19
19
  PTAX and ITAX mtr histogram bin counts for e00400:
20
20
  252868 : 252868 0 0 0 0 0 0 0 0 0
21
- 252868 : 0 0 0 0 249271 3332 262 3 0 0
21
+ 252868 : 0 0 0 0 249270 3332 264 2 0 0
22
22
  PTAX and ITAX mtr histogram bin counts for e00600:
23
23
  252868 : 252868 0 0 0 0 0 0 0 0 0
24
- 252868 : 0 0 0 0 67629 76854 46561 31869 29137 818
24
+ 252868 : 0 0 0 0 67638 76842 46566 31860 29142 820
25
25
  PTAX and ITAX mtr histogram bin counts for e00650:
26
26
  252868 : 252868 0 0 0 0 0 0 0 0 0
27
- 252868 : 0 0 5 62 145112 46819 59773 658 412 27
27
+ 252868 : 0 0 5 62 145111 46818 59777 655 414 26
28
28
  PTAX and ITAX mtr histogram bin counts for e01400:
29
29
  252868 : 252868 0 0 0 0 0 0 0 0 0
30
- 252868 : 0 0 0 0 67630 76881 50252 32349 24978 778
30
+ 252868 : 0 0 0 0 67639 76869 50256 32344 24980 780
31
31
  PTAX and ITAX mtr histogram bin counts for e01700:
32
32
  252868 : 252868 0 0 0 0 0 0 0 0 0
33
- 252868 : 0 0 0 0 67630 76881 50252 32349 24978 778
33
+ 252868 : 0 0 0 0 67639 76869 50256 32344 24980 780
34
34
  PTAX and ITAX mtr histogram bin counts for e02000:
35
35
  252868 : 252868 0 0 0 0 0 0 0 0 0
36
- 252868 : 0 0 0 0 67629 76854 46561 31869 29137 818
36
+ 252868 : 0 0 0 0 67638 76842 46566 31860 29142 820
37
37
  PTAX and ITAX mtr histogram bin counts for e02400:
38
38
  252868 : 252868 0 0 0 0 0 0 0 0 0
39
- 252868 : 0 0 0 0 114130 44782 59366 33592 965 33
39
+ 252868 : 0 0 0 0 114131 44785 59359 33593 967 33
40
40
  PTAX and ITAX mtr histogram bin counts for p22250:
41
41
  252868 : 252868 0 0 0 0 0 0 0 0 0
42
- 252868 : 0 0 1 1 79195 76757 53030 24966 18408 510
42
+ 252868 : 0 0 1 1 79203 76747 53033 24962 18409 512
43
43
  PTAX and ITAX mtr histogram bin counts for p23250:
44
44
  252868 : 252868 0 0 0 0 0 0 0 0 0
45
- 252868 : 0 0 1 48 152420 43642 51311 2837 2560 49
45
+ 252868 : 0 0 1 48 152419 43642 51315 2833 2562 48
46
46
  PTAX and ITAX mtr histogram bin counts for e18500:
47
47
  252868 : 252868 0 0 0 0 0 0 0 0 0
48
- 252868 : 25489 25944 19603 7736 174096 0 0 0 0 0
48
+ 252868 : 25486 25946 19626 7738 174072 0 0 0 0 0
49
49
  PTAX and ITAX mtr histogram bin counts for e19200:
50
50
  252868 : 252868 0 0 0 0 0 0 0 0 0
51
- 252868 : 39723 32895 19901 4939 155410 0 0 0 0 0
51
+ 252868 : 39721 32896 19923 4941 155387 0 0 0 0 0
52
52
  PTAX and ITAX mtr histogram bin counts for e26270:
53
53
  252868 : 252868 0 0 0 0 0 0 0 0 0
54
- 252868 : 0 0 0 0 67630 76881 50252 32349 24978 778
54
+ 252868 : 0 0 0 0 67639 76869 50256 32344 24980 780
55
55
  PTAX and ITAX mtr histogram bin counts for e19800:
56
56
  252868 : 252868 0 0 0 0 0 0 0 0 0
57
- 252868 : 39575 32461 19826 4910 156096 0 0 0 0 0
57
+ 252868 : 39573 32462 19847 4913 156073 0 0 0 0 0
58
58
  PTAX and ITAX mtr histogram bin counts for e20100:
59
59
  252868 : 252868 0 0 0 0 0 0 0 0 0
60
- 252868 : 39490 32426 19767 4904 156281 0 0 0 0 0
60
+ 252868 : 39488 32427 19788 4907 156258 0 0 0 0 0
61
61
  PTAX and ITAX mtr histogram bin counts for k1bx14p:
62
62
  252868 : 252868 0 0 0 0 0 0 0 0 0
63
- 252868 : 6835 305 1552 11855 42865 71246 52250 30592 31272 4096
63
+ 252868 : 6835 305 1552 11868 42851 71250 52249 30574 31283 4101
taxcalc/tests/reforms.json CHANGED
@@ -504,7 +504,9 @@
504
504
  "start_year": 2017,
505
505
  "value": {"FST_AGI_trt": 0.3,
506
506
  "FST_AGI_thd_lo": [1.0e6, 1.0e6, 0.5e6, 1.0e6, 1.0e6],
507
- "FST_AGI_thd_hi": [2.0e6, 2.0e6, 1.0e6, 2.0e6, 2.0e6]},
507
+ "FST_AGI_thd_lo-indexed": true,
508
+ "FST_AGI_thd_hi": [2.0e6, 2.0e6, 1.0e6, 2.0e6, 2.0e6],
509
+ "FST_AGI_thd_hi-indexed": true},
508
510
  "name": "Increase FST rate from zero to 0.30 beginning in 2017",
509
511
  "output_type": "iitax",
510
512
  "compare_with": {"Tax Foundation": [321, "ten-year(2016-25)",
taxcalc/tests/reforms_expect.csv CHANGED
@@ -1,61 +1,61 @@
1
1
  rid,res1,res2,res3,res4
2
- 1,60.8,61.9,64.9,67.6
3
- 2,50.4,54.6,49.5,57.2
4
- 3,73.3,74.5,78.4,82.2
2
+ 1,62.1,63.1,66.2,68.9
3
+ 2,54.2,58.6,53.5,62.0
4
+ 3,75.1,76.2,80.3,84.3
5
5
  4,0.0,0.0,0.0,0.0
6
6
  5,0.0,0.0,0.0,0.0
7
- 6,37.9,37.8,39.4,40.7
8
- 7,7.2,7.4,7.5,7.9
9
- 8,1.9,1.9,2.1,2.2
10
- 9,3.8,3.8,4.2,4.6
11
- 10,6.7,7.1,7.4,7.7
12
- 11,3.1,3.3,3.6,3.8
7
+ 6,38.4,39.2,40.0,41.0
8
+ 7,9.8,9.9,10.5,11.0
9
+ 8,1.9,2.0,2.1,2.2
10
+ 9,4.4,4.3,4.9,5.3
11
+ 10,8.2,8.6,9.1,9.5
12
+ 11,2.4,2.7,2.6,2.8
13
13
  12,0.1,0.1,0.1,0.1
14
- 13,-33.2,-32.0,-34.7,-36.1
14
+ 13,-33.5,-32.1,-35.0,-36.5
15
15
  14,-0.1,-0.1,-0.1,-0.1
16
- 15,0.1,0.1,0.1,0.2
16
+ 15,0.2,0.2,0.2,0.3
17
17
  16,-1.0,-1.0,-1.5,-1.6
18
18
  17,-0.2,-0.2,-0.3,-0.3
19
- 18,33.4,34.7,37.1,39.3
20
- 19,63.8,65.5,70.8,76.0
21
- 20,97.9,101.5,109.4,115.8
22
- 21,65.9,67.8,72.8,76.8
23
- 22,9.7,10.3,10.6,11.2
24
- 23,0.5,0.6,0.6,0.6
25
- 24,50.4,52.6,55.8,59.3
26
- 25,1.9,2.0,2.1,2.2
19
+ 18,35.8,37.3,40.2,42.5
20
+ 19,68.2,69.9,75.1,80.2
21
+ 20,103.3,106.9,116.1,122.6
22
+ 21,68.7,70.7,76.4,80.6
23
+ 22,9.6,11.0,10.0,10.3
24
+ 23,0.3,0.3,0.3,0.4
25
+ 24,52.5,54.2,57.2,60.3
26
+ 25,2.0,2.1,2.2,2.3
27
27
  26,0.1,0.1,0.1,0.1
28
- 27,0.1,0.1,0.1,0.1
29
- 28,3.8,3.7,4.2,4.6
30
- 29,14.7,13.3,17.2,18.6
31
- 30,-6.6,-6.4,-1.6,-1.6
32
- 31,57.4,57.9,61.8,65.4
33
- 32,12.0,11.5,13.3,14.4
34
- 33,7.5,7.1,8.3,9.0
35
- 34,-1.2,-0.9,-1.5,-1.6
36
- 35,-2.9,-2.8,-3.5,-3.7
37
- 36,3.1,3.2,3.6,3.9
38
- 37,29.8,30.9,34.1,36.2
39
- 38,9.2,9.6,10.5,11.3
40
- 39,-0.6,-0.5,-0.7,-0.7
41
- 40,54.0,52.3,51.2,50.2
42
- 41,0.5,0.6,0.6,0.6
28
+ 27,0.2,0.2,0.2,0.2
29
+ 28,4.0,3.8,4.5,4.9
30
+ 29,15.2,13.8,17.9,19.4
31
+ 30,-6.4,-6.2,-1.6,-1.6
32
+ 31,58.2,58.6,62.5,66.3
33
+ 32,12.6,12.1,14.0,15.1
34
+ 33,7.6,7.1,8.4,9.1
35
+ 34,-1.3,-0.9,-1.5,-1.6
36
+ 35,-2.9,-2.8,-3.4,-3.5
37
+ 36,3.2,3.3,3.6,3.9
38
+ 37,30.9,32.0,35.4,37.3
39
+ 38,9.7,10.0,11.2,11.8
40
+ 39,-0.6,-0.6,-0.7,-0.7
41
+ 40,56.0,53.5,52.7,51.9
42
+ 41,0.6,0.6,0.7,0.7
43
43
  42,-0.2,-0.2,-0.2,-0.2
44
- 43,70.6,68.8,67.9,69.4
45
- 44,1.2,1.1,1.1,1.2
46
- 45,-2.1,-2.0,-2.2,-2.2
47
- 46,-2.1,-1.8,-2.1,-2.2
44
+ 43,71.8,68.8,67.6,69.4
45
+ 44,1.1,1.1,1.1,1.2
46
+ 45,-2.1,-2.0,-2.1,-2.2
47
+ 46,-2.0,-1.7,-2.0,-2.1
48
48
  47,-0.8,-0.8,-0.8,-0.7
49
49
  48,-0.0,-0.0,-0.0,-0.0
50
- 49,-26.5,-23.7,-31.1,-33.9
51
- 50,-0.3,-0.3,-0.5,-0.5
50
+ 49,-27.2,-24.3,-31.9,-34.8
51
+ 50,-0.4,-0.4,-0.4,-0.4
52
52
  51,-187.0,-187.5,-193.6,-201.6
53
- 52,-130.0,-129.3,-132.7,-137.7
54
- 53,30.7,33.2,31.4,41.0
53
+ 52,-129.1,-128.5,-131.9,-136.9
54
+ 53,31.6,34.1,32.5,42.1
55
55
  54,0.0,0.0,0.0,0.0
56
- 55,-66.9,-66.9,-67.0,-67.1
57
- 56,-67.3,-67.2,-67.3,-67.4
58
- 57,-1.0,-0.6,-0.8,-1.7
59
- 58,-17.4,-18.0,-24.3,-20.0
60
- 59,-12.7,-13.0,-23.4,-13.8
61
- 60,-46.9,-48.1,-49.2,-52.0
56
+ 55,-68.2,-68.4,-68.7,-68.7
57
+ 56,-68.8,-68.9,-69.2,-69.2
58
+ 57,1.4,1.7,1.7,1.4
59
+ 58,-16.8,-17.4,-23.7,-19.2
60
+ 59,-12.2,-12.2,-21.2,-13.3
61
+ 60,-46.9,-48.1,-49.3,-52.1
taxcalc/tests/test_4package.py CHANGED
@@ -66,9 +66,9 @@ def test_for_consistency(tests_path):
66
66
  'pycodestyle',
67
67
  'pylint',
68
68
  'coverage',
69
- "pip",
70
- "jupyter-book",
71
- "setuptools"
69
+ 'pip',
70
+ 'jupyter-book',
71
+ 'setuptools'
72
72
  ])
73
73
  # read conda.recipe/meta.yaml requirements
74
74
  meta_file = os.path.join(tests_path, '..', '..',
@@ -86,10 +86,10 @@ def test_for_consistency(tests_path):
86
86
  envr = yaml.safe_load(stream)
87
87
 
88
88
  env = []
89
- for dep in envr["dependencies"]:
89
+ for dep in envr['dependencies']:
90
90
  if isinstance(dep, dict):
91
- assert list(dep.keys()) == ["pip"]
92
- env += dep["pip"]
91
+ assert list(dep.keys()) == ['pip']
92
+ env += dep['pip']
93
93
  else:
94
94
  env.append(dep)
95
95
  env = set(env)
@@ -102,9 +102,8 @@ def test_for_consistency(tests_path):
102
102
  with open(setup_file, 'r', encoding='utf-8') as f:
103
103
  setup_py_content = f.read()
104
104
  setup = set(extract_install_requires(setup_py_content))
105
- # confirm that setup.py
106
- print("Setup packages = ", setup)
107
- print("Meta packages = ", bld)
105
+ print('Setup packages = ', setup)
106
+ print('Meta packages = ', bld)
108
107
  # if package in both, confirm that the version is the same
109
108
  for pkg in setup.intersection(bld):
110
109
  assert pkg in setup