update ci master version (#226)

hgrecco · May 23, 2024 · b87d0f1 · b87d0f1
1 parent 3f9568b
commit b87d0f1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/ci-pint-master.yml b/.github/workflows/ci-pint-master.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: [3.9, "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
         numpy: ["numpy>=1.20.3,<2.0.0"]
         pandas: ["pandas==2.0.2", ]
         pint: ["pint>=0.21.1"]

diff --git a/docs/user/reading.rst b/docs/user/reading.rst
@@ -99,7 +99,7 @@ The units are harder to read than they need be, so lets change pint's `default f
 
 .. ipython:: python
 
-    pint_pandas.PintType.ureg.default_format = "P~"
+    pint_pandas.PintType.ureg.formatter.default_format = "P~"
     df_.pint.dequantify()
 
 or the entire table's units

diff --git a/notebooks/pint-pandas.ipynb b/notebooks/pint-pandas.ipynb
@@ -399,7 +399,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "pint_pandas.PintType.ureg.default_format = \"P~\"\n",
+    "pint_pandas.PintType.ureg.formatter.default_format = \"P~\"\n",
     "df_.pint.dequantify()"
    ]
   },

diff --git a/pint_pandas/pint_array.py b/pint_pandas/pint_array.py
@@ -3,6 +3,7 @@
 import warnings
 from importlib.metadata import version
 from typing import Any, Callable, Dict, Optional, Union, cast
+from packaging.version import parse as version_parse
 
 import numpy as np
 import pandas as pd
@@ -363,9 +364,15 @@ def _formatter(self, boxed=False):
             when ``boxed=False`` and :func:`str` is used when
             ``boxed=True``.
         """
-        float_format = pint.formatting.remove_custom_flags(
-            self.dtype.ureg.default_format
-        )
+        # TODO: remove this once 0.24 is min pint version
+        if version_parse(pint.__version__).base_version < "0.24":
+            float_format = pint.formatting.remove_custom_flags(
+                self.dtype.ureg.default_format
+            )
+        else:
+            float_format = pint.formatting.remove_custom_flags(
+                self.dtype.ureg.formatter.default_format
+            )
 
         def formatting_function(quantity):
             if isinstance(quantity.magnitude, float):
@@ -979,7 +986,11 @@ def quantify(self, level=-1):
 
     def dequantify(self):
         def formatter_func(dtype):
-            formatter = "{:" + dtype.ureg.default_format + "}"
+            # TODO: remove once pint 0.24 is min version supported
+            if version_parse(pint.__version__).base_version < "0.24":
+                formatter = "{:" + dtype.ureg.default_format + "}"
+            else:
+                formatter = "{:" + dtype.ureg.formatter.default_format + "}"
             return formatter.format(dtype.units)
 
         df = self._obj
@@ -1133,7 +1144,6 @@ class DelegatedScalarMethod(DelegatedMethod):
 
 for attr in [
     "debug_used",
-    "default_format",
     "dimensionality",
     "dimensionless",
     "force_ndarray",

diff --git a/pint_pandas/testsuite/test_pandas_interface.py b/pint_pandas/testsuite/test_pandas_interface.py
@@ -222,7 +222,6 @@ class TestSeriesAccessors(object):
     @pytest.mark.parametrize(
         "attr",
         [
-            "default_format",
             "dimensionality",
             "dimensionless",
             "force_ndarray",