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

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

@@ -38,7 +38,7 @@ jobs:
                   python -m build
 
             - name: Download artifact
-              uses: actions/download-artifact@v7
+              uses: actions/download-artifact@v8
               with:
                   path: dist
                   merge-multiple: true

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

@@ -1,3 +1,10 @@
+## v5.2.4 (2026-03-27)
+
+### Fix
+
+- reordered calculation of best frequency in asbestfreq
+- fix column suffixes to join
+
 ## v5.2.3 (2026-03-06)
 
 ### Fix

{toolbox_utils-5.2.3 → toolbox_utils-5.2.4}/PKG-INFO

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

toolbox_utils-5.2.4/VERSION

@@ -0,0 +1 @@
+5.2.4

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

@@ -61,7 +61,7 @@ github = "https://github.com/timcera/toolbox_utils"
 name = "cz_conventional_commits"
 tag_format = "v$version"
 update_changelog_on_bump = true
-version = "5.2.3"
+version = "5.2.4"
 version_files = ["VERSION"]
 
 [tool.isort]

{toolbox_utils-5.2.3 → toolbox_utils-5.2.4}/src/toolbox_utils/tsutils.py

@@ -1027,7 +1027,6 @@ def make_list(
         )
 
     # At this point 'strorlist' variable should be a list or tuple.
-
     if n is None:
         n = len(strorlist)
 
@@ -1696,9 +1695,9 @@ def asbestfreq(data: DataFrame, force_freq: Optional[str] = None) -> DataFrame:
     2. If data.index.freq is not None, just return.
     3. If data.index.inferred_freq is set use .asfreq.
     4. Use pd.infer_freq - fails if any missing
-    5. Use .is_* functions to establish YE, YS, Y-*, YS-*, Q, QS, M, MS
-    6. Use minimum interval to establish the fixed time periods up to
+    5. Use minimum interval to establish the fixed time periods up to
        weekly
+    6. Use .is_* functions to establish YE, YS, Y-*, YS-*, Q, QS, M, MS
     7. Gives up returning None for PANDAS offset string
 
     Parameters
@@ -1737,32 +1736,6 @@ def asbestfreq(data: DataFrame, force_freq: Optional[str] = None) -> DataFrame:
     if infer_freq:
         return _replace_nan_with_na(data, freq=infer_freq)
 
-    # 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.all(data.index.is_year_end):
-        infer_freq = pandas_offset_by_version("YE")
-    elif np.all(data.index.is_year_start):
-        infer_freq = pandas_offset_by_version("YS")
-    elif np.all(data.index.is_quarter_end):
-        infer_freq = pandas_offset_by_version("QE")
-    elif np.all(data.index.is_quarter_start):
-        infer_freq = pandas_offset_by_version("QS")
-    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"YE-{_ANNUALS[data.index[0].month]}"
-        else:
-            infer_freq = "ME"
-    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"YE-{_ANNUALS[data.index[0].month - 1]}"
-        else:
-            infer_freq = "MS"
-    if infer_freq:
-        return _replace_nan_with_na(data, freq=infer_freq)
-
     data.index = data.index.astype("datetime64[ns]")
     ndiff = (
         data.index.astype("int64").values[1:] - data.index.astype("int64").values[:-1]
@@ -1810,8 +1783,33 @@ def asbestfreq(data: DataFrame, force_freq: Optional[str] = None) -> DataFrame:
             infer_freq = f"{infer_freq}-{_WEEKLIES[data.index[0].dayofweek]}"
         else:
             infer_freq = "D"
+    if infer_freq:
+        return _replace_nan_with_na(data, freq=infer_freq)
+
+    # 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.all(data.index.is_month_start):
+        if np.all(data.index.month == data.index[0].month):
+            # Actually yearly with different start
+            infer_freq = f"YE-{_ANNUALS[data.index[0].month - 1]}"
+        else:
+            infer_freq = "MS"
+    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"YE-{_ANNUALS[data.index[0].month]}"
+        else:
+            infer_freq = "ME"
+    elif np.all(data.index.is_quarter_end):
+        infer_freq = pandas_offset_by_version("QE")
+    elif np.all(data.index.is_quarter_start):
+        infer_freq = pandas_offset_by_version("QS")
+    elif np.all(data.index.is_year_end):
+        infer_freq = pandas_offset_by_version("YE")
+    elif np.all(data.index.is_year_start):
+        infer_freq = pandas_offset_by_version("YS")
 
-    data.index = data.index.astype("datetime64[ns]")
     return _replace_nan_with_na(data, freq=infer_freq)
 
 
@@ -2559,12 +2557,16 @@ def read_iso_ts(
 
         result = pd.DataFrame()
 
-        for lres in lresult_list:
+        for counter, lres in enumerate(lresult_list):
+            if counter < 2:
+                lcounter = "_r"
+            else:
+                lcounter = f"_r{counter}"
             if len(offset_set) < 2:
-                result = result.join(lres, how="outer", rsuffix="_r")
+                result = result.join(lres, how="outer", rsuffix=f"{lcounter}")
             else:
                 result = result.join(
-                    lres.asfreq(moffset - epoch), how="outer", rsuffix="_r"
+                    lres.asfreq(moffset - epoch), how="outer", rsuffix=f"{lcounter}"
                 )
     else:
         result = lresult_list[0]

{toolbox_utils-5.2.3 → toolbox_utils-5.2.4}/src/toolbox_utils.egg-info/PKG-INFO

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

{toolbox_utils-5.2.3 → toolbox_utils-5.2.4}/tests/test_asbestfreq.py

@@ -34,7 +34,11 @@ def create_test_data(start, periods, freq, columns=["value"]):
 @pytest.mark.parametrize(
     "test_input, expected",
     [
-        # Happy path tests
+        pytest.param(
+            create_test_data("2010-01-01", 16, pandas_offset_by_version("h")),
+            "(H|h)",
+            id="hourly_freq_on_jan_01",
+        ),
         pytest.param(create_test_data("2021-01-01", 10, "D"), "D", id="daily_freq"),
         pytest.param(
             create_test_data("2021-01-01", 10, pandas_offset_by_version("ME")),
@@ -46,7 +50,6 @@ def create_test_data(start, periods, freq, columns=["value"]):
             "(YE-DEC|A-DEC)",
             id="annual_freq",
         ),
-        # Edge cases
         pytest.param(
             create_test_data("2021-01-01", 10, f"5{pandas_offset_by_version('h')}"),
             "(5h|5H)",
@@ -57,7 +60,6 @@ def create_test_data(start, periods, freq, columns=["value"]):
             "(15min|15T)",
             id="15_minute_freq",
         ),
-        # Error cases
         pytest.param(
             create_test_data("2021-01-01", 10, "D").iloc[::2], "2D", id="2_day"
         ),

toolbox_utils-5.2.3/VERSION

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