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

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

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

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

@@ -21,46 +21,36 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest, macos-latest, windows-latest]
-                python-versions: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
-                pandas-versions: [1.5.3, 2.0.0, 2.2.0, 2.2.3]
-                toolchain:
-                    - {compiler: gcc, version: 13}
+                python-versions: ['3.10', '3.11', '3.12', '3.13', '3.14']
+                pandas-versions: [pandas==1.*, pandas==2.*, pandas==3.*]
+                numpy-versions: [numpy==1.*, numpy==2.*]
+
                 exclude:
+                    - python-versions: '3.12'
+                      pandas-versions: pandas==1.*
                     - python-versions: '3.13'
-                      pandas-versions: 1.5.3
-                    - python-versions: '3.13'
-                      pandas-versions: 2.0.0
+                      pandas-versions: pandas==1.*
+                    - python-versions: '3.14'
+                      pandas-versions: pandas==1.*
+                    - python-versions: '3.12'
+                      numpy-versions: numpy==1.*
                     - python-versions: '3.13'
-                      pandas-versions: 2.2.0
-                    - python-versions: '3.8'
-                      pandas-versions: 2.2.0
-                    - python-versions: '3.8'
-                      pandas-versions: 2.2.3
-                    - os: windows-latest
-                      python-versions: '3.8'
-                    - os: windows-latest
-                      python-versions: '3.9'
-                      pandas-versions: 2.2.0
-                    - os: windows-latest
-                      python-versions: '3.10'
-                      pandas-versions: 2.2.0
-                    - os: windows-latest
-                      python-versions: '3.11'
-                      pandas-versions: 2.2.0
-                    - os: windows-latest
-                      python-versions: '3.12'
-                      pandas-versions: 2.2.0
-                    - os: windows-latest
-                      python-versions: '3.13'
+                      numpy-versions: numpy==1.*
+                    - python-versions: '3.14'
+                      numpy-versions: numpy==1.*
+                    - pandas-versions: pandas==1.*
+                      numpy-versions: numpy==2.*
+                    - python-versions: '3.10'
+                      pandas-versions: pandas==3.*
 
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
               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 }}
 
@@ -74,10 +64,12 @@ jobs:
                   version ${{ matrix.pandas-versions }}
               run: >
                   python -m pip install
-                  pandas==${{ matrix.pandas-versions }} 'numpy<2' .
+                  '${{ matrix.pandas-versions }}'
+                  '${{ matrix.numpy-versions }}' .
 
             - name: Test with pytest
-              run: python -m pytest --cov
+              run: |
+                  python -m pytest --cov
 
             - name: Upload coverage data to coveralls.io
               uses: coverallsapp/github-action@v2

{toolbox_utils-5.2.1 → toolbox_utils-5.2.3}/.pre-commit-config.yaml

@@ -11,7 +11,7 @@ exclude: |
 
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v5.0.0
+      rev: v6.0.0
       hooks:
           - id: check-case-conflict
           - id: check-docstring-first
@@ -23,15 +23,13 @@ repos:
           - id: check-xml
           - id: end-of-file-fixer
             exclude: notebooks/tstoolbox_plot_bash.sh
-          - id: fix-encoding-pragma
-            args: [--remove]
           - id: mixed-line-ending
           - id: trailing-whitespace
             exclude: notebooks/tstoolbox_plot_bash.sh
 
     - repo: https://github.com/astral-sh/ruff-pre-commit
       # Ruff version.
-      rev: v0.12.0
+      rev: v0.15.2
       hooks:
           # Run the linter.
           - id: ruff
@@ -42,7 +40,7 @@ repos:
             types_or: [python, pyi, jupyter]
 
     - repo: https://github.com/pycqa/isort
-      rev: 6.0.1
+      rev: 8.0.0
       hooks:
           - id: isort
             name: isort (python)
@@ -54,13 +52,13 @@ repos:
             types: [pyi]
 
     - repo: https://github.com/pappasam/toml-sort
-      rev: v0.24.2
+      rev: v0.24.3
       hooks:
           - id: toml-sort-fix
             args: [--in-place, --spaces-indent-inline-array, '4']
 
     - repo: https://github.com/adrienverge/yamllint.git
-      rev: v1.37.1
+      rev: v1.38.0
       hooks:
           - id: yamllint
             args: [--format, parsable, --strict]
@@ -77,23 +75,23 @@ repos:
             args: [-s, bash]
 
     - repo: https://github.com/lovesegfault/beautysh
-      rev: v6.2.1
+      rev: v6.4.2
       hooks:
           - id: beautysh
             args: [--indent-size, '4']
 
     - repo: https://github.com/asottile/blacken-docs
-      rev: 1.19.1
+      rev: 1.20.0
       hooks:
           - id: blacken-docs
 
     - repo: https://github.com/asottile/pyupgrade
-      rev: v3.20.0
+      rev: v3.21.2
       hooks:
           - id: pyupgrade
 
     - repo: https://github.com/commitizen-tools/commitizen
-      rev: v4.8.3
+      rev: v4.13.8
       hooks:
           - id: commitizen
             stages: [commit-msg]

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

@@ -1,3 +1,24 @@
+## v5.2.3 (2026-03-06)
+
+### Fix
+
+- additional checks for RecursionError
+- wrap the RecursionError in a try/except block
+- test to fix recursive error with older version of numpy/pandas
+- possible fix for recursion problem with older numpy/pandas
+- include support for pandas 3.0
+- another fix for time offset differences by pandas versions
+- fixed wdm pandas offsets
+- use .where instead of .replace to avoid RecursionError in pandas 1.5.x
+- fixed PLTGEN reader
+
+## 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.3}/PKG-INFO

