commodutil 5.5.2__tar.gz → 5.5.3__tar.gz

{commodutil-5.5.2 → commodutil-5.5.3}/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.5.3 - 2026-07-28
+
+- Fixed country-name resolution for standalone `St`/`St.` abbreviations and the vendor spellings `Taiwan, China` and `Virgin Islands (US)`.
+
 ## 5.5.2 - 2026-07-28
 
 - Fixed country-name resolution to normalize ampersands to `and`, matching ISO names such as Antigua and Barbuda.

{commodutil-5.5.2 → commodutil-5.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commodutil
-Version: 5.5.2
+Version: 5.5.3
 Summary: common commodity/oil analytics utils
 Author-email: aeorxc <author@example.com>
 License-Expression: MIT

{commodutil-5.5.2 → commodutil-5.5.3}/commodutil/standards/geography.py

@@ -15,6 +15,7 @@ memberships are derived from those definitions at import time.
 
 from __future__ import annotations
 
+import re
 from dataclasses import dataclass
 from typing import Dict, Optional, Tuple
 
@@ -69,11 +70,13 @@ COUNTRY_ALIASES: dict[str, str] = {
     "Turkey": "TR",
     "Turkiye": "TR",
     "Republic of China": "TW",
+    "Taiwan, China": "TW",
     "USA": "US",
     "U.S.": "US",
     "U.S.A.": "US",
     "Holy See": "VA",
     "US Virgin Islands": "VI",
+    "Virgin Islands (US)": "VI",
     # From empirical vendor-vocabulary validation (see commodflows research).
     # ISO merges Bonaire and Sint Eustatius into BQ; sub-island detail is
     # lost by design.
@@ -100,7 +103,9 @@ COUNTRY_ALIASES: dict[str, str] = {
 
 def _normalize_country_name(name: str) -> str:
     """Return the case-folded lookup key for a country name."""
-    return " ".join(name.replace("&", " and ").split()).casefold()
+    normalized = name.replace("&", " and ")
+    normalized = re.sub(r"\bSt\.?(?=\s|$)", "Saint", normalized, flags=re.IGNORECASE)
+    return " ".join(normalized.split()).casefold()
 
 
 def _build_country_name_map(aliases: Dict[str, str]) -> Dict[str, str]:

{commodutil-5.5.2 → commodutil-5.5.3}/commodutil.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commodutil
-Version: 5.5.2
+Version: 5.5.3
 Summary: common commodity/oil analytics utils
 Author-email: aeorxc <author@example.com>
 License-Expression: MIT

{commodutil-5.5.2 → commodutil-5.5.3}/tests/test_standards_geography.py

@@ -79,6 +79,20 @@ def test_canonical_country_normalizes_ampersands(value, expected):
     assert canonical_country(value) == expected
 
 
+@pytest.mark.parametrize(
+    "value,expected",
+    [
+        ("St Kitts & Nevis", "KN"),
+        ("St. Lucia", "LC"),
+        ("Taiwan, China", "TW"),
+        ("Virgin Islands (US)", "VI"),
+        ("Stockholm", None),
+    ],
+)
+def test_canonical_country_normalizes_live_vendor_spellings(value, expected):
+    assert canonical_country(value) == expected
+
+
 @pytest.mark.parametrize(
     "value,expected",
     [