fixing merge conflicts

data/data-pipeline/data_pipeline/score/adding_variables_to_score.md

@@ -1,9 +1,9 @@
 # How to add variables to a score
 
-So, there's a variable you want to add to the score! Once you have the data source created in `etl/sources`, what should you do? There are 6 steps across a minimum of 7 files. 
+So, there's a variable you want to add to the score! Once you have the data source created in `etl/sources`, what should you do? There are 6 steps across a minimum of 7 files.
 
 __Updating `field_names.py`__
-Per indicator, you need to make (usually) three variables to get used in other files. 
+Per indicator, you need to make (usually) three variables to get used in other files.
 - raw variable: this is the name of the variable's raw data, not scaled into a percentile
 - variable with threshold exceeded: this is a boolean for whether the tract meets the threshold for the indicator alone
 - variable with threshold exceeded and socioeconomic criterion exceeded: this is whether the tract will be a DAC based on the socioeconomic criterion and the indicator
@@ -25,4 +25,4 @@ __Updating `csv.yml` and `excel.yml`__
 - make sure each column you want to be in the downloadable files is listed here
 
 __Update the fixtures__
-Follow the instructions on the repo to modify tiles so that `test_etl_post.py` doesn't fail. Then, confirm results. 
+Follow the instructions on the repo to modify tiles so that `test_etl_post.py` doesn't fail. Then, confirm results.

data/data-pipeline/data_pipeline/score/score_a.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_b.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_c.py

@@ -1,8 +1,8 @@
 from collections import namedtuple
-import pandas as pd
 
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_d.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_f.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_g.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_h.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_i.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_k.py

@@ -1,7 +1,6 @@
-import pandas as pd
-
-from data_pipeline.score.score import Score
 import data_pipeline.score.field_names as field_names
+import pandas as pd
+from data_pipeline.score.score import Score
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_l.py

@@ -1,8 +1,7 @@
+import data_pipeline.score.field_names as field_names
 import numpy as np
 import pandas as pd
-
 from data_pipeline.score.score import Score
-import data_pipeline.score.field_names as field_names
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/score_m.py

@@ -1,11 +1,11 @@
 from typing import Tuple
+
+import data_pipeline.etl.score.constants as constants
+import data_pipeline.score.field_names as field_names
 import numpy as np
 import pandas as pd
-
 from data_pipeline.score.score import Score
-import data_pipeline.score.field_names as field_names
 from data_pipeline.utils import get_module_logger
-import data_pipeline.etl.score.constants as constants
 
 logger = get_module_logger(__name__)
 

data/data-pipeline/data_pipeline/score/score_narwhal.py

@@ -1,12 +1,12 @@
 from typing import Tuple
+
+import data_pipeline.etl.score.constants as constants
+import data_pipeline.score.field_names as field_names
 import numpy as np
 import pandas as pd
-
 from data_pipeline.score.score import Score
-import data_pipeline.score.field_names as field_names
-from data_pipeline.utils import get_module_logger
-import data_pipeline.etl.score.constants as constants
 from data_pipeline.score.utils import calculate_tract_adjacency_scores
+from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)
 

data/data-pipeline/data_pipeline/score/score_runner.py

@@ -1,6 +1,5 @@
 import pandas as pd
 from data_pipeline.score.score_narwhal import ScoreNarwhal
-
 from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)

data/data-pipeline/data_pipeline/score/utils.py

@@ -1,12 +1,12 @@
 """Utilities to help generate the score."""
-import pandas as pd
-import geopandas as gpd
 import data_pipeline.score.field_names as field_names
+import geopandas as gpd
+import pandas as pd
+from data_pipeline.etl.sources.geo_utils import get_tract_geojson
+from data_pipeline.utils import get_module_logger
 
 # XXX: @jorge I am torn about the coupling that importing from
 # etl.sources vs keeping the code DRY. Thoughts?
-from data_pipeline.etl.sources.geo_utils import get_tract_geojson
-from data_pipeline.utils import get_module_logger
 
 logger = get_module_logger(__name__)