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

toolbox_utils-5.2.0/.github/dependabot.yml

@@ -0,0 +1,7 @@
+---
+version: 2
+updates:
+    - package-ecosystem: github-actions
+      directory: /
+      schedule:
+          interval: weekly

toolbox_utils-5.2.0/.github/workflows/pypi-package.yml

@@ -0,0 +1,49 @@
+---
+# This workflow will install Python dependencies, run tests and lint with
+# a variety of Python versions For more information see:
+# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: PyPI package tests
+
+on:  # yamllint disable-line rule:truthy
+    push:
+        branches: [main]
+    pull_request:
+        branches: [main]
+    workflow_dispatch:
+
+jobs:
+    tests:
+        uses: ./.github/workflows/tests.yml
+
+    pypi-publish:
+        needs: tests
+        runs-on: ubuntu-latest
+        environment: release
+        name: upload release to PyPI
+
+        permissions:
+            # IMPORTANT: this permission is mandatory for trusted publishing
+            id-token: write
+
+        steps:
+            - name: Checkout source
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Build sdist and wheel
+              run: |
+                  python -m pip install build
+                  python -m build
+
+            - name: Download artifact
+              uses: actions/download-artifact@v4
+              with:
+                  path: dist
+                  merge-multiple: true
+
+            - name: Publish package distributions to PyPI
+              uses: pypa/gh-action-pypi-publish@release/v1
+              with:
+                  skip-existing: true

toolbox_utils-5.2.0/.github/workflows/tests.yml

@@ -0,0 +1,95 @@
+---
+# This workflow will install Python dependencies, run tests and lint with
+# a variety of Python versions For more information see:
+# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Tests
+
+on:  # yamllint disable-line rule:truthy
+    push:
+        branches: [develop]
+    pull_request:
+        branches: [develop]
+    workflow_dispatch:
+    workflow_call:
+
+jobs:
+    test:
+        runs-on: ${{ matrix.os }}
+
+        strategy:
+            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}
+                exclude:
+                    - python-versions: '3.13'
+                      pandas-versions: 1.5.3
+                    - python-versions: '3.13'
+                      pandas-versions: 2.0.0
+                    - 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'
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Set up Python ${{ matrix.python-versions }}
+              uses: actions/setup-python@v5
+              with:
+                  python-version: ${{ matrix.python-versions }}
+
+            - name: Install dependencies pytest
+              run: |
+                  python -m pip install --upgrade pip
+                  python -m pip install pytest pytest-cov
+
+            - name: >
+                  Install package and dependencies
+                  version ${{ matrix.pandas-versions }}
+              run: >
+                  python -m pip install
+                  pandas==${{ matrix.pandas-versions }} 'numpy<2' .
+
+            - name: Test with pytest
+              run: python -m pytest --cov
+
+            - name: Upload coverage data to coveralls.io
+              uses: coverallsapp/github-action@v2
+              with:
+                  parallel: true
+
+    finish:
+        needs: test
+        if: ${{ always() }}
+        runs-on: ubuntu-latest
+        steps:
+            - name: Coveralls Finished
+              uses: coverallsapp/github-action@v2
+              with:
+                  parallel-finished: true

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/.pre-commit-config.yaml

@@ -2,9 +2,16 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 
+exclude: |
+    (?x)^(
+        .*\.dods|
+        .*\.dmr|
+        .*\.dmd
+        )$
+
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.5.0
+      rev: v5.0.0
       hooks:
           - id: check-case-conflict
           - id: check-docstring-first
@@ -22,8 +29,32 @@ repos:
           - id: trailing-whitespace
             exclude: notebooks/tstoolbox_plot_bash.sh
 
