Merge pull request #515 from akrherz/excel_save

Fix now removed excel API usage

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.3.3"
+    rev: "v0.3.5"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

htdocs/admin/calc.py

@@ -59,9 +59,8 @@ def application(environ, start_response):
             ),
         ]
         start_response("200 OK", headers)
-        writer = pd.ExcelWriter("/tmp/ss.xlsx")
-        df.to_excel(writer, "Data", index=False)
-        writer.save()
+        with pd.ExcelWriter("/tmp/ss.xlsx") as writer:
+            df.to_excel(writer, "Data", index=False)
         payload = open("/tmp/ss.xlsx", "rb").read()
         os.unlink("/tmp/ss.xlsx")
         return [payload]

htdocs/cscap/plot_decagon.py

@@ -193,11 +193,10 @@ def application(environ, start_response):
                     ),
                 ),
             ]
-            writer = pd.ExcelWriter("/tmp/ss.xlsx")
             # Prevent timezone troubles
             df["timestamp"] = df["timestamp"].dt.strftime("%Y-%m-%d %H:%M")
-            df.to_excel(writer, "Data", index=False)
-            writer.save()
+            with pd.ExcelWriter("/tmp/ss.xlsx") as writer:
+                df.to_excel(writer, "Data", index=False)
             payload = open("/tmp/ss.xlsx", "rb").read()
             os.unlink("/tmp/ss.xlsx")
             return [payload]

htdocs/cscap/plot_tileflow.py

@@ -162,16 +162,15 @@ def application(environ, start_response):
                 ),
             ]
             start_response("200 OK", headers)
-            writer = pd.ExcelWriter("/tmp/ss.xlsx")
             # Prevent timezone troubles
             if ptype not in [
                 "2",
             ]:
                 df["timestamp"] = df["timestamp"].dt.strftime("%Y-%m-%d %H:%M")
-            df.to_excel(writer, "Data", index=False)
-            worksheet = writer.sheets["Data"]
-            worksheet.freeze_panes(3, 0)
-            writer.save()
+            with pd.ExcelWriter("/tmp/ss.xlsx") as writer:
+                df.to_excel(writer, "Data", index=False)
+                worksheet = writer.sheets["Data"]
+                worksheet.freeze_panes(3, 0)
             payload = open("/tmp/ss.xlsx", "rb").read()
             os.unlink("/tmp/ss.xlsx")
             return [payload]

htdocs/cscap/plot_waterquality.py

@@ -105,11 +105,10 @@ def application(environ, start_response):
                 ),
             ]
             start_response("200 OK", headers)
-            writer = pd.ExcelWriter("/tmp/ss.xlsx")
-            df.to_excel(writer, "Data", index=False)
-            worksheet = writer.sheets["Data"]
-            worksheet.freeze_panes(3, 0)
-            writer.save()
+            with pd.ExcelWriter("/tmp/ss.xlsx") as writer:
+                df.to_excel(writer, "Data", index=False)
+                worksheet = writer.sheets["Data"]
+                worksheet.freeze_panes(3, 0)
             payload = open("/tmp/ss.xlsx", "rb").read()
             os.unlink("/tmp/ss.xlsx")
             return [payload]

htdocs/cscap/plot_watertable.py

@@ -176,11 +176,10 @@ def application(environ, start_response):
                 ),
             ]
             start_response("200 OK", headers)
-            writer = pd.ExcelWriter("/tmp/ss.xlsx")
-            df.to_excel(writer, "Data", index=False)
-            worksheet = writer.sheets["Data"]
-            worksheet.freeze_panes(3, 0)
-            writer.save()
+            with pd.ExcelWriter("/tmp/ss.xlsx") as writer:
+                df.to_excel(writer, "Data", index=False)
+                worksheet = writer.sheets["Data"]
+                worksheet.freeze_panes(3, 0)
             payload = open("/tmp/ss.xlsx", "rb").read()
             os.unlink("/tmp/ss.xlsx")
             return [payload]

scripts/cscap/plotids/check_ghg_plotids.py

@@ -63,9 +63,8 @@ def main():
                     plotdf.at[idx, "ghg"] = "yes"
 
     df = pd.DataFrame(rows)
-    writer = pd.ExcelWriter("output.xlsx")
-    df.to_excel(writer, "Sheet1")
-    writer.save()
+    with pd.ExcelWriter("output.xlsx") as writer:
+        df.to_excel(writer, "Sheet1")
 
     res = drive.files().list(q="title contains 'Plot Identifiers'").execute()
     for item in res["items"]:

scripts/cscap/tileflow/interpolate_serf.py

@@ -25,7 +25,6 @@
     ].interpolate(method="time")
 
 
-writer = pd.ExcelWriter("output.xlsx")
-for plotid in df:
-    df[plotid].to_excel(writer, plotid)
-writer.save()
+with pd.ExcelWriter("output.xlsx") as writer:
+    for plotid in df:
+        df[plotid].to_excel(writer, plotid)