@@ -1,38 +1,38 @@
 Metadata-Version: 2.4
 Name: toolbox_utils
-Version: 5.2.1
+Version: 5.2.3
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause
+Project-URL: bitbucket, https://bitbucket.org/timcera/toolbox_utils/src/main/
 Project-URL: documentation, https://timcera.bitbucket.io/toolbox_utils/docs/index.html#toolbox_utils-documentation
 Project-URL: github, https://github.com/timcera/toolbox_utils
-Project-URL: bitbucket, https://bitbucket.org/timcera/toolbox_utils/src/main/
-Keywords: time-series,cli-app,aggregate,fill,filter
+Keywords: aggregate,cli-app,fill,filter,time-series
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Science/Research
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Developers
 Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: dateparser
-Requires-Dist: numpy<2.0,>=1.20; python_version <= "3.9"
+Requires-Dist: numpy
 Requires-Dist: openpyxl
 Requires-Dist: pandas[excel]
-Requires-Dist: pint!=0.21.*,<0.22; python_version < "3.9"
+Requires-Dist: pint
 Requires-Dist: pint-pandas
 Requires-Dist: pydantic
 Requires-Dist: scipy

toolbox_utils-5.2.3/VERSION

@@ -0,0 +1 @@
+5.2.3

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

@@ -1,71 +1,67 @@
 [build-system]
 build-backend = "setuptools.build_meta"
 requires = [
-    "setuptools>=45",
-    "setuptools_scm[toml]>=6.2",
-    "wheel"
+    "setuptools-scm[simple]>=8",
+    "setuptools>=80"
 ]
 
 [project]
-name = "toolbox_utils"
-dynamic = ["readme", "version"]
-description = "Python toolbox for common utilities"
-dependencies = [
-    "dateparser",
-    "numpy >= 1.20, < 2.0 ; python_version <= '3.9'",
-    "openpyxl",
-    "pandas[excel]",
-    "pint != 0.21.*, < 0.22 ; python_version < '3.9'",
-    "pint-pandas",
-    "pydantic",
-    "scipy",
-    "tabulate"
-]
-# Unused dependencies found: matplotlib, odfpy, openpyxl, pint, pyxlsb, tables,
-# typing-extensions, xlrd, xlsxwriter that should be added to the projects that
-# depend on this toolbox_utils.
 authors = [
-    {name = "Tim Cera", email = "tim@cerazone.net"}
+    {email = "tim@cerazone.net", name = "Tim Cera"}
 ]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Science/Research",
-    "Intended Audience :: End Users/Desktop",
-    "Intended Audience :: Developers",
     "Environment :: Console",
+    "Intended Audience :: Developers",
+    "Intended Audience :: End Users/Desktop",
+    "Intended Audience :: Science/Research",
     "License :: OSI Approved :: BSD License",
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Scientific/Engineering :: Information Analysis",
     "Topic :: Scientific/Engineering",
     "Topic :: Software Development :: Libraries :: Python Modules"
+] # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+dependencies = [
+    "dateparser",
+    "numpy",
+    "openpyxl",
+    "pandas[excel]",
+    "pint",
+    "pint-pandas",
+    "pydantic",
+    "scipy",
+    "tabulate"
 ]
+description = "Python toolbox for common utilities"
+dynamic = ["readme", "version"]
 keywords = [
-    "time-series",
-    "cli-app",
     "aggregate",
+    "cli-app",
     "fill",
-    "filter"
+    "filter",
+    "time-series"
 ]
 license = {text = "BSD-3-Clause"}
-requires-python = ">=3.8"
+name = "toolbox_utils"
+requires-python = ">=3.10"
 
 [project.urls]
+bitbucket = "https://bitbucket.org/timcera/toolbox_utils/src/main/"
 documentation = "https://timcera.bitbucket.io/toolbox_utils/docs/index.html#toolbox_utils-documentation"
 github = "https://github.com/timcera/toolbox_utils"
-bitbucket = "https://bitbucket.org/timcera/toolbox_utils/src/main/"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
 tag_format = "v$version"
 update_changelog_on_bump = true
-version = "5.2.1"
+version = "5.2.3"
 version_files = ["VERSION"]
 
 [tool.isort]
@@ -75,8 +71,8 @@ profile = "black"
 testpaths = ["tests"]
 
 [tool.setuptools]
-license-files = ["LICENSE.txt"]
 include-package-data = true
+license-files = ["LICENSE.txt"]
 
 [tool.setuptools.dynamic]
 readme = {file = "README.rst"}
@@ -84,5 +80,3 @@ version = {file = "VERSION"}
 
 [tool.setuptools.packages.find]
 where = ["src"]
-
-[tool.setuptools_scm]

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

@@ -0,0 +1,43 @@
+"""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)
+        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.3}/src/toolbox_utils/readers/wdm.py

@@ -7,6 +7,8 @@ from datetime import datetime
 import numpy as np
 import pandas as pd
 
+from ..utils import pandas_offset_by_version
+
 # look up attributes NAME, data type (Integer; Real; String) and data length by attribute number
 attrinfo = {
     1: ("TSTYPE", "S", 4),
@@ -37,13 +39,13 @@ attrinfo = {
 }
 
 freq = {
-    7: "100YS",
-    6: "YS",
-    5: "MS",
-    4: "D",
-    3: "H",
-    2: "min",
-    1: "S",
+    7: f"100{pandas_offset_by_version('YS')}",
+    6: pandas_offset_by_version("YS"),
+    5: pandas_offset_by_version("MS"),
+    4: pandas_offset_by_version("D"),
+    3: pandas_offset_by_version("h"),
+    2: pandas_offset_by_version("min"),
+    1: pandas_offset_by_version("s"),
 }  # pandas date_range() frequency by TCODE, TGROUP