Merge pull request #643 from akrherz/240122

mnt: address some pandas2.2 warnings
akrherz · Jan 22, 2024 · d0eb346 · d0eb346
2 parents 28b490c + 7f3791f
commit d0eb346
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 14 deletions.
diff --git a/cgi-bin/request/daily.py b/cgi-bin/request/daily.py
@@ -116,7 +116,7 @@ def get_data(network, sts, ets, stations, cols, na, fmt):
     if fmt == "excel":
         bio = BytesIO()
         with pd.ExcelWriter(bio, engine="xlsxwriter") as writer:
-            df.to_excel(writer, "Data", index=False)
+            df.to_excel(writer, sheet_name="Data", index=False)
         return bio.getvalue()
 
     sio = StringIO()

diff --git a/cgi-bin/request/feel.py b/cgi-bin/request/feel.py
@@ -35,8 +35,8 @@ def fmt(val):
 
     bio = BytesIO()
     with pd.ExcelWriter(bio, engine="openpyxl") as writer:
-        df.to_excel(writer, "Daily Data", index=False)
-        df2.to_excel(writer, "Hourly Data", index=False)
+        df.to_excel(writer, sheet_name="Daily Data", index=False)
+        df2.to_excel(writer, sheet_name="Hourly Data", index=False)
 
     headers = [
         ("Content-type", EXL),

diff --git a/cgi-bin/request/gis/lsr.py b/cgi-bin/request/gis/lsr.py
@@ -82,7 +82,7 @@ def do_excel_kml(fmt, sts, ets, wfolimiter, statelimiter):
         bio = BytesIO()
         # pylint: disable=abstract-class-instantiated
         writer = pd.ExcelWriter(bio, engine="xlsxwriter")
-        df.to_excel(writer, "Local Storm Reports", index=False)
+        df.to_excel(writer, sheet_name="Local Storm Reports", index=False)
         worksheet = writer.sheets["Local Storm Reports"]
         worksheet.set_column("B:C", 36)
         worksheet.set_column("D:E", 24)

diff --git a/cgi-bin/request/gis/watchwarn.py b/cgi-bin/request/gis/watchwarn.py
@@ -207,7 +207,7 @@ def do_excel(sql):
     bio = BytesIO()
     # pylint: disable=abstract-class-instantiated
     with pd.ExcelWriter(bio, engine="xlsxwriter") as writer:
-        df.to_excel(writer, "VTEC WaWA", index=False)
+        df.to_excel(writer, sheet_name="VTEC WaWA", index=False)
     return bio.getvalue()
 
 

diff --git a/cgi-bin/request/hads.py b/cgi-bin/request/hads.py
@@ -128,7 +128,7 @@ def application(environ, start_response):
     if what == "excel":
         bio = BytesIO()
         with pd.ExcelWriter(bio, engine="openpyxl") as writer:
-            table.to_excel(writer, "Data", index=True)
+            table.to_excel(writer, sheet_name="Data", index=True)
 
         headers = [
             ("Content-type", EXL),

diff --git a/cgi-bin/request/isusm.py b/cgi-bin/request/isusm.py
@@ -380,7 +380,9 @@ def application(environ, start_response):
         # pylint: disable=abstract-class-instantiated
         if cols:
             with pd.ExcelWriter(bio, engine="xlsxwriter") as writer:
-                df.to_excel(writer, "Data", columns=cols, index=False)
+                df.to_excel(
+                    writer, sheet_name="Data", columns=cols, index=False
+                )
         headers = [
             ("Content-type", EXL),
             ("Content-disposition", "attachment; Filename=isusm.xlsx"),

diff --git a/cgi-bin/request/mos.py b/cgi-bin/request/mos.py
@@ -50,7 +50,7 @@ def get_data(sts, ets, station, model, fmt):
         bio = BytesIO()
         # pylint: disable=abstract-class-instantiated
         with pd.ExcelWriter(bio, engine="xlsxwriter") as writer:
-            df.to_excel(writer, "Data", index=False)
+            df.to_excel(writer, sheet_name="Data", index=False)
         return bio.getvalue()
 
     sio = StringIO()

diff --git a/cgi-bin/request/rwis.py b/cgi-bin/request/rwis.py
@@ -85,7 +85,7 @@ def get_lon(station):
             return [b"Dataset too large for excel format."]
         bio = BytesIO()
         with pd.ExcelWriter(bio) as writer:
-            df.to_excel(writer, "Data", index=False, columns=myvars)
+            df.to_excel(writer, sheet_name="Data", index=False, columns=myvars)
 
         headers = [
             ("Content-type", EXL),

diff --git a/cgi-bin/request/taf.py b/cgi-bin/request/taf.py
@@ -46,7 +46,7 @@ def run(start_response, ctx):
     bio = BytesIO()
     if ctx["fmt"] == "excel":
         with pd.ExcelWriter(bio, engine="openpyxl") as writer:
-            df.to_excel(writer, "TAF Data", index=False)
+            df.to_excel(writer, sheet_name="TAF Data", index=False)
         headers = [
             ("Content-type", EXL),
             ("Content-disposition", "attachment;Filename=taf.xlsx"),

diff --git a/cgi-bin/request/talltowers.py b/cgi-bin/request/talltowers.py
@@ -120,7 +120,7 @@ def application(environ, start_response):
     bio = BytesIO()
     # pylint: disable=abstract-class-instantiated
     with pd.ExcelWriter(bio, engine="xlsxwriter") as writer:
-        df.to_excel(writer, "Data", index=False)
+        df.to_excel(writer, sheet_name="Data", index=False)
     headers = [
         ("Content-type", EXL),
         ("Content-disposition", "attachment; Filename=talltowers.xlsx"),

diff --git a/cgi-bin/request/tempwind_aloft.py b/cgi-bin/request/tempwind_aloft.py
@@ -43,7 +43,7 @@ def get_data(station, sts, ets, tz, na, fmt):
     if fmt == "excel":
         bio = BytesIO()
         with pd.ExcelWriter(bio, engine="xlsxwriter") as writer:
-            df.to_excel(writer, "Data", index=False)
+            df.to_excel(writer, sheet_name="Data", index=False)
         return bio.getvalue()
 
     sio = StringIO()

diff --git a/deployment/mod_wsgi_startup.py b/deployment/mod_wsgi_startup.py
@@ -33,6 +33,9 @@ def warn_with_traceback(
     )
 
 
+# pandas 2.2 warning with fillna
+pd.set_option("future.no_silent_downcasting", True)
+
 warnings.showwarning = warn_with_traceback
 # Stop pandas UserWarning for now in prod
 if os.path.exists("/etc/IEMDEV"):

diff --git a/environment.yml b/environment.yml
@@ -36,8 +36,8 @@ dependencies:
   - odfpy
   # excel output
   - openpyxl
-  # yo
-  - pandas
+  # due to config settings
+  - pandas>=2.2
   # mod-wsgi
   - paste
   # PIL