From ad3bb181b02648c54b5dbed88fea44ab9b441f65 Mon Sep 17 00:00:00 2001 From: andrewgsavage Date: Mon, 6 Jan 2025 22:28:49 +0000 Subject: [PATCH] Fix loc (#270) --- CHANGES | 14 +++++++++++++- bors.toml | 7 ------- pint_pandas/pint_array.py | 2 ++ 3 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 bors.toml diff --git a/CHANGES b/CHANGES index 5c0d6fd2..e7e6d7a5 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,19 @@ pint-pandas Changelog ===================== -0.7 (unreleased) +0.8 (unreleased) +-------------------- + +nothing yet + + +0.7.1 (2025-01-06) +-------------------- + +- Fix bug preventing assignment via .loc fails for subsets of columns + + +0.7 (2025-01-04) -------------------- - Added `__array_function__` support for numpy fuctions like clip. diff --git a/bors.toml b/bors.toml deleted file mode 100644 index bc63d117..00000000 --- a/bors.toml +++ /dev/null @@ -1,7 +0,0 @@ -status = [ - "ci", - "lint" -] -delete_merged_branches = true -timeout_sec = 10800 -block_labels = [ "do-not-merge-yet" ] diff --git a/pint_pandas/pint_array.py b/pint_pandas/pint_array.py index fd46e91c..b957074b 100644 --- a/pint_pandas/pint_array.py +++ b/pint_pandas/pint_array.py @@ -398,6 +398,8 @@ def _convert_np_result(self, result): return result elif pd.api.types.is_bool_dtype(result): return result + elif isinstance(result, numbers.Number): + return result else: # one return value return type(self)(result)