Merge pull request #1493 from cal-itp/more-speedmaps-sso

rerun speeds pipeline with sso auth, rebuild speedmaps

Author: edasmalchi

_shared_utils/shared_utils/dask_utils.py

@@ -7,12 +7,15 @@
 import dask_geopandas as dg
 import gcsfs
 import geopandas as gpd
+import google.auth
 import pandas as pd
 from calitp_data_analysis import utils
 from dask import compute, delayed
 from dask.delayed import Delayed  # type hint
 from shared_utils import time_helpers
 
+credentials, project = google.auth.default()
+
 fs = gcsfs.GCSFileSystem()
 
 
@@ -127,8 +130,7 @@ def import_df_func(
     """
     if data_type == "gdf":
         df = gpd.read_parquet(
-            f"{path}_{one_date}.parquet",
-            **kwargs,
+            f"{path}_{one_date}.parquet", **kwargs, storage_options={"token": credentials.token}
         ).drop_duplicates()
 
     else:

ca_transit_speed_maps/stage_run_portfolio.py

@@ -64,15 +64,11 @@ def stage_portfolio():
 def deploy_portfolio():
 
     os.chdir('/home/jovyan/data-analyses')
-    # os.system('cp -r portfolio/rt/_build/html/* portfolio/index/rt/')
     os.system('python3 portfolio/portfolio.py build rt --no-execute-papermill --deploy')
-    # print('check draft URL for RT site, then run python portfolio/portfolio.py index --deploy')
-    # print('after that, check draft URL for index, rerun last with --prod')
-    # os.system('netlify deploy --site=cal-itp-data-analyses --dir=portfolio/rt/_build/html/ --alias=rt')
 
 if __name__ == "__main__":
 
     speedmaps_index_joined = pd.read_parquet(PROGRESS_PATH)
     make_rt_site_yml(speedmaps_index_joined)
     stage_portfolio()
-    # deploy_portfolio()
+    deploy_portfolio()

gtfs_funnel/Makefile

@@ -39,17 +39,17 @@ monthly_scheduled_data:
 	python concatenate_monthly_scheduled_service.py
 
 funnel_gtfs_single_day: 
-#	make download_gtfs_data 
-#	make preprocess_schedule_vp_dependency 
-#	make preprocess_vp
+	make download_gtfs_data 
+	make preprocess_schedule_vp_dependency 
+	make preprocess_vp
 	make preprocess_schedule_only 
 	make timeseries_preprocessing
 	#make monthly_scheduled_data    
 
 all:
-#	make funnel_gtfs_single_day
+	make funnel_gtfs_single_day
     # update open_data/update_vars.py        
-#	cd ../open_data/ && make create_gtfs_schedule_geospatial_open_data -f Makefile
+	cd ../open_data/ && make create_gtfs_schedule_geospatial_open_data -f Makefile
     # update high_quality_transit_areas/update_vars.py    
 	cd ../high_quality_transit_areas/ && make hqta_data -f Makefile    
     # update rt_segment_speeds/segment_speed_utils/project_vars.py

portfolio/rt/district_01-eureka/00__01_new_speedmaps__district_01-eureka__organization_name_city-of-arcata.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36e4e70ea0cbd86e3bd14f012bfb54d9c514c4292ebda30125e79b0662015ba1
-size 66406
+oid sha256:dc057840975607a8c8f7fba7147c6f67079ac78ab3fe6d3be4e6e0755cab7526
+size 66281

portfolio/rt/district_01-eureka/01__01_new_speedmaps__district_01-eureka__organization_name_city-of-eureka.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a717c6446637eeea3915cfaeec9ac8fa7092d8870ea511473059cd591f1be21
-size 66404
+oid sha256:38b0c766f0c5f13cedf335699343329f84bcbff1fdfd7a59ce0126fb0123901f
+size 66285

portfolio/rt/district_01-eureka/02__01_new_speedmaps__district_01-eureka__organization_name_humboldt-transit-authority.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c52d6413be2e4beb9e9e6e7db7af60e169c9a7a93999e016f5a3dacce1530f00
-size 66979
+oid sha256:7f549c61e7f69e8ba9acac1f0448a72e0aec628cc2eed29e0cd492904f9cc48c
+size 66859

portfolio/rt/district_01-eureka/03__01_new_speedmaps__district_01-eureka__organization_name_lake-transit-authority.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8e2000726e8c91c7f2a64aacc5399817850c359e0470748622bb5a94e0f8559
-size 63106
+oid sha256:b25c37efd45b50db96aaddd7e8a6c00a699ce459a57bb0794490e4bdc7186c64
+size 63005

portfolio/rt/district_01-eureka/04__01_new_speedmaps__district_01-eureka__organization_name_mendocino-transit-authority.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf5db526f5ed6cf60f83ef5b82ab24028847945fb68fbd797279d65a9f092d7e
-size 66950
+oid sha256:80e286fafad878f68e11133a4625e291d3dfe37c6e02eec90897df6f57b2a2fd
+size 66853

portfolio/rt/district_01-eureka/05__01_new_speedmaps__district_01-eureka__organization_name_redwood-coast-transit-authority.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:900b477c8f73c7889ce920c92047211958d8421cff8bfd3bc3576ba0407b8771
-size 63430
+oid sha256:c9d143fe4cb0091dbab5e540beeeb8ceb7f7819354e30a87a7f32b079c9999f0
+size 63384

portfolio/rt/district_02-redding/00__01_new_speedmaps__district_02-redding__organization_name_redding-area-bus-authority.ipynb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a604a5bafd1f62ddddadec8a32456de95bdcf7758d2573fbf8bf715db093386a
-size 63306
+oid sha256:4ddd95be419875ba25ceeb057ad7a8b60f2ce3e879d830ad5e3583288d1e3d0a
+size 63189