Propagate 328 (JHU population fix and function refactor) to main #398
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* use geocode utility source file and remove old static source file * update tests * update validation notebook to verify prop signals in NYC
Fix JHU's fips-population source file
* unnecessary int type casting of population * add dropna flag and default it to a left merge
* drop XX000 FIPS when aggregating to state * refactor pull.py - encapsulate into functions, clarify the diffing code with pandas built-ins, use geomapper for population * remove unused static_file_dir param * improve test all around, add a subset of real JHU data as test file * tests: check for infinites, check to make sure the prop signals denominator matches the county sum total
Drop reference to absent list of exceptions
Fix JHU prop signal
* change add_population_column signature back to how it was * fix bug with dropna flag in same function being interpreted backwards * get tests to match * change usage of this function in JHU
Fix geomapper add_population_column function
|
Oops, meant to find a way to see the conflicts instead of that. |
|
Checked out the conflict. The incoming change is the correct one, the rest was refactored into functions. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.