Merge pull request #877 from cal-itp/eric-housekeeping

Eric housekeeping
cal-itp · Sep 14, 2023 · 8db008b · 8db008b
2 parents e43c43c + efb949c
commit 8db008b
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 10,035 deletions.
diff --git a/accessibility_report/accessibility_questions.ipynb b/accessibility_report/accessibility_questions.ipynb
diff --git a/ca_transit_speed_maps/build_speedmaps_index.py b/ca_transit_speed_maps/build_speedmaps_index.py
@@ -7,9 +7,9 @@
 import datetime as dt
 
 from calitp_data_analysis.tables import tbls
-import shared_utils
+from shared_utils import rt_dates, rt_utils
 
-ANALYSIS_DATE = dt.date.fromisoformat(shared_utils.rt_dates.DATES['apr2023b'])
+ANALYSIS_DATE = dt.date.fromisoformat(rt_dates.DATES['apr2023b'])
 PROGRESS_PATH = f'./_rt_progress_{ANALYSIS_DATE}.parquet'
 
 def build_speedmaps_index(analysis_date: dt.date) -> pd.DataFrame:
@@ -46,5 +46,5 @@ def build_speedmaps_index(analysis_date: dt.date) -> pd.DataFrame:
 
     print(f'analysis date from shared_utils/rt_dates: {ANALYSIS_DATE}')
     speedmaps_index = build_speedmaps_index(ANALYSIS_DATE)
-    speedmaps_index_joined = shared_utils.rt_utils.check_intermediate_data(speedmaps_index)
+    speedmaps_index_joined = rt_utils.check_intermediate_data(speedmaps_index)
     speedmaps_index_joined.to_parquet(PROGRESS_PATH)
diff --git a/ca_transit_speed_maps/check_test_mapping.py b/ca_transit_speed_maps/check_test_mapping.py
@@ -6,7 +6,7 @@
 import pandas as pd
 import datetime as dt
 
-import shared_utils
+from shared_utils import rt_utils
 from rt_analysis import rt_filter_map_plot
 import tqdm
 import warnings
@@ -41,7 +41,7 @@ def check_map_gen(row, pbar):
 
 if __name__ == "__main__":
 
-    speedmaps_index_joined = shared_utils.rt_utils.check_intermediate_data(
+    speedmaps_index_joined = rt_utils.check_intermediate_data(
         analysis_date = ANALYSIS_DATE)
     # check if this stage needed
     if speedmaps_index_joined.status.isin(['map_confirmed', 'map_failed', 'parser_failed']).all():

diff --git a/ca_transit_speed_maps/dev_signals.ipynb b/ca_transit_speed_maps/dev_signals.ipynb
@@ -13,7 +13,6 @@
     "\n",
     "import os\n",
     "os.environ[\"CALITP_BQ_MAX_BYTES\"] = str(800_000_000_000)\n",
-    "import shared_utils\n",
     "\n",
     "from calitp_data_analysis.tables import tbls\n",
     "\n",

diff --git a/ca_transit_speed_maps/stage_run_portfolio.py b/ca_transit_speed_maps/stage_run_portfolio.py
@@ -11,8 +11,8 @@
 from siuba import *
 
 import datetime as dt
-import shared_utils
 from rt_analysis import rt_parser
+from shared_utils import rt_utils
 
 import os
 
@@ -74,7 +74,7 @@ def deploy_portfolio():
 
 if __name__ == "__main__":
 
-    speedmaps_index_joined = shared_utils.rt_utils.check_intermediate_data(
+    speedmaps_index_joined = rt_utils.check_intermediate_data(
         analysis_date = ANALYSIS_DATE)
     make_rt_site_yml(speedmaps_index_joined)
     stage_portfolio()