toolbox-utils 5.1.4__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.4 → toolbox_utils-5.2.0}/.pre-commit-config.yaml

@@ -11,7 +11,7 @@ exclude: |
 
 repos:
     - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.6.0
+      rev: v5.0.0
       hooks:
           - id: check-case-conflict
           - id: check-docstring-first
@@ -31,7 +31,7 @@ repos:
 
     - repo: https://github.com/astral-sh/ruff-pre-commit
       # Ruff version.
-      rev: v0.4.10
+      rev: v0.9.3
       hooks:
           # Run the linter.
           - id: ruff
@@ -42,7 +42,7 @@ repos:
             types_or: [python, pyi, jupyter]
 
     - repo: https://github.com/pycqa/isort
-      rev: 5.13.2
+      rev: 6.0.0
       hooks:
           - id: isort
             name: isort (python)
@@ -54,7 +54,7 @@ repos:
             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']
@@ -83,17 +83,17 @@ repos:
             args: [--indent-size, '4']
 
     - 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.16.0
+      rev: v3.19.1
       hooks:
           - id: pyupgrade
 
     - repo: https://github.com/commitizen-tools/commitizen
-      rev: v3.27.0
+      rev: v4.1.1
       hooks:
           - id: commitizen
             stages: [commit-msg]

{toolbox_utils-5.1.4 → 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.4 → toolbox_utils-5.2.0}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v5.2.0 (2025-05-10)
+
+### Feat
+
+- added pandas_offset_by_version function
+
 ## v5.1.4 (2024-06-24)
 
 ### Fix

{toolbox_utils-5.1.4 → 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.4
+Version: 5.2.0
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause
@@ -30,12 +30,14 @@ 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: openpyxl
 Requires-Dist: pandas[excel]
 Requires-Dist: pint!=0.21.*,<0.22; python_version < "3.9"
 Requires-Dist: pint-pandas
 Requires-Dist: pydantic
 Requires-Dist: scipy
 Requires-Dist: tabulate
+Dynamic: license-file
 
 .. image:: https://github.com/timcera/toolbox_utils/actions/workflows/pypi-package.yml/badge.svg
     :alt: Tests
@@ -57,11 +59,6 @@ Requires-Dist: tabulate
     :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.4 → 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.4 → toolbox_utils-5.2.0}/pyproject.toml

@@ -13,6 +13,7 @@ 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",
@@ -64,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.1.4"
+version = "5.2.0"
 version_files = ["VERSION"]
 
 [tool.isort]

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

@@ -47,58 +47,55 @@ from .readers.wdm import wdm_extract as wdm
 # needed to use pint in pandas
 _ = pint_pandas.version("pint")
 
-new_to_old_freq = {}
-major, minor = pd.__version__.split(".")[:2]
-if (int(major) + int(minor) / 10) < 2.2:
-    #
-    # +--------------+--------------+
-    # | Old          | New          |
-    # +==============+==============+
-    # | A            | Y            |
-    # +--------------+--------------+
-    # | M            | ME           |
-    # +--------------+--------------+
-    # | H            | h            |
-    # +--------------+--------------+
-    # | BH           | bh           |
-    # +--------------+--------------+
-    # | CBH          | cbh          |
-    # +--------------+--------------+
-    # | T            | min          |
-    # +--------------+--------------+
-    # | S            | s            |
-    # +--------------+--------------+
-    # | L            | ms           |
-    # +--------------+--------------+
-    # | U            | us           |
-    # +--------------+--------------+
-    # | N            | ns           |
-    # +--------------+--------------+
-    #
-    new_to_old_freq = {
-        "Y": "A",
-        "ME": "M",
-        "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",
-    }
+
+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:

{toolbox_utils-5.1.4 → 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.4
+Version: 5.2.0
 Summary: Python toolbox for common utilities
 Author-email: Tim Cera <tim@cerazone.net>
 License: BSD-3-Clause
@@ -30,12 +30,14 @@ 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: openpyxl
 Requires-Dist: pandas[excel]
 Requires-Dist: pint!=0.21.*,<0.22; python_version < "3.9"
 Requires-Dist: pint-pandas
 Requires-Dist: pydantic
 Requires-Dist: scipy
 Requires-Dist: tabulate
+Dynamic: license-file
 
 .. image:: https://github.com/timcera/toolbox_utils/actions/workflows/pypi-package.yml/badge.svg
     :alt: Tests
@@ -57,11 +59,6 @@ Requires-Dist: tabulate
     :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.4 → toolbox_utils-5.2.0}/src/toolbox_utils.egg-info/requires.txt

@@ -1,4 +1,5 @@
 dateparser
+openpyxl
 pandas[excel]
 pint-pandas
 pydantic

{toolbox_utils-5.1.4 → 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.4/.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.4/.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.4/.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.4/VERSION

@@ -1 +0,0 @@
-5.1.4