Merge branch 'master' into array_ufunc_nov

hgrecco · Aug 16, 2023 · aa92f24 · aa92f24
2 parents f289b8a + c43c18b
commit aa92f24
Show file tree

Hide file tree

Showing 8 changed files with 411 additions and 72 deletions.
diff --git a/.github/workflows/ci-pint-master.yml b/.github/workflows/ci-pint-master.yml
@@ -8,8 +8,8 @@ jobs:
  matrix:
  python-version: [3.9, "3.10", "3.11"]
  numpy: ["numpy>=1.20.3,<2.0.0"]
- pandas: ["pandas==1.5.2", ]
- pint: ["pint>=0.20.1"]
+ pandas: ["pandas==2.0.2", ]
+ pint: ["pint>=0.21.1"]
 
  runs-on: ubuntu-latest
 

diff --git a/.github/workflows/ci-pint-pre.yml b/.github/workflows/ci-pint-pre.yml
@@ -8,8 +8,8 @@ jobs:
  matrix:
  python-version: [3.9, "3.10", "3.11"]
  numpy: ["numpy>=1.20.3,<2.0.0"]
- pandas: ["pandas==1.5.2", ]
- pint: ["pint>=0.20.1"]
+ pandas: ["pandas==2.0.2", ]
+ pint: ["pint>=0.21.1"]
 
  runs-on: ubuntu-latest
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,8 +8,8 @@ jobs:
  matrix:
  python-version: [3.9, "3.10", "3.11"]
  numpy: ["numpy>=1.20.3,<2.0.0"]
- pandas: ["pandas==1.5.2","pandas==2.0.2", ]
- pint: ["pint==0.21.1", "pint==0.22"]
+ pandas: ["pandas==2.0.2", "pandas==2.1.0rc0" ]
+ pint: ["pint>=0.21.1", "pint==0.22"]
 
  runs-on: ubuntu-latest
 

diff --git a/CHANGES b/CHANGES
@@ -1,14 +1,29 @@
 pint-pandas Changelog
 =====================
 
-0.4 (unreleased)
+0.5 (unreleased)
+----------------
+
+<<<<<<< HEAD
+- Support for Pandas version 2.1.0. #196
+- Support for dtype-preserving `PintArray.map` for both Pandas 2.0.2 and Pandas 2.1. #196
+- Support for <NA> values in columns with integer magnitudes
+- Support for magnitudes of any type, such as complex128 or tuples #146
+- Support for pandas 2.0, allowing `.cumsum, .cummax, .cummin` methods for `Series` and `DataFrame`. #186
+- Minimum Pint version is 0.21
+- Minimum Pandas vesrion is 2.0
+- Support for unit registries with `force_ndarray_like = True`. #165
+- A DataFrame/Series.pint.convert_object_dtype() function has been added to create PintArrays from Series of quantities.
+
+0.4 (2023-05-23)
 ----------------
 
 - Support for <NA> values in columns with integer magnitudes
 - Support for magnitudes of any type, such as complex128 or tuples #146
 - Support for Pint 0.21 #168, #179
 - Cast to `numpy.ndarray` in `PintArray._reduce` if needed to use `nanops` functions
-- Support for unit registries with `force_ndarray_like = True`. #165
+- Minimum Pint version is 0.21
+- Minimum Pandas vesrion is 1.6
 
 0.3 (2022-11-14)
 ----------------