hdx-python-country 4.2.1__tar.gz → 4.2.3__tar.gz

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-country
-Version: 4.2.1
+Version: 4.2.3
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Project-URL: Repository, https://github.com/OCHA-DAP/hdx-python-country
@@ -27,7 +27,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
-Requires-Dist: hdx-python-utilities<5,>=4.2.0
+Requires-Dist: hdx-python-utilities<5,>=4.2.1
 Requires-Dist: tenacity
 Provides-Extra: docs
 Requires-Dist: mkapi; extra == 'docs'

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/documentation/index.md

@@ -151,7 +151,10 @@ matching. Default is all countries.
 *admin_name_mappings* is a dictionary of mappings from name to pcode. These can
 be global or they can be restricted by country or parent (if the AdminLevel
 object has been set up with parents). Keys take the form "MAPPING",
-"AFG|MAPPING" or "AF01|MAPPING".
+"AFG|MAPPING" or "AF01|MAPPING". A mapping keyed by parent is used even if
+its pcode has a different parent (eg. "ET07|Dawuro": "ET1104" where ET07 is a
+pre-split region). Other mappings are only used with a parent if the pcode's
+parent matches it.
 *admin_name_replacements* is a dictionary of textual replacements to try when
 fuzzy matching. It maps from string to string replacement. The replacements can
 be global or they can be restricted by country or parent (if the AdminLevel

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = ["version"]
 requires-python = ">=3.10"
 
 dependencies = [
-    "hdx-python-utilities>=4.2.0,<5",
+    "hdx-python-utilities>=4.2.1,<5",
     "tenacity",
 ]
 

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/src/hdx/location/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.2.1'
-__version_tuple__ = version_tuple = (4, 2, 1)
+__version__ = version = '4.2.3'
+__version_tuple__ = version_tuple = (4, 2, 3)
 
 __commit_id__ = commit_id = None

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/src/hdx/location/adminlevel.py

@@ -751,6 +751,12 @@ class AdminLevel:
             parent = kwargs.get("parent")
         else:
             parent = None
+        if parent:
+            # A parent-keyed mapping is trusted even if its p-code has a
+            # different parent eg. a pre-split region name
+            pcode = self._admin_name_mappings.get(f"{parent}|{name}")
+            if pcode and self.pcode_to_iso3[pcode] == countryiso3:
+                return pcode, True
         pcode = self.get_name_mapped_pcode(countryiso3, name, parent)
         if pcode and self.pcode_to_iso3[pcode] == countryiso3:
             if parent:

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/tests/fixtures/adminlevelparent.yaml

@@ -14,6 +14,7 @@ admin_name_mappings:
   "MyMapping": "AF0301"
   "AFG|MyMapping2": "AF0401"
   "AF05|MyMapping3": "AF0501"
+  "AF05|MyMapping4": "AF0401"
 
 admin_name_replacements:
   "qx": ""

{hdx_python_country-4.2.1 → hdx_python_country-4.2.3}/tests/hdx/location/test_adminlevel.py

@@ -340,6 +340,7 @@ class TestAdminLevel:
             "MyMapping: Charikar (AF0301)",
             "AFG|MyMapping2: Maydan Shahr (AF0401)",
             "AF05|MyMapping3: Pul-e-Alam (AF0501)",
+            "AF05|MyMapping4: Maydan Shahr (AF0401)",
         ]
         assert admintwo.get_pcode("AFG", "MyMapping", logname="test") == (
             "AF0301",
@@ -374,6 +375,13 @@ class TestAdminLevel:
             "AFG", "MyMapping3", parent="AF04", logname="test"
         ) == (None, False)
 
+        assert admintwo.get_pcode(
+            "AFG", "MyMapping4", parent="AF05", logname="test"
+        ) == ("AF0401", True)
+        assert admintwo.get_pcode(
+            "AFG", "MyMapping4", parent="AF04", logname="test"
+        ) == (None, False)
+
         # Names are garbled so that only the "qx" replacement, not fuzzy
         # matching, can resolve them. That tests replacement scoping whatever
         # the matcher.