Commit graph

726 commits

Author SHA1 Message Date
lucasmbrown-usds
0b87617422 fix url 2022-10-20 11:57:42 -04:00
lucasmbrown-usds
f1387b7499 updating data source url 2022-10-20 11:48:51 -04:00
lucasmbrown-usds
f467d7811a updating URLs 2022-10-20 11:37:39 -04:00
Matt Bowen
841a26d566
Remove suffixes from tribal lands (#1974) (#2008) 2022-10-13 16:20:28 -04:00
Matt Bowen
743d3ce37c
Add assertions around codebook (#2014)
* Add assertion around codebook (#1505)

* Assert csv and excel have same cols (#1505)
2022-10-13 16:20:04 -04:00
Matt Bowen
8b611edae6
Make tribal overlap set score N (#2004)
* Add "Is a Tribal DAC" field (#1998)

* Add tribal DACs to score N final (#1998)

* Add new fields to downloads (#1998)

* Make a int a float (#1998)

* Update field names, apply feedback (#1998)
2022-10-12 14:59:23 -04:00
Jorge Escobar
d89c516131
Hotfix for DOT data source DNS issue (#1999) 2022-10-07 14:41:41 -04:00
Lucas Merrill Brown
e2641fe2a6
Issue 1992: Do not impute income for null population tracts (#1993) 2022-10-07 11:28:11 -04:00
Matt Bowen
72de938c32
Fixup TA_COUNT and TA_PERC (#1991)
* Change TA_PERC, change TA_COUNT (#1988, #1989)

- Make TA_PERC_STR back into a nullable float following the rules
  requestsed in #1989
- Move TA_COUNT to be TA_COUNT_AK, also add a null TA_COUNT_C for CONUS
  that we can fill in later.

* Fix typo comment (#1988)
2022-10-06 16:24:05 -04:00
Lucas Merrill Brown
6505d49439
Removing fixed python version for black (#1985) 2022-10-05 11:15:07 -04:00
Lucas Merrill Brown
6e6223cd5e
Issue 105: Configure and run black and other pre-commit hooks (clean branch) (#1962)
* Configure and run `black` and other pre-commit hooks

Co-authored-by: matt bowen <matthew.r.bowen@omb.eop.gov>
2022-10-04 18:08:47 -04:00
Jorge Escobar
baa34ec038 Merge branch 'main' into emma-nechamkin/release/score-narwhal 2022-10-04 16:03:46 -04:00
Jorge Escobar
e8e951fe9a
Rezip CSV and Excel with Codebook (#1971)
* Rezip CSV and Excel files with Codebook

* codebook version

* packages fix

* pydantic

* lint

* Remove markdown link from markdown checker (#1936)

Co-authored-by: Vim <86254807+vim-usds@users.noreply.github.com>
2022-10-04 15:45:09 -04:00
Matt Bowen
1334fcc274
Add back income percentile (#1977)
* Add missing field to download (#1964)

* Remove pydantic since it's unused (#1964)

* Add percentile to CSV (#1964)

* Update downloadable pickle (#1964)
2022-10-04 15:09:05 -04:00
Emma Nechamkin
71385a033a
Adding ADJLI_ET (#1976)
* updated tile data

* ensuring adjli_et in
2022-10-04 15:06:55 -04:00
Emma Nechamkin
a438b44bfd
produce a string for the front end to ingest (#1963)
* wip

* i believe this works -- let's see the pipeline

* updated fixtures
2022-10-04 10:05:00 -04:00
Jorge Escobar
ecabe79299
pydantic upgrade 2022-10-03 16:57:53 -04:00
Emma Nechamkin
7c8617df67 updated for narhwal -- leaving commented code in for now 2022-10-03 13:27:18 -04:00
Emma Nechamkin
d4ae16bb7d updated with scoring comparison 2022-10-03 13:07:34 -04:00
Emma Nechamkin
40efd6572a Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-09-30 13:25:57 -04:00
Lucas Merrill Brown
f4adf172e3
refactoring tribal (#1960) 2022-09-30 12:04:12 -04:00
Emma Nechamkin
7b2a4e5a92 Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-09-29 16:16:40 -04:00
Matt Bowen
247db4acdc
Reorder download fields, add plumbing back (#1942)
* Add back lack of plumbing fields (#1920)

* Reorder fields for excel (#1921)

* Reorder excel fields (#1921)

* Fix formating, lint errors, pickes (#1921)

* Add missing plumbing col, fix order again (#1921)

* Update that pickle (#1921)
2022-09-29 13:09:36 -04:00
Matt Bowen
8e5ed5b593
Add demos for island areas (#1932)
* Backfill population in island areas (#1882)

* Update smoketest to account for backfills (#1882)

As I wrote in the commend:
We backfill island areas with data from the 2010 census, so if THOSE tracts
have data beyond the data source, that's to be expected and is fine to pass.
If some other state or territory does though, this should fail

This ends up being a nice way of documenting that behavior i guess!

* Fixup lint issues (#1882)

* Add in race demos to 2010 census pull (#1851)

* Add backfill data to score (#1851)

* Change column name (#1851)

* Fill demos after the score (#1851)

* Add income back, adjust test (#1882)

* Apply code-review feedback (#1851)

* Add test for island area backfill (#1851)

* Fix bad rename (#1851)
2022-09-29 12:42:56 -04:00
Matt Bowen
0f0d6db2d0
Update deps safety says are vulnerable (#1937) (#1938)
Co-authored-by: matt bowen <matt@mattbowen.net>
2022-09-28 11:59:39 -04:00
Lucas Merrill Brown
4da55a95ca
Fixing link checker (#1929) 2022-09-27 15:53:01 -04:00
Matt Bowen
48d961bb5f
Bump just jupyterlab (#1930) 2022-09-27 15:13:06 -04:00
Jorge Escobar
2f61900269
updating click 2022-09-26 12:05:40 -04:00
Jorge Escobar
15d946cdbe
updating click 2022-09-26 12:03:18 -04:00
Lucas Merrill Brown
9fb9874a15
Issue 1910: Do not impute income for 0 population tracts (#1918)
* should be working, has unnecessary loggers

* removing loggers and cleaning up

* updating ejscreen tests

* adding tests and responding to PR feedback

* fixing broken smoke test

* delete smoketest docs
2022-09-26 11:00:21 -04:00
Matt Bowen
9e85375d9b
Add tribal overlap to downloads (#1907)
* Add tribal data to downloads (#1904)

* Update test pickle with current cols (#1904)

* Remove text of tribe names from GeoJSON (#1904)

* Update test data (#1904)

* Add tribal overlap to smoketests (#1904)
2022-09-23 15:05:45 -04:00
Matt Bowen
6e0ef33d81
Add tribal count notebook (#1917) (#1919)
* Add tribal count notebook (#1917)

* test without caching

* added comment

Co-authored-by: lucasmbrown-usds <lucas.m.brown@omb.eop.gov>
2022-09-23 14:33:15 -04:00
Matt Bowen
d8dd4cf047
Cleanup source tests (#1912)
* Move test to base for broader coverage (#1848)

* Remove duplicate line (#1848)

* FUDS needed an extra mock (#1848)
2022-09-23 13:20:23 -04:00
Matt Bowen
f70f30d610
Improve score test documentation based on Lucas's feedback (#1835) (#1914)
* Better document base on Lucas's feedback (#1835)

* Fix typo (#1835)

* Add test to verify GEOJSON matches tiles (#1835)

* Remove NOOP line (#1835)

* Move GEOJSON generation up for new smoketest (#1835)

* Fixup code format (#1835)

* Update readme for new somketest (#1835)
2022-09-23 13:18:15 -04:00
Vim
bf27f2958b
update styles for mapbox base map (#1852)
- update airport color
2022-09-20 13:30:45 -07:00
Lucas Merrill Brown
aca226165c
Issue 1900: Tribal overlap with Census tracts (#1903)
* working notebook

* updating notebook

* wip

* fixing broken tests

* adding tribal overlap files

* WIP

* WIP

* WIP, calculated count and names

* working

* partial cleanup

* partial cleanup

* updating field names

* fixing bug

* removing pyogrio

* removing unused imports

* updating test fixtures to be more realistic

* cleaning up notebook

* fixing black

* fixing flake8 errors

* adding tox instructions

* updating etl_score

* suppressing warning

* Use projected CRSes, ignore geom types (#1900)

I looked into this a bit, and in general the geometry type mismatch
changes very little about the calculation; we have a mix of
multipolygons and polygons. The fastest thing to do is just not keep
geom type; I did some runs with it set to both True and False, and
they're the same within 9 digits of precision. Logically we just want to
overlaps, regardless of how the actual geometries are encoded between
the frames, so we can in this case ignore the geom types and feel OKAY.

I also moved to projected CRSes, since we are actually trying to do area
calculations and so like, we should. Again, the change is small in
magnitude but logically more sound.

* Readd CDC dataset config (#1900)

* adding comments to fips code

* delete unnecessary loggers

Co-authored-by: matt bowen <matthew.r.bowen@omb.eop.gov>
2022-09-20 14:53:12 -04:00
Matt Bowen
876655d2b2
Add tests for all non-census sources (#1899)
* Refactor CDC life-expectancy (1554)

* Update to new tract list (#1554)

* Adjust for tests (#1848)

* Add tests for cdc_places (#1848)

* Add EJScreen tests (#1848)

* Add tests for HUD housing (#1848)

* Add tests for GeoCorr (#1848)

* Add persistent poverty tests (#1848)

* Update for sources without zips, for new validation (#1848)

* Update tests for new multi-CSV but (#1848)

Lucas updated the CDC life expectancy data to handle a bug where two
states are missing from the US Overall download. Since virtually none of
our other ETL classes download multiple CSVs directly like this, it
required a pretty invasive new mocking strategy.

* Add basic tests for nature deprived (#1848)

* Add wildfire tests (#1848)

* Add flood risk tests (#1848)

* Add DOT travel tests (#1848)

* Add historic redlining tests (#1848)

* Add tests for ME and WI (#1848)

* Update now that validation exists (#1848)

* Adjust for validation (#1848)

* Add health insurance back to cdc places (#1848)

Ooops

* Update tests with new field (#1848)

* Test for blank tract removal (#1848)

* Add tracts for clipping behavior

* Test clipping and zfill behavior (#1848)

* Fix bad test assumption (#1848)

* Simplify class, add test for tract padding (#1848)

* Fix percentage inversion, update tests (#1848)

Looking through the transformations, I noticed that we were subtracting
a percentage that is usually between 0-100 from 1 instead of 100, and so
were endind up with some surprising results. Confirmed with lucasmbrown-usds

* Add note about first street data (#1848)
2022-09-19 15:17:00 -04:00
Lucas Merrill Brown
4d02525bb3
1831 Follow up (#1902)
This code causes no functional change to the code. It does two things:

1. Uses difference instead of - to improve code style for working with sets.

2. Removes the line EXPECTED_MISSING_STATES = ["02", "15"], which is now redundant because of the line I added (in a previous pull request) of ALASKA_AND_HAWAII_EXPECTED_IN_DATA = False.
2022-09-15 17:46:01 -04:00
Emma Nechamkin
fe4e8e52d2 Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-09-15 12:07:40 -04:00
Emma Nechamkin
60164c8637
Removing low pop tracts from FEMA population loss (#1898)
dropping 0 population from FEMA
2022-09-12 13:48:38 -04:00
Emma Nechamkin
7ea2ae8dec Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-09-12 10:10:56 -04:00
Lucas Merrill Brown
6e9c44ea72
Issue 1831: missing life expectancy data from Maine and Wisconsin (#1887)
* Fixing missing states and adding tests for states to all classes
2022-09-09 20:35:01 -04:00
Emma Nechamkin
e78c6d0fef Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-09-08 15:48:01 -04:00
Emma Nechamkin
fb4c484e5c
Remove no land tracts from map (#1894)
remove from map
2022-09-08 14:55:00 -04:00
Emma Nechamkin
426328e378
Updating traffic barriers to include low pop threshold (#1889)
Changing the traffic barriers to only be included for places with recorded population
2022-09-07 17:13:31 -04:00
Emma Nechamkin
31eac4101e Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-09-07 13:48:22 -04:00
Matt Bowen
d41153d89d
Add tests to make sure each source makes it to the score correctly (#1878)
* Remove unused persistent poverty from score (#1835)

* Test a few datasets for overlap in the final score (#1835)

* Add remaining data sources (#1853)

* Apply code-review feedback (#1835)

* Rearrange a little for readabililty (#1835)

* Add tract test (#1835)

* Add test for score values (#1835)

* Check for unmatched source tracts (#1835)

* Cleanup numeric code to plaintext (#1835)

* Make import more obvious (#1835)
2022-09-06 15:10:19 -04:00
Emma Nechamkin
9c0e1993f6
Pipeline tile tests (#1864)
* temp update

* updating with fips check

* adding check on pfs

* updating with pfs test

* Update test_tiles_smoketests.py

* Fix lint errors (#1848)

* Add column names test (#1848)

* Mark tests as smoketests (#1848)

* Move to other score-related tests (#1848)

* Recast Total threshold criteria exceeded to int (#1848)

In writing tests to verify the output of the tiles csv matches the final
score CSV, I noticed TC/Total threshold criteria exceeded was getting
cast from an int64 to a float64 in the process of PostScoreETL. I
tracked it down to the line where we merge the score dataframe with
constants.DATA_CENSUS_CSV_FILE_PATH --- there where > 100 tracts in the
national census CSV that don't exist in the score, so those ended up
with a Total threshhold count of np.nan, which is a float, and thereby
cast those columns to float. For the moment I just cast it back.

* No need for low memeory (#1848)

* Add additional tests of tiles.csv (#1848)

* Drop pre-2010 rows before computing score (#1848)

Note this is probably NOT the optimal place for this change; it might
make more sense for each source to filter its own tracts down to the
acceptable tract list. However, that would be a pretty invasive change,
where this is central and plenty of other things are happening in score
transform that could be moved to sources, so for today, here's where the
change will live.

* Fix typo (#1848)

* Switch from filter to inner join (#1848)

* Remove no-op lines from tiles (#1848)

* Apply feedback from review, linter (#1848)

* Check the values oeverything in the frame (#1848)

* Refactor checker class (#1848)

* Add test for state names (#1848)

* cleanup from reviewing my own code (#1848)

* Fix lint error (#1858)

* Apply Emma's feedback from review (#1848)

* Remove refs to national_df (#1848)

* Account for new, fake nullable bools in tiles (#1848)

To handle a geojson limitation, Emma converted some nullable boolean
colunms to float64 in the tiles export with the values {0.0, 1.0, nan},
giving us the same expressiveness. Sadly, this broke my assumption that
all columns between the score and tiles csvs would have the same dtypes,
so I need to account for these new, fake bools in my test.

* Use equals instead of my worse version (#1848)

* Missed a spot where we called _create_score_data (#1848)

* Update per safety (#1848)

Co-authored-by: matt bowen <matthew.r.bowen@omb.eop.gov>
2022-09-01 13:07:14 -04:00
Jorge Escobar
ccd72e2cce
tribal tiles fix (#1874)
* Alaska tribal points fix (#1821)

* tribal tiles fix

* disabling child opportunity

* lint

* removing COI

* removing commented out code
2022-09-01 10:19:13 -04:00
Emma Nechamkin
b7af13b2a6 Merge branch 'emma-nechamkin/release/score-narwhal' of github.com:usds/justice40-tool into emma-nechamkin/release/score-narwhal 2022-08-31 14:29:45 -04:00