+    - repo: https://github.com/astral-sh/ruff-pre-commit
+      # Ruff version.
+      rev: v0.9.3
+      hooks:
+          # Run the linter.
+          - id: ruff
+            types_or: [python, pyi, jupyter]
+            args: [--fix]
+          # Run the formatter.
+          - id: ruff-format
+            types_or: [python, pyi, jupyter]
+
+    - repo: https://github.com/pycqa/isort
+      rev: 6.0.0
+      hooks:
+          - id: isort
+            name: isort (python)
+          - id: isort
+            name: isort (cython)
+            types: [cython]
+          - id: isort
+            name: isort (pyi)
+            types: [pyi]
+
     - repo: https://github.com/pappasam/toml-sort
-      rev: v0.23.1
+      rev: v0.24.2
       hooks:
           - id: toml-sort-fix
             args: [--in-place, --spaces-indent-inline-array, '4']
@@ -51,45 +82,18 @@ repos:
           - id: beautysh
             args: [--indent-size, '4']
 
-    - repo: https://github.com/psf/black
-      rev: 24.3.0
-      hooks:
-          - id: black
-          - id: black-jupyter
-
-    - repo: https://github.com/pycqa/isort
-      rev: 5.13.2
-      hooks:
-          - id: isort
-            name: isort (python)
-            args: [--profile, black, --filter-files]
-          - id: isort
-            name: isort (cython)
-            types: [cython]
-            args: [--profile, black, --filter-files]
-          - id: isort
-            name: isort (pyi)
-            types: [pyi]
-            args: [--profile, black, --filter-files]
-
     - repo: https://github.com/asottile/blacken-docs
-      rev: 1.16.0
+      rev: 1.19.1
       hooks:
           - id: blacken-docs
 
     - repo: https://github.com/asottile/pyupgrade
-      rev: v3.15.2
+      rev: v3.19.1
       hooks:
           - id: pyupgrade
 
     - repo: https://github.com/commitizen-tools/commitizen
-      rev: v3.21.3
+      rev: v4.1.1
       hooks:
           - id: commitizen
             stages: [commit-msg]
-
-    - repo: https://github.com/mwouts/jupytext
-      rev: v1.16.1
-      hooks:
-          - id: jupytext
-            args: [--from, ipynb, --to, auto:percent, --sync]

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/BADGES.rst

@@ -18,11 +18,6 @@
     :target: https://pypi.python.org/pypi/toolbox_utils/
     :height: 20
 
-.. image:: http://img.shields.io/pypi/dd/toolbox_utils.svg
-    :alt: toolbox_utils downloads
-    :target: https://pypi.python.org/pypi/toolbox_utils/
-    :height: 20
-
 .. image:: https://img.shields.io/pypi/pyversions/toolbox_utils
     :alt: PyPI - Python Version
     :target: https://pypi.org/project/toolbox_utils/

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

@@ -1,3 +1,20 @@
+## v5.2.0 (2025-05-10)
+
+### Feat
+
+- added pandas_offset_by_version function
+
+## v5.1.4 (2024-06-24)
+
+### Fix
+
+- finally a version of re.split that does what I want
+- remove debugging print function call
+- only use re.split on strings
+- fix issues from removing tssplit
+- fix representation of dataframes as input_ts
+- fix of parsing list in strings
+
 ## v5.1.3 (2024-06-08)
 
 ### Fix

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: toolbox_utils
-Version: 5.1.3
+Version: 5.2.0
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause
@@ -29,39 +29,15 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: dateparser
-Requires-Dist: numpy
+Requires-Dist: numpy<2.0,>=1.20; python_version <= "3.9"
+Requires-Dist: openpyxl
 Requires-Dist: pandas[excel]
-Requires-Dist: pint!=0.21.*
-Requires-Dist: pint<0.22; python_version < "3.9"
+Requires-Dist: pint!=0.21.*,<0.22; python_version < "3.9"
 Requires-Dist: pint-pandas
 Requires-Dist: pydantic
 Requires-Dist: scipy
 Requires-Dist: tabulate
-Provides-Extra: dev
-Requires-Dist: bandit; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: blacken-docs; extra == "dev"
-Requires-Dist: black-nbconvert; extra == "dev"
-Requires-Dist: cleanpy; extra == "dev"
-Requires-Dist: commitizen; extra == "dev"
-Requires-Dist: coverage[toml]; extra == "dev"
-Requires-Dist: isort; extra == "dev"
-Requires-Dist: mypy; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pyflakes; extra == "dev"
-Requires-Dist: pylama; extra == "dev"
-Requires-Dist: pyle; extra == "dev"
-Requires-Dist: pylint; extra == "dev"
-Requires-Dist: pyre; extra == "dev"
-Requires-Dist: pyroma; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-mpl; extra == "dev"
-Requires-Dist: pyupgrade; extra == "dev"
-Requires-Dist: twine; extra == "dev"
-Requires-Dist: unimport; extra == "dev"
-Requires-Dist: velin; extra == "dev"
-Requires-Dist: vulture; extra == "dev"
+Dynamic: license-file
 
 .. image:: https://github.com/timcera/toolbox_utils/actions/workflows/pypi-package.yml/badge.svg
     :alt: Tests
@@ -83,11 +59,6 @@ Requires-Dist: vulture; extra == "dev"
     :target: https://pypi.python.org/pypi/toolbox_utils/
     :height: 20
 
-.. image:: http://img.shields.io/pypi/dd/toolbox_utils.svg
-    :alt: toolbox_utils downloads
-    :target: https://pypi.python.org/pypi/toolbox_utils/
-    :height: 20
-
 .. image:: https://img.shields.io/pypi/pyversions/toolbox_utils
     :alt: PyPI - Python Version
     :target: https://pypi.org/project/toolbox_utils/

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/README.rst

@@ -18,11 +18,6 @@
     :target: https://pypi.python.org/pypi/toolbox_utils/
     :height: 20
 
-.. image:: http://img.shields.io/pypi/dd/toolbox_utils.svg
-    :alt: toolbox_utils downloads
-    :target: https://pypi.python.org/pypi/toolbox_utils/
-    :height: 20
-
 .. image:: https://img.shields.io/pypi/pyversions/toolbox_utils
     :alt: PyPI - Python Version
     :target: https://pypi.org/project/toolbox_utils/

toolbox_utils-5.2.0/VERSION

@@ -0,0 +1 @@
+5.2.0

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/pyproject.toml

@@ -3,8 +3,7 @@ build-backend = "setuptools.build_meta"
 requires = [
     "setuptools>=45",
     "setuptools_scm[toml]>=6.2",
-    "wheel",
-    "oldest-supported-numpy"
+    "wheel"
 ]
 
 [project]
@@ -13,10 +12,10 @@ dynamic = ["readme", "version"]
 description = "Python toolbox for common utilities"
 dependencies = [
     "dateparser",
-    "numpy",
+    "numpy >= 1.20, < 2.0 ; python_version <= '3.9'",
+    "openpyxl",
     "pandas[excel]",
-    "pint!=0.21.*",
-    "pint<0.22; python_version < '3.9'",
+    "pint != 0.21.*, < 0.22 ; python_version < '3.9'",
     "pint-pandas",
     "pydantic",
     "scipy",
@@ -57,57 +56,24 @@ keywords = [
 license = {text = "BSD-3-Clause"}
 requires-python = ">=3.8"
 
-[project.optional-dependencies]
-dev = [
-    "bandit",
-    "black",
-    "blacken-docs",
-    "black-nbconvert",
-    "cleanpy",
-    "commitizen",
-    "coverage[toml]",
-    "isort",
-    "mypy",
-    "pre-commit",
-    "pyflakes",
-    "pylama",
-    "pyle",
-    "pylint",
-    "pyre",
-    "pyroma",
-    "pytest",
-    "pytest-cov",
-    "pytest-mpl",
-    "pyupgrade",
-    "twine",
-    "unimport",
-    "velin",
-    "vulture"
-]
-
 [project.urls]
 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.check-manifest]
-ignore = [
-    "docs/_function_autosummary/*",
-    ".coverage",
-    ".deepsource.toml",
-    ".ipynb_checkpoints/*"
-]
-
 [tool.commitizen]
 name = "cz_conventional_commits"
 tag_format = "v$version"
 update_changelog_on_bump = true
-version = "5.1.3"
+version = "5.2.0"
 version_files = ["VERSION"]
 
 [tool.isort]
 profile = "black"
 
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
 [tool.setuptools]
 license-files = ["LICENSE.txt"]
 include-package-data = true
@@ -117,7 +83,6 @@ readme = {file = "README.rst"}
 version = {file = "VERSION"}
 
 [tool.setuptools.packages.find]
-exclude = ["tests*", "examples*", "tools*", "docs*", "toolbox_utils.tests*"]
 where = ["src"]
 
 [tool.setuptools_scm]

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/src/toolbox_utils/tsutils.py

@@ -6,7 +6,9 @@ import gzip
 import inspect
 import os
 import platform
+import re
 import sys
+from ast import literal_eval
 from collections import OrderedDict
 from contextlib import suppress
 from functools import reduce, wraps
@@ -46,6 +48,56 @@ from .readers.wdm import wdm_extract as wdm
 _ = pint_pandas.version("pint")
 
 
+def pandas_offset_by_version(new_offset: str) -> str:
+    """
+    Convert the time offset code to match the version of pandas.
+
+    Parameters
+    ----------
+    offset
+        The offset to convert.
+
+    Returns
+    -------
+    offset_by_version
+        The offset converted to the correct version of pandas.
+    """
+    new_to_old_freq = {}
+    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",
+            "QE": "Q",
+            "BQE": "BQ",
+            "BYE": "BY",
+            "h": "H",
+            "bh": "BH",
+            "cbh": "CBH",
+            "min": "T",
+            "s": "S",
+            "ms": "L",
+            "us": "U",
+            "ns": "N",
+            "YE-JAN": "A-JAN",
+            "YE-FEB": "A-FEB",
+            "YE-MAR": "A-MAR",
+            "YE-APR": "A-APR",
+            "YE-MAY": "A-MAY",
+            "YE-JUN": "A-JUN",
+            "YE-JUL": "A-JUL",
+            "YE-AUG": "A-AUG",
+            "YE-SEP": "A-SEP",
+            "YE-OCT": "A-OCT",
+            "YE-NOV": "A-NOV",
+            "YE-DEC": "A-DEC",
+        }
+    return new_to_old_freq.get(new_offset, new_offset)
+
+
 def normalize_command_line_args(args: List) -> List:
     """
     Normalize command line arguments.
@@ -1718,21 +1770,21 @@ def asbestfreq(data: DataFrame, force_freq: Optional[str] = None) -> DataFrame:
     # At this point pd.infer_freq failed probably because of missing values.
     # The following algorithm would not capture things like BQ, BQS
     # ...etc.
-    if np.alltrue(data.index.is_year_end):
+    if np.all(data.index.is_year_end):
         infer_freq = "A"
-    elif np.alltrue(data.index.is_year_start):
+    elif np.all(data.index.is_year_start):
         infer_freq = "AS"
-    elif np.alltrue(data.index.is_quarter_end):
+    elif np.all(data.index.is_quarter_end):
         infer_freq = "Q"
-    elif np.alltrue(data.index.is_quarter_start):
+    elif np.all(data.index.is_quarter_start):
         infer_freq = "QS"
-    elif np.alltrue(data.index.is_month_end):
+    elif np.all(data.index.is_month_end):
         if np.all(data.index.month == data.index[0].month):
             # Actually yearly with different ends
             infer_freq = f"A-{_ANNUALS[data.index[0].month]}"
         else:
             infer_freq = "M"
-    elif np.alltrue(data.index.is_month_start):
+    elif np.all(data.index.is_month_start):
         if np.all(data.index.month == data.index[0].month):
             # Actually yearly with different start
             infer_freq = f"A-{_ANNUALS[data.index[0].month - 1]}"
@@ -2244,7 +2296,6 @@ def read_iso_ts(
 
     # Would want this to be more generic...
     na_values = []
-
     for spc in range(20)[1:]:
         spcs = " " * spc
         na_values.extend([spcs, f"{spcs}nan"])
@@ -2270,7 +2321,10 @@ def read_iso_ts(
     stdin_df = pd.DataFrame()
     for source_index, source in enumerate(sources):
         res = pd.DataFrame()
-        parameters = make_list(source)
+        if isinstance(source, str):
+            parameters = re.split(r",(?![^\[]*\])", source)
+        else:
+            parameters = make_list(source)
 
         if isinstance(parameters, list) and parameters:
             fname = parameters.pop(0)
@@ -2294,6 +2348,7 @@ def read_iso_ts(
             args = [i for i in parameters if "=" not in i]
 
             newkwds = dict([i.split("=") for i in parameters if "=" in i])
+            newkwds = {k: literal_eval(v) for k, v in newkwds.items()}
 
             # Command line API
             # Uses hspf_reader or pd.read_* functions.

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/src/toolbox_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: toolbox_utils
-Version: 5.1.3
+Version: 5.2.0
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause
@@ -29,39 +29,15 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: dateparser
-Requires-Dist: numpy
+Requires-Dist: numpy<2.0,>=1.20; python_version <= "3.9"
+Requires-Dist: openpyxl
 Requires-Dist: pandas[excel]
-Requires-Dist: pint!=0.21.*
-Requires-Dist: pint<0.22; python_version < "3.9"
+Requires-Dist: pint!=0.21.*,<0.22; python_version < "3.9"
 Requires-Dist: pint-pandas
 Requires-Dist: pydantic
 Requires-Dist: scipy
 Requires-Dist: tabulate
-Provides-Extra: dev
-Requires-Dist: bandit; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: blacken-docs; extra == "dev"
-Requires-Dist: black-nbconvert; extra == "dev"
-Requires-Dist: cleanpy; extra == "dev"
-Requires-Dist: commitizen; extra == "dev"
-Requires-Dist: coverage[toml]; extra == "dev"
-Requires-Dist: isort; extra == "dev"
-Requires-Dist: mypy; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pyflakes; extra == "dev"
-Requires-Dist: pylama; extra == "dev"
-Requires-Dist: pyle; extra == "dev"
-Requires-Dist: pylint; extra == "dev"
-Requires-Dist: pyre; extra == "dev"
-Requires-Dist: pyroma; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-mpl; extra == "dev"
-Requires-Dist: pyupgrade; extra == "dev"
-Requires-Dist: twine; extra == "dev"
-Requires-Dist: unimport; extra == "dev"
-Requires-Dist: velin; extra == "dev"
-Requires-Dist: vulture; extra == "dev"
+Dynamic: license-file
 
 .. image:: https://github.com/timcera/toolbox_utils/actions/workflows/pypi-package.yml/badge.svg
     :alt: Tests
@@ -83,11 +59,6 @@ Requires-Dist: vulture; extra == "dev"
     :target: https://pypi.python.org/pypi/toolbox_utils/
     :height: 20
 
-.. image:: http://img.shields.io/pypi/dd/toolbox_utils.svg
-    :alt: toolbox_utils downloads
-    :target: https://pypi.python.org/pypi/toolbox_utils/
-    :height: 20
-
 .. image:: https://img.shields.io/pypi/pyversions/toolbox_utils
     :alt: PyPI - Python Version
     :target: https://pypi.org/project/toolbox_utils/

toolbox_utils-5.2.0/src/toolbox_utils.egg-info/requires.txt

@@ -0,0 +1,13 @@
+dateparser
+openpyxl
+pandas[excel]
+pint-pandas
+pydantic
+scipy
+tabulate
+
+[:python_version < "3.9"]
+pint!=0.21.*,<0.22
+
+[:python_version <= "3.9"]
+numpy<2.0,>=1.20

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/tests/test_date_slice.py

@@ -1,6 +1,7 @@
 import pandas as pd
 import pytest
 from pandas._libs.tslibs.parsing import DateParseError
+from pandas.errors import ParserError
 
 
 @pytest.mark.parametrize(
@@ -56,14 +57,14 @@ from pandas._libs.tslibs.parsing import DateParseError
             "invalid_date",
             "2020-12-31",
             False,
-            DateParseError,
+            (ValueError, ParserError, DateParseError),
         ),
         (
             pd.DataFrame(index=pd.date_range("2020-01-01", "2020-12-31")),
             "2020-01-01",
             "invalid_date",
             False,
-            DateParseError,
+            (ValueError, ParserError, DateParseError),
         ),
     ],
     ids=[
@@ -88,7 +89,9 @@ def test_date_slice(input_tsd, start_date, end_date, por, expected):
     input_tsd = pd.DataFrame(index=pd.to_datetime(input_tsd.index))
 
     # Act
-    if isinstance(expected, type) and issubclass(expected, Exception):
+    if isinstance(expected, tuple) or (
+        isinstance(expected, type) and issubclass(expected, Exception)
+    ):
         with pytest.raises(expected):
             _date_slice(input_tsd, start_date, end_date, por)
     else:

{toolbox_utils-5.1.3 → toolbox_utils-5.2.0}/tests/test_hbn.py

@@ -1,5 +1,5 @@
 """
-catalog
+hbn
 ----------------------------------
 
 Tests for `hspf_reader hbn` module.
@@ -11,7 +11,7 @@ from unittest import TestCase
 import pandas as pd
 from pandas.testing import assert_frame_equal
 
-from toolbox_utils import tsutils
+import toolbox_utils
 
 
 class TestDescribe(TestCase):
@@ -69,11 +69,19 @@ class TestDescribe(TestCase):
 1999,1.40244
 2000,0.0191165
 """
-        self.extract = tsutils.asbestfreq(
+        self.extract = toolbox_utils.tsutils.asbestfreq(
             pd.read_csv(BytesIO(self.extract), header=0, index_col=0, parse_dates=True)
         )
         self.extract.index = self.extract.index.to_period()
 
     def test_extract_one_label_labellist_api(self):
-        out = tsutils.common_kwds("tests/data_yearly.hbn,yearly,,905,,AGWS")
+        out = toolbox_utils.tsutils.common_kwds(
+            "tests/data_yearly.hbn,yearly,,905,,AGWS"
+        )
+        assert_frame_equal(out, self.extract, check_dtype=False)
+
+    def test_extract_one_label_labellist_api_2(self):
+        out = toolbox_utils.readers.hbn.hbn_extract(
+            "tests/data_yearly.hbn", "yearly", ["", 905, "", "AGWS"]
+        )
         assert_frame_equal(out, self.extract, check_dtype=False)

toolbox_utils-5.1.3/.github/dependabot.yml

@@ -1,11 +0,0 @@
----
-version: 2
-updates:
-    - package-ecosystem: github-actions
-      directory: /
-      schedule:
-          interval: weekly
-      ignore:
-          # Optional: Official actions have moving tags like v1;
-          # if you use those, you don't need updates.
-          - dependency-name: actions/*

toolbox_utils-5.1.3/.github/workflows/pypi-package.yml

@@ -1,91 +0,0 @@
----
-# This workflow will install Python dependencies, run tests and lint with
-# a variety of Python versions For more information see:
-# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: PyPI package tests
-
-on:  # yamllint disable-line rule:truthy
-    push:
-        branches: [main]
-    pull_request:
-        branches: [main]
-    workflow_dispatch:
-
-jobs:
-    test:
-        name: Test on Python ${{ matrix.python-version }}
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-            matrix:
-                python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v4
-              with:
-                  python-version: ${{ matrix.python-version }}
-
-            - name: Install dependencies
-              run: |
-                  sudo apt-get update
-                  python -m pip install --upgrade pip
-                  python -m pip install pytest pytest-cov pytest-mpl
-                  python -m pip install -e .
-
-            - name: Test with pytest
-              run: |
-                  python -m pytest --cov --mpl
-
-            - name: Upload coverage data to coveralls.io
-              uses: coverallsapp/github-action@v2
-              with:
-                  parallel: true
-
-    finish_coveralls:
-        needs: test
-        if: ${{ always() }}
-        runs-on: ubuntu-latest
-        steps:
-            - name: Coveralls Finished
-              uses: coverallsapp/github-action@v2
-              with:
-                  parallel-finished: true
-
-    pypi-publish:
-        needs: test
-        runs-on: ubuntu-latest
-        environment: release
-        name: upload release to PyPI
-
-        permissions:
-            # IMPORTANT: this permission is mandatory for trusted publishing
-            id-token: write
-
-        steps:
-            - name: Checkout source
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Build sdist and wheel
-              run: |
-                  python -m pip install build
-                  python -m build
-
-            - name: Download artifact
-              uses: actions/download-artifact@v4
-              with:
-                  path: dist
-                  merge-multiple: true
-
-            - name: Publish package distributions to PyPI
-              uses: pypa/gh-action-pypi-publish@release/v1
-              with:
-                  skip-existing: true

toolbox_utils-5.1.3/.github/workflows/tests.yml

@@ -1,58 +0,0 @@
----
-# This workflow will install Python dependencies, run tests and lint with
-# a variety of Python versions For more information see:
-# https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Tests
-
-on:  # yamllint disable-line rule:truthy
-    push:
-        branches: [develop]
-    pull_request:
-        branches: [develop]
-    workflow_dispatch:
-
-jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-            matrix:
-                python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v3
-              with:
-                  submodules: recursive
-
-            - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v4
-              with:
-                  python-version: ${{ matrix.python-version }}
-
-            - name: Install dependencies
-              run: |
-                  sudo apt-get update
-                  python -m pip install --upgrade pip
-                  python -m pip install pytest pytest-cov pytest-mpl
-                  python -m pip install .
-
-            - name: Test with pytest
-              run: |
-                  python -m pytest --cov --mpl
-
-            - name: Upload coverage data to coveralls.io
-              uses: coverallsapp/github-action@v2
-              with:
-                  parallel: true
-
-    finish:
-        needs: test
-        if: ${{ always() }}
-        runs-on: ubuntu-latest
-        steps:
-            - name: Coveralls Finished
-              uses: coverallsapp/github-action@v2
-              with:
-                  parallel-finished: true

toolbox_utils-5.1.3/VERSION

@@ -1 +0,0 @@
-5.1.3

toolbox_utils-5.1.3/src/toolbox_utils.egg-info/requires.txt

@@ -1,37 +0,0 @@
-dateparser
-numpy
-pandas[excel]
-pint!=0.21.*
-pint-pandas
-pydantic
-scipy
-tabulate
-
-[:python_version < "3.9"]
-pint<0.22
-
-[dev]
-bandit
-black
-blacken-docs
-black-nbconvert
-cleanpy
-commitizen
-coverage[toml]
-isort
-mypy
-pre-commit
-pyflakes
-pylama
-pyle
-pylint
-pyre
-pyroma
-pytest
-pytest-cov
-pytest-mpl
-pyupgrade
-twine
-unimport
-velin
-vulture