Merge pull request #619 from cmu-delphi/fix-bad-merge

krivard · web-flow · commit 767203089ffb · 2020-12-09T15:59:30.000-05:00
Fix errors for bad merges
diff --git a/_delphi_utils_python/data_proc/geomap/geo_data_proc.py b/_delphi_utils_python/data_proc/geomap/geo_data_proc.py
@@ -547,7 +547,7 @@ def derive_fips_hhs_crosswalk():
     )
     state_hhs = pd.read_csv(
         join(OUTPUT_DIR, STATE_HHS_OUT_FILENAME),
-        dtype={"state_code": str, "hhs_region_number": str},
+        dtype={"state_code": str, "hhs": str},
     )
 
     fips_pop["state_code"] = fips_pop["fips"].str[:2]
@@ -573,7 +573,7 @@ def derive_zip_hhs_crosswalk():
     )
     state_hhs = pd.read_csv(
         join(OUTPUT_DIR, STATE_HHS_OUT_FILENAME),
-        dtype={"state_code": str, "hhs_region_number": str},
+        dtype={"state_code": str, "hhs": str},
     )
 
     (
diff --git a/_delphi_utils_python/delphi_utils/data/zip_hhs_table.csv b/_delphi_utils_python/delphi_utils/data/zip_hhs_table.csv
@@ -2780,7 +2780,6 @@ zip,weight,hhs
 08901,1.0,2
 08902,1.0,2
 08904,1.0,2
->>>>>>> add-hhs
 10001,1.0,2
 10002,1.0,2
 10003,1.0,2

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ def derive_fips_hhs_crosswalk():`
`547`	`547`	`)`
`548`	`548`	`state_hhs = pd.read_csv(`
`549`	`549`	`join(OUTPUT_DIR, STATE_HHS_OUT_FILENAME),`
`550`		`- dtype={"state_code": str, "hhs_region_number": str},`
	`550`	`+ dtype={"state_code": str, "hhs": str},`
`551`	`551`	`)`
`552`	`552`
`553`	`553`	`fips_pop["state_code"] = fips_pop["fips"].str[:2]`
`@@ -573,7 +573,7 @@ def derive_zip_hhs_crosswalk():`
`573`	`573`	`)`
`574`	`574`	`state_hhs = pd.read_csv(`
`575`	`575`	`join(OUTPUT_DIR, STATE_HHS_OUT_FILENAME),`
`576`		`- dtype={"state_code": str, "hhs_region_number": str},`
	`576`	`+ dtype={"state_code": str, "hhs": str},`
`577`	`577`	`)`
`578`	`578`
`579`	`579`	`(`
-Original file line number
+Diff line change
 ,1.0,2
 ,1.0,2
 ,1.0,2
 ->>>>>>> add-hhs
 ,1.0,2
 ,1.0,2
 ,1.0,2