From 66c8ad7f4de73b89b103091ee8ff71fef54b655a Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 21 Jun 2024 14:41:51 +0100 Subject: [PATCH 1/3] test issue --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24f001b43..981f49e0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,10 @@ jobs: numpy: "numpy" uncertainties: "uncertainties" extras: "sparse xarray netCDF4 dask[complete]==2024.5.1 graphviz babel==2.8 mip>=1.13" + - python-version: "3.10" + numpy: "numpy==1.26.1" + uncertainties: null + extras: "babel==2.15 matplotlib==3.9.0" runs-on: ubuntu-latest env: From a2ce5814d2c1656fa6fbfd33762edef65a18135a Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 21 Jun 2024 19:42:00 +0100 Subject: [PATCH 2/3] babel fix --- pint/delegates/formatter/_compound_unit_helpers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pint/delegates/formatter/_compound_unit_helpers.py b/pint/delegates/formatter/_compound_unit_helpers.py index 7631a94ef..103d5dd5d 100644 --- a/pint/delegates/formatter/_compound_unit_helpers.py +++ b/pint/delegates/formatter/_compound_unit_helpers.py @@ -82,11 +82,14 @@ def localize_per( locale = babel_parse(locale) patterns = locale._data["compound_unit_patterns"].get("per", None) + if patterns is None: + return default or "{}/{}" + patterns = patterns.get(length, None) if patterns is None: return default or "{}/{}" - return patterns.get(length, default or "{}/{}") + return patterns.get("compound", default or "{}/{}") @functools.lru_cache From d888dc0d798a604c84f16ffca9f1af87a6c3f915 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 21 Jun 2024 19:52:24 +0100 Subject: [PATCH 3/3] babel fix --- pint/delegates/formatter/_compound_unit_helpers.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pint/delegates/formatter/_compound_unit_helpers.py b/pint/delegates/formatter/_compound_unit_helpers.py index 103d5dd5d..084d3c099 100644 --- a/pint/delegates/formatter/_compound_unit_helpers.py +++ b/pint/delegates/formatter/_compound_unit_helpers.py @@ -89,6 +89,11 @@ def localize_per( if patterns is None: return default or "{}/{}" + # babel 2.8 + if isinstance(patterns, str): + return patterns + + # babe; 2.15 return patterns.get("compound", default or "{}/{}")