From 879cb7d022d2dd96ac870e4998ad0e86366a45d8 Mon Sep 17 00:00:00 2001 From: Jorge Escobar <83969469+esfoobar-usds@users.noreply.github.com> Date: Tue, 14 Sep 2021 07:27:48 -0400 Subject: [PATCH] hotfix wrong score tile csv path (#671) * hotfix wrong score tile csv path * updating test * forcing update * triggering action --- data/data-pipeline/README.md | 2 +- data/data-pipeline/data_pipeline/etl/score/constants.py | 7 +++++-- .../data_pipeline/etl/score/etl_score_post.py | 4 ++-- .../data_pipeline/etl/score/tests/test_score_post.py | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/data/data-pipeline/README.md b/data/data-pipeline/README.md index af90239c..2724c660 100644 --- a/data/data-pipeline/README.md +++ b/data/data-pipeline/README.md @@ -311,7 +311,7 @@ ETL unit tests are typically organized into three buckets: - Transform Tests, and - Load Tests -These are tested using different strategies, explained below. +These are tested using different strategies explained below. #### Extract Tests diff --git a/data/data-pipeline/data_pipeline/etl/score/constants.py b/data/data-pipeline/data_pipeline/etl/score/constants.py index 054ef025..3d262f98 100644 --- a/data/data-pipeline/data_pipeline/etl/score/constants.py +++ b/data/data-pipeline/data_pipeline/etl/score/constants.py @@ -31,9 +31,12 @@ FULL_SCORE_CSV_FULL_PLUS_COUNTIES_FILE_PATH = ( DATA_SCORE_CSV_FULL_DIR / "usa_counties.csv" ) -## Score Tile paths +# Score Tile CSV source path +DATA_SCORE_CSV_TILES_PATH = DATA_SCORE_CSV_DIR / "tiles" +DATA_SCORE_CSV_TILES_FILE_PATH = DATA_SCORE_CSV_TILES_PATH / "usa.csv" + +## Tile path DATA_SCORE_TILES_DIR = DATA_SCORE_DIR / "tiles" -DATA_SCORE_TILES_FILE_PATH = DATA_SCORE_TILES_DIR / "usa.csv" # Downloadable paths SCORE_DOWNLOADABLE_DIR = DATA_SCORE_DIR / "downloadable" diff --git a/data/data-pipeline/data_pipeline/etl/score/etl_score_post.py b/data/data-pipeline/data_pipeline/etl/score/etl_score_post.py index c5f9af5a..48fbe3e8 100644 --- a/data/data-pipeline/data_pipeline/etl/score/etl_score_post.py +++ b/data/data-pipeline/data_pipeline/etl/score/etl_score_post.py @@ -201,7 +201,7 @@ class PostScoreETL(ExtractTransformLoad): ] def transform(self) -> None: - logger.info("Transforming data sources for Score + County CSV") + logger.info("Transforming data sources for Score + County CSVs") transformed_counties = self._transform_counties(self.input_counties_df) transformed_states = self._transform_states(self.input_states_df) @@ -267,7 +267,7 @@ class PostScoreETL(ExtractTransformLoad): constants.FULL_SCORE_CSV_FULL_PLUS_COUNTIES_FILE_PATH, ) self._load_tile_csv( - self.output_score_tiles_df, constants.DATA_SCORE_TILES_FILE_PATH + self.output_score_tiles_df, constants.DATA_SCORE_CSV_TILES_FILE_PATH ) self._load_downloadable_zip( self.output_downloadable_df, constants.SCORE_DOWNLOADABLE_DIR diff --git a/data/data-pipeline/data_pipeline/etl/score/tests/test_score_post.py b/data/data-pipeline/data_pipeline/etl/score/tests/test_score_post.py index 22f8696a..24e3a293 100644 --- a/data/data-pipeline/data_pipeline/etl/score/tests/test_score_post.py +++ b/data/data-pipeline/data_pipeline/etl/score/tests/test_score_post.py @@ -112,9 +112,9 @@ def test_load_score_csv(etl, score_data_expected): def test_load_tile_csv(etl, tile_data_expected): reload(constants) etl._load_score_csv( - tile_data_expected, constants.DATA_SCORE_TILES_FILE_PATH + tile_data_expected, constants.DATA_SCORE_CSV_TILES_FILE_PATH ) - assert constants.DATA_SCORE_TILES_FILE_PATH.is_file() + assert constants.DATA_SCORE_CSV_TILES_FILE_PATH.is_file() def test_load_downloadable_zip(etl, downloadable_data_expected):