Merge pull request #937 from cal-itp/v2-bus-service-increase

V2 bus service increase
cal-itp · Oct 27, 2023 · cb1ce05 · cb1ce05
2 parents 0bc3946 + ff54074
commit cb1ce05
Show file tree

Hide file tree

Showing 53 changed files with 746 additions and 3,717 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,9 +12,11 @@ repos:
     rev: 6.0.0
     hooks:
       - id: flake8
-        args: ["--ignore=E501,W503,F403,F405,E711,E712"] 
+        args: ["--ignore=E501,W503,F403,F405,E711,E712,E231,E702"] 
         # E711: comparison to None should be 'if cond is not None:' (siuba filtering requires we use != None and not is not)
         # E712: line too long and line before binary operator (black is ok with these), assign lambda expression OK, comparison to True with is (siuba uses ==)
+        # E231: missing whitespace after colon (we don't want white space when setting gs://)
+        # E702: multiple statements on one line (semicolon)
         types:
           - python
         files: _shared_utils

diff --git a/_shared_utils/shared_utils/geography_utils.py b/_shared_utils/shared_utils/geography_utils.py
@@ -160,7 +160,7 @@ def cut_segments(
         .drop(columns="temp_index")
     )
 
-    segmented2 = gpd.GeoDataFrame(segmented, crs=f"EPSG:{EPSG_CODE}")
+    segmented2 = gpd.GeoDataFrame(segmented, crs=f"EPSG: {EPSG_CODE}")
 
     return segmented2
 

diff --git a/_shared_utils/shared_utils/portfolio_utils.py b/_shared_utils/shared_utils/portfolio_utils.py
@@ -167,7 +167,8 @@ def style_table(
         if display_scrollbar:
             display(
                 HTML(
-                    f"<div style='height: {scrollbar_height}; overflow: auto; width: {scrollbar_width}'>"
+                    f"<div style=>{scrollbar_height}; "
+                    + f"overflow: auto; width: {scrollbar_width}"
                     + (df_style.set_properties(**{"font-size": scrollbar_font}).render())
                     + "</div>"
                 )

diff --git a/_shared_utils/shared_utils/rt_dates.py b/_shared_utils/shared_utils/rt_dates.py
@@ -36,6 +36,8 @@
     "aug2023a": "2023-08-23",  # date used for speedmaps
     "sep2023": "2023-09-13",
     "oct2023": "2023-10-11",
+    "oct2023a": "2023-10-13",  # add weekend dates for SB 125 service increase
+    "oct2023b": "2023-10-14",
 }
 
 

diff --git a/_shared_utils/shared_utils/rt_utils.py b/_shared_utils/shared_utils/rt_utils.py
@@ -748,7 +748,7 @@ def describe_most_delayed(row):
     description = which_desc(row)
     full_description = (
         f"{row.route_short_name}{description}, {row.direction}: "
-        f"{round(row.mean_delay_seconds/60, 0)} minutes late on average"
+        f"{round(row.mean_delay_seconds / 60, 0)} minutes late on average"
     )
     row["full_description"] = full_description
     return row