Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync v4_development branch to master #2749

Merged
merged 64 commits into from
May 20, 2024
Merged

Sync v4_development branch to master #2749

merged 64 commits into from
May 20, 2024

Conversation

jdebacker
Copy link
Member

This PR brings the latest changes to the master branch down to the v4_development branch

github-actions and others added 30 commits April 15, 2024 21:57
Update test benchmark 2024-04-15
d5e5e9d
@martinholmer
Add capability to handle tmd.csv input file
6dc7b7a
@martinholmer
Add nocover codecov pragmas to tmd statements in two modules
c1ecae6
@martinholmer
Add tmd_weights.csv.gz to MANIFEST.in
81472e8
@martinholmer
Add taxcalc/tmd_weights.csv.gz file
bb0132c
@martinholmer
Fix use of Records.tmd_constructor static function
87aecb7
@martinholmer
Revise tmd_weights.csv.gz to include integer scaled weight values
1c6ec0d
@martinholmer
Install more-precise weights
975b5a4
@martinholmer
Simplify Records.tmd_construction static function logic
7ffa774
@martinholmer
Install new tmd weights and growfactors files
b3ccad7
@martinholmer
Add using_tmd arguments to grow-related constructors
f84f9fa
@martinholmer
Simplify GrowFactors contructor
fab6bd6
@martinholmer
Add using_tmd argument to GrowDiff constructor
0e4f8e5
@martinholmer
More revisions to growfactors.py and growdiff.py code
6b60ef7
@martinholmer
Revise test_growfactors.py to reflect new constructor argument
1b027d8
@martinholmer
Rollback recent growfactors/growdiff changes on this branch
536142f
@martinholmer
Install new thru-2034 tmd_weights.csv.gz and growfactors.csv files
012ee76
@martinholmer
Fix typos in growfactors.py
da99dde
@martinholmer
Install thru-2074 growfactors and tmd_weights; make params go thru 2074
01a8d71
@martinholmer
Fix two test failures
37304b8
@martinholmer
Revise some policy tests to make them execute faster
8c0eed3
@martinholmer
Disable pytest_sessionfinish in tests/conftest.py
3076408
@martinholmer
Fix typo in test_puf_var_stats.py
9dce222
@martinholmer
Fix typo in test_policy.py
6053d49
@martinholmer
Add custom marks to pytest.ini
9088a1e
@martinholmer
Make environment.yml requirements consistent with conda.recipe/meta.yaml
b583be6
@martinholmer
Merge in recent changes on master branch
1cd7e3d
@martinholmer
Streamline pytest test timing logic
d53fd3e
@martinholmer
Merge branch 'martinholmer-add-tmd'
41eda40
@martinholmer
Reorder markers in pytest.ini file
b1cd909
martinholmer and others added 29 commits May 7, 2024 11:32
@martinholmer
Remove obsolete taxcalc/tests/test_stats_benchmark.csv file
f215b09
@martinholmer
Add back the test_stats_benchmark.csv file
6a869c6
@jdebacker
Merge pull request #2740 from martinholmer/add-tmd
e899e7a 
Add capability to handle tmd input
@martinholmer
Merge remote-tracking branch 'upstream/master'
d4c6485
@martinholmer
Fix pandas deprecation warnings in test_utils.py
10c4d67
@martinholmer
Fix pandas deprecation warnings in utils.py
9c54394
@martinholmer
Fix pandas deprecation warnings in taxcalcio.py
b8208e1
@martinholmer
Fix pandas deprecation warnings in utils.py and taxcalcio.py
f14b89b
@martinholmer
Fix index order in growfactors.py
a3375bb
@martinholmer
Replace pkg_resources with importlib.resources in utils.py
07e7e01
@martinholmer
Simplify environment and remove caps on numpy and pandas packages
93a1491
@martinholmer
Remove cap on bokeh package version
66ce3d6
@martinholmer
Use only bokeh.plotting package
aae2bf4
@martinholmer
Revise PrintTickFormatter format string
0266d85
@martinholmer
Revise handling of CLI pch graph
7bc95db
@martinholmer
Change order of writing graphs in taxcalcio.py module
e488de5
@martinholmer
Merge pull request #2743 from martinholmer/pytest-warnings
4df16eb 
Fix pytest warnings
@jdebacker
fix benchmark conflicts
d3a8d30
@jdebacker
update releases
89f8bc7
@jdebacker
update version number
583176e
@martinholmer
Update taxcalc/tmd_weights.csv.gz
5333d6d
@martinholmer
Merge pull request #2744 from martinholmer/update-tmd_weights
fe26399 
Update taxcalc/tmd_weights.csv.gz file
@martinholmer
Update docs/usage/data.md documentation
addc27d
@martinholmer
Merge pull request #2745 from martinholmer/revise-data-doc
48c8354 
Update docs/usage/data.md documentation
@jdebacker
Merge remote-tracking branch 'upstream/master' into 3-6-0
6026e2b
@jdebacker
update package version
2433dca
@jdebacker
Merge pull request #2746 from jdebacker/3-6-0
caa739f 
Prepares version 3.6.0
@martinholmer
Remove obsolete taxcalc/tests/test_stats_benchmark.csv file
f9c0e0b
@martinholmer
Merge pull request #2747 from martinholmer/rm-test-timings-file
dd98341 
Remove obsolete taxcalc/tests/test_stats_benchmark.csv file
@jdebacker jdebacker merged commit 9560083 into v4_development May 20, 2024
11 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jdebacker @martinholmer