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

{toolbox_utils-5.2.0 → 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.0 → 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.0 → toolbox_utils-5.2.2}/.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
 
     - repo: https://github.com/astral-sh/ruff-pre-commit
       # Ruff version.
-      rev: v0.9.3
+      rev: v0.12.0
       hooks:
           # Run the linter.
           - id: ruff
@@ -42,7 +42,7 @@ repos:
             types_or: [python, pyi, jupyter]
 
     - repo: https://github.com/pycqa/isort
-      rev: 6.0.0
+      rev: 6.0.1
       hooks:
           - id: isort
             name: isort (python)
@@ -60,7 +60,7 @@ repos:
             args: [--in-place, --spaces-indent-inline-array, '4']
 
     - repo: https://github.com/adrienverge/yamllint.git
-      rev: v1.35.1
+      rev: v1.37.1
       hooks:
           - id: yamllint
             args: [--format, parsable, --strict]
@@ -88,12 +88,12 @@ repos:
           - id: blacken-docs
 
     - repo: https://github.com/asottile/pyupgrade
-      rev: v3.19.1
+      rev: v3.20.0
       hooks:
           - id: pyupgrade
 
     - repo: https://github.com/commitizen-tools/commitizen
-      rev: v4.1.1
+      rev: v4.8.3
       hooks:
           - id: commitizen
             stages: [commit-msg]

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

@@ -1,3 +1,17 @@
+## 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
+
+- fix entries in pandas_offset_by_version
+- use pandas_offset_by_version to set offsets within toolbox_utils
+
 ## v5.2.0 (2025-05-10)
 
 ### Feat

{toolbox_utils-5.2.0 → toolbox_utils-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toolbox_utils
-Version: 5.2.0
+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.0 → 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.0"
+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.0 → toolbox_utils-5.2.2}/src/toolbox_utils/tsutils.py

@@ -52,6 +52,99 @@ def pandas_offset_by_version(new_offset: str) -> str:
     """
     Convert the time offset code to match the version of pandas.
 
+    +------------------------+--------+---------+-----------------------------+
+    | DateOffset             | less   | greater | Generic offset class,       |
+    |                        | 2.2    | equal   | defaults to absolute 24     |
+    |                        |        | 2.2     | hours                       |
+    +========================+========+=========+=============================+
+    | BDay or BusinessDay    | 'B'    | 'B'     | business day (weekday)      |
+    +------------------------+--------+---------+-----------------------------+
+    | CDay or                | 'C'    | 'C'     | custom business day         |
+    | CustomBusinessDay      |        |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | Week                   | 'W'    | 'W'     | one week, optionally        |
+    |                        |        |         | anchored on a day of the    |
+    |                        |        |         | week                        |
+    +------------------------+--------+---------+-----------------------------+
+    | WeekOfMonth            | 'WOM'  | 'WOM'   | the x-th day of the y-th    |
+    |                        |        |         | week of each month          |
+    +------------------------+--------+---------+-----------------------------+
+    | LastWeekOfMonth        | 'LWOM' | 'LWOM'  | the x-th day of the last    |
+    |                        |        |         | week of each month          |
+    +------------------------+--------+---------+-----------------------------+
+    | MonthEnd               | 'M'    | 'ME'    | calendar month end          |
+    +------------------------+--------+---------+-----------------------------+
+    | MonthBegin             | 'MS'   | 'MS'    | calendar month begin        |
+    +------------------------+--------+---------+-----------------------------+
+    | BMonthEnd or           | 'BM'   | 'BME'   | business month end          |
+    | BusinessMonthEnd       |        |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | BMonthBegin or         | 'BMS'  | 'BMS'   | business month begin        |
+    | BusinessMonthBegin     |        |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | CBMonthEnd or          | 'CBM'  | 'CBME'  | custom business month end   |
+    | CustomBusinessMonthEnd |        |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | CBMonthBegin or        | 'CBMS' | 'CBMS'  | custom business month begin |
+    | CustomBusinessMonthBeg |        |         |                             |
+    | in                     |        |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | SemiMonthEnd           | 'SM'   | 'SME'   | 15th (or other              |
+    |                        |        |         | day_of_month) and calendar  |
+    |                        |        |         | month end                   |
+    +------------------------+--------+---------+-----------------------------+
+    | SemiMonthBegin         | 'SMS'  | 'SMS'   | 15th (or other              |
+    |                        |        |         | day_of_month) and calendar  |
+    |                        |        |         | month begin                 |
+    +------------------------+--------+---------+-----------------------------+
+    | QuarterEnd             | 'Q'    | 'QE'    | calendar quarter end        |
+    +------------------------+--------+---------+-----------------------------+
+    | QuarterBegin           | 'QS'   | 'QS'    | calendar quarter begin      |
+    +------------------------+--------+---------+-----------------------------+
+    | BQuarterEnd            | 'BQ    | 'BQE'   | business quarter end        |
+    +------------------------+--------+---------+-----------------------------+
+    | BQuarterBegin          | 'BQS'  | 'BQS'   | business quarter begin      |
+    +------------------------+--------+---------+-----------------------------+
+    | FY5253Quarter          | 'REQ'  | 'REQ'   | retail (aka 52-53 week)     |
+    |                        |        |         | quarter                     |
+    +------------------------+--------+---------+-----------------------------+
+    | YearEnd                | 'A'    | 'YE'    | calendar year end           |
+    +------------------------+--------+---------+-----------------------------+
+    | YearBegin              | 'AS'   | 'YS' or | calendar year begin         |
+    |                        | or     | 'BYS'   |                             |
+    |                        | 'BYS'  |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | BYearEnd               | 'BA'   | 'BYE'   | business year end           |
+    +------------------------+--------+---------+-----------------------------+
+    | BYearBegin             | 'BAS'  | 'BYS'   | business year begin         |
+    +------------------------+--------+---------+-----------------------------+
+    | FY5253                 | 'RE'   | 'RE'    | retail (aka 52-53 week)     |
+    |                        |        |         | year                        |
+    +------------------------+--------+---------+-----------------------------+
+    | Easter                 | None   |         | Easter holiday              |
+    +------------------------+--------+---------+-----------------------------+
+    | BusinessHour           | 'BH'   | 'bh'    | business hour               |
+    +------------------------+--------+---------+-----------------------------+
+    | CustomBusinessHour     | 'CBH'  | 'cbh'   | custom business hour        |
+    +------------------------+--------+---------+-----------------------------+
+    | Day                    | 'D'    | 'D'     | one absolute day            |
+    +------------------------+--------+---------+-----------------------------+
+    | Hour                   | 'H'    | 'h'     | one hour                    |
+    +------------------------+--------+---------+-----------------------------+
+    | Minute                 | 'T' or | 'min'   | one minute                  |
+    |                        | 'min'  |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | Second                 | 'S'    | 's'     | one second                  |
+    +------------------------+--------+---------+-----------------------------+
+    | Milli                  | 'L' or | 'ms'    | one millisecond             |
+    |                        | 'ms'   |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | Micro                  | 'U' or | 'us'    | one microsecond             |
+    |                        | 'us'   |         |                             |
+    +------------------------+--------+---------+-----------------------------+
+    | Nano                   | 'N'    | 'ns'    | one nanosecond              |
+    +------------------------+--------+---------+-----------------------------+
+
     Parameters
     ----------
     offset
@@ -66,17 +159,43 @@ def pandas_offset_by_version(new_offset: str) -> str:
     major, minor = pd.__version__.split(".")[:2]
     if (int(major) + int(minor) / 10) < 2.2:
         new_to_old_freq = {
-            "Y": "A",
             "ME": "M",
             "BME": "BM",
-            "SME": "SM",
             "CBME": "CBM",
+            "SME": "SM",
             "QE": "Q",
+            "QE-JAN": "Q-JAN",
+            "QE-FEB": "Q-FEB",
+            "QE-MAR": "Q-MAR",
+            "QE-APR": "Q-APR",
+            "QE-MAY": "Q-MAY",
+            "QE-JUN": "Q-JUN",
+            "QE-JUL": "Q-JUL",
+            "QE-AUG": "Q-AUG",
+            "QE-SEP": "Q-SEP",
+            "QE-OCT": "Q-OCT",
+            "QE-NOV": "Q-NOV",
+            "QE-DEC": "Q-DEC",
             "BQE": "BQ",
-            "BYE": "BY",
-            "h": "H",
+            "BQE-JAN": "BQ-JAN",
+            "BQE-FEB": "BQ-FEB",
+            "BQE-MAR": "BQ-MAR",
+            "BQE-APR": "BQ-APR",
+            "BQE-MAY": "BQ-MAY",
+            "BQE-JUN": "BQ-JUN",
+            "BQE-JUL": "BQ-JUL",
+            "BQE-AUG": "BQ-AUG",
+            "BQE-SEP": "BQ-SEP",
+            "BQE-OCT": "BQ-OCT",
+            "BQE-NOV": "BQ-NOV",
+            "BQE-DEC": "BQ-DEC",
+            "YE": "A",
+            "YS": "AS",
+            "BYE": "BA",
+            "BYS": "BAS",
             "bh": "BH",
             "cbh": "CBH",
+            "h": "H",
             "min": "T",
             "s": "S",
             "ms": "L",
@@ -1816,17 +1935,17 @@ def asbestfreq(data: DataFrame, force_freq: Optional[str] = None) -> DataFrame:
     ndiff = sorted(set(ndiff))
     ngcd = ndiff[0] if len(ndiff) == 1 else reduce(gcd, ndiff)
     if ngcd < 1000:
-        infer_freq = f"{ngcd}N"
+        infer_freq = f"{ngcd}{pandas_offset_by_version('ns')}"
     elif ngcd < 1000000:
-        infer_freq = f"{ngcd // 1000}U"
+        infer_freq = f"{ngcd // 1000}{pandas_offset_by_version('us')}"
     elif ngcd < 1000000000:
-        infer_freq = f"{ngcd // 1000000}L"
+        infer_freq = f"{ngcd // 1000000}{pandas_offset_by_version('ms')}"
     elif ngcd < 60000000000:
-        infer_freq = f"{ngcd // 1000000000}S"
+        infer_freq = f"{ngcd // 1000000000}{pandas_offset_by_version('s')}"
     elif ngcd < 3600000000000:
-        infer_freq = f"{ngcd // 60000000000}T"
+        infer_freq = f"{ngcd // 60000000000}{pandas_offset_by_version('min')}"
     elif ngcd < 86400000000000:
-        infer_freq = f"{ngcd // 3600000000000}H"
+        infer_freq = f"{ngcd // 3600000000000}{pandas_offset_by_version('h')}"
     elif ngcd < 604800000000000:
         infer_freq = f"{ngcd // 86400000000000}D"
     elif ngcd < 2419200000000000:
@@ -2556,7 +2675,7 @@ def read_iso_ts(
 
     if len(lresult_list) > 1:
         epoch = pd.to_datetime("2000-01-01")
-        moffset = epoch + to_offset("A")
+        moffset = epoch + to_offset(pandas_offset_by_version("YE"))
         offset_set = set()
 
         for res in lresult_list:

{toolbox_utils-5.2.0 → 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.0
+Version: 5.2.2
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause