toolbox-utils 5.2.1__tar.gz → 5.2.2__tar.gz

{toolbox_utils-5.2.1 → toolbox_utils-5.2.2}/.github/workflows/pypi-package.yml

@@ -28,7 +28,7 @@ jobs:
 
         steps:
             - name: Checkout source
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
               with:
                   submodules: recursive
 
@@ -38,7 +38,7 @@ jobs:
                   python -m build
 
             - name: Download artifact
-              uses: actions/download-artifact@v4
+              uses: actions/download-artifact@v6
               with:
                   path: dist
                   merge-multiple: true

{toolbox_utils-5.2.1 → toolbox_utils-5.2.2}/.github/workflows/tests.yml

@@ -55,12 +55,12 @@ jobs:
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v4
+              uses: actions/checkout@v5
               with:
                   submodules: recursive
 
             - name: Set up Python ${{ matrix.python-versions }}
-              uses: actions/setup-python@v5
+              uses: actions/setup-python@v6
               with:
                   python-version: ${{ matrix.python-versions }}
 

{toolbox_utils-5.2.1 → toolbox_utils-5.2.2}/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v5.2.2 (2025-11-13)
+
+### Fix
+
+- use .where instead of .replace to avoid RecursionError in pandas 1.5.x
+- fixed PLTGEN reader
+
 ## v5.2.1 (2025-07-20)
 
 ### Fix

{toolbox_utils-5.2.1/src/toolbox_utils.egg-info → toolbox_utils-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolbox_utils
-Version: 5.2.1
+Version: 5.2.2
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause

toolbox_utils-5.2.2/VERSION

@@ -0,0 +1 @@
+5.2.2

{toolbox_utils-5.2.1 → toolbox_utils-5.2.2}/pyproject.toml

@@ -65,7 +65,7 @@ bitbucket = "https://bitbucket.org/timcera/toolbox_utils/src/main/"
 name = "cz_conventional_commits"
 tag_format = "v$version"
 update_changelog_on_bump = true
-version = "5.2.1"
+version = "5.2.2"
 version_files = ["VERSION"]
 
 [tool.isort]

toolbox_utils-5.2.2/src/toolbox_utils/readers/plotgen.py

@@ -0,0 +1,45 @@
+"""For reading HSPF plotgen files."""
+
+import pandas as pd
+
+
+def plotgen_extract(filename):
+    """Reads HSPF PLTGEN files and creates a DataFrame."""
+    found_column_names = False
+    column_names = []
+    with open(filename, encoding="ascii") as fpointer:
+        for i, line in enumerate(fpointer):
+            if "LINTYP" in line:
+                found_column_names = True
+                continue
+            if line[5:].startswith("Time series"):
+                break
+            if found_column_names:
+                if column_name := line[4:30].strip():
+                    column_names.append(column_name)
+                    continue
+
+        pgdf = pd.read_fwf(
+            fpointer,
+            colspecs=[(5, 10), (10, 13), (13, 16), (16, 19), (19, 22)]
+            + [(22 + i * 14, 36 + i * 14) for i in range(len(column_names))],
+            skiprows=3,
+            names=["Year", "Month", "Day", "Hour", "Minute"] + column_names,
+        )
+
+    # .replace causes RecursionError in 1.5.* versions of pandas and so use
+    # .where instead.
+    pgdf = pgdf.where(pgdf != -1e30, pd.NA).dropna(how="all", subset=column_names)
+
+    # Can't let read_fwf parse dates because HSPF can use 24:00 for midnight of
+    # the following day, where pandas can't work with that. So we create
+    # manually here by creating an HH:MM delta and adding to the date.
+    pgdf["delta"] = pd.to_timedelta(
+        pgdf["Hour"].astype(int), unit="h"
+    ) + pd.to_timedelta(pgdf["Minute"].astype(int), unit="m")
+    pgdf["Datetime"] = pd.to_datetime(pgdf[["Year", "Month", "Day"]]) + pgdf["delta"]
+
+    pgdf = pgdf.drop(columns=["Year", "Month", "Day", "Hour", "Minute", "delta"])
+    pgdf = pgdf.set_index(["Datetime"])
+
+    return pgdf

{toolbox_utils-5.2.1 → toolbox_utils-5.2.2/src/toolbox_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolbox_utils
-Version: 5.2.1
+Version: 5.2.2
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause