Skip to content

Commit ba9bc38

Browse files
author
tiffanychu90
committed
shared_utils to calitp_data_analysis for starter_kit/, don't touch tutorials yet
1 parent ca8fe41 commit ba9bc38

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

starter_kit/gtfs_utils_v2_examples.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"\n",
3434
"from siuba import *\n",
3535
"\n",
36-
"import gtfs_utils_v2\n",
36+
"from shared_utils import gtfs_utils_v2\n",
3737
"analysis_date = datetime.date(2023, 1, 17)"
3838
]
3939
},

starter_kit/shared_utils_examples.ipynb

+5-7
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"from calitp_data_analysis.tables import tbls\n",
5353
"from siuba import *\n",
5454
"\n",
55-
"from calitp_data_analysis import geography_utils\n",
56-
"from shared_utils import geography_utils, utils"
55+
"from calitp_data_analysis import geography_utils, utils\n",
56+
"from shared_utils import portfolio_utils"
5757
]
5858
},
5959
{
@@ -424,7 +424,7 @@
424424
"count_cols = [\"pickup\"]\n",
425425
"nunique_cols = [\"pickup_zone\"]\n",
426426
"\n",
427-
"by_borough = geography_utils.aggregate_by_geography(\n",
427+
"by_borough = portfolio_utils.aggregate_by_geography(\n",
428428
" df[df.pickup_borough.notna()], \n",
429429
" group_cols=group_cols,\n",
430430
" sum_cols = sum_cols,\n",
@@ -749,7 +749,7 @@
749749
}
750750
],
751751
"source": [
752-
"df2 = geography_utils.aggregate_by_geography(\n",
752+
"df2 = portfolio_utils.aggregate_by_geography(\n",
753753
" df[(df.payment.notna()) & (df.pickup_borough.notna())], \n",
754754
" group_cols = [\"pickup_borough\", \"payment\"],\n",
755755
" sum_cols = [\"passengers\", \"fare\"],\n",
@@ -981,9 +981,7 @@
981981
"source": [
982982
"import branca\n",
983983
"import geopandas as gpd\n",
984-
"import pandas as pd\n",
985-
"\n",
986-
"from calitp_data_analysis import geography_utils"
984+
"import pandas as pd"
987985
]
988986
},
989987
{

starter_kit/simple_dask.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# Simple script to test dask clutser
22
import dask.dataframe as dd
3-
import gcsfs
43
import os
54
import pandas as pd
65

7-
from calitp_data_analysis import get_fs
6+
from calitp_data_infra.storage import get_fs
87
fs = get_fs()
98

109
RT_GCS = 'gs://calitp-analytics-data/data-analyses/rt_delay/compiled_cached_views/'

0 commit comments

Comments
 (0)