Merge branch 'develop' into pytest-warnings

onnela-lab · Oct 29, 2024 · 1af619c · 1af619c
2 parents 05d2cf8 + 47bb39e
commit 1af619c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Check out Forest code
         uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
       - name: Install documentation build dependencies

diff --git a/forest/sycamore/common.py b/forest/sycamore/common.py
@@ -414,9 +414,7 @@ def aggregate_surveys_config(
         config_surveys[["config_id", "question_id"]], how="left",
         left_on="question id", right_on="question_id"
     ).drop(["question_id"], axis=1)
-    df_merged["config_id_update"] = df_merged["config_id"].fillna(
-        method="ffill"
-    )
+    df_merged["config_id_update"] = df_merged["config_id"].ffill()
     df_merged["config_id"] = df_merged.apply(
         lambda row:
         row["config_id_update"] if row["event"] in ["User hit submit",

diff --git a/forest/sycamore/submits.py b/forest/sycamore/submits.py
@@ -525,7 +525,7 @@ def summarize_submits(submits_df: pd.DataFrame,
     if timeunit == Frequency.DAILY:
         submits["delivery_time_floor"] = submits["delivery_time"].dt.floor("D")
     elif timeunit == Frequency.HOURLY:
-        submits["delivery_time_floor"] = submits["delivery_time"].dt.floor("H")
+        submits["delivery_time_floor"] = submits["delivery_time"].dt.floor("h")
     if timeunit is not None:
         # round to the nearest desired unit
         submits["year"] = submits["delivery_time_floor"].dt.year