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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-country
-Version: 4.2.3
+Version: 4.2.5
 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.1
+Requires-Dist: hdx-python-utilities<5,>=4.2.4
 Requires-Dist: tenacity
 Provides-Extra: docs
 Requires-Dist: mkapi; extra == 'docs'
@@ -55,7 +55,7 @@ fuzzy matching for English look up that can handle abbreviations in country name
 Dem. for Democratic and Rep. for Republic.
 
 Mapping administration level names from a source to a given base set is also handled
-including phonetic fuzzy name matching.
+including fuzzy name matching.
 
 It also provides foreign exchange rates and conversion from amounts in local
 currency to USD and vice-versa. The conversion relies on Yahoo Finance, falling
@@ -146,24 +146,38 @@ documentation at `documentation/index.md`.
 ## WFP DataBridges Client
 
 The `WFPAPI` class (`hdx.location.wfp_api`) uses WFP's `data-bridges-client` library, which is
-published on WFP's own package index rather than PyPI. To install it, use the `wfp` extra with
-that index added:
+published on WFP's own package index rather than PyPI. That index hosts only
+`data-bridges-client`, so install it from there first without dependencies, then install the
+`wfp` extra from PyPI:
 
 ```shell
-    pip install "hdx-python-country[wfp]" \
-      --extra-index-url https://d2i4vvypvg40rv.cloudfront.net/pypi/ \
-      --index-strategy unsafe-best-match
+    pip install "data-bridges-client>=9,<10" --no-deps \
+      --index-url https://d2i4vvypvg40rv.cloudfront.net/pypi/
+    pip install "hdx-python-country[wfp]"
 ```
 
-If using `uv`, add the following to your project's `pyproject.toml`:
+Avoid `--extra-index-url`: pip then picks the highest version from either index, so a package
+published on PyPI under the name `data-bridges-client` would be installed instead.
+
+If using `uv`, add the following to your project's `pyproject.toml` so that only
+`data-bridges-client` is fetched from WFP's index. `data-bridges-client` must be a direct
+dependency because `tool.uv.sources` does not apply to transitive dependencies; without it, uv
+falls back to an old `hdx-python-country` that has no `wfp` extra:
 
 ```toml
-[tool.uv]
-index-strategy = "unsafe-best-match"
+[project]
+dependencies = [
+    "hdx-python-country[wfp]",
+    "data-bridges-client>=9,<10",
+]
 
 [[tool.uv.index]]
 name = "wfp"
 url = "https://d2i4vvypvg40rv.cloudfront.net/pypi/"
+explicit = true
+
+[tool.uv.sources]
+data-bridges-client = { index = "wfp" }
 ```
 
-then run `uv sync --extra wfp`.
+then run `uv sync`.

{hdx_python_country-4.2.3 → hdx_python_country-4.2.5}/README.md

@@ -18,7 +18,7 @@ fuzzy matching for English look up that can handle abbreviations in country name
 Dem. for Democratic and Rep. for Republic.
 
 Mapping administration level names from a source to a given base set is also handled
-including phonetic fuzzy name matching.
+including fuzzy name matching.
 
 It also provides foreign exchange rates and conversion from amounts in local
 currency to USD and vice-versa. The conversion relies on Yahoo Finance, falling
@@ -109,24 +109,38 @@ documentation at `documentation/index.md`.
 ## WFP DataBridges Client
 
 The `WFPAPI` class (`hdx.location.wfp_api`) uses WFP's `data-bridges-client` library, which is
-published on WFP's own package index rather than PyPI. To install it, use the `wfp` extra with
-that index added:
+published on WFP's own package index rather than PyPI. That index hosts only
+`data-bridges-client`, so install it from there first without dependencies, then install the
+`wfp` extra from PyPI:
 
 ```shell
-    pip install "hdx-python-country[wfp]" \
-      --extra-index-url https://d2i4vvypvg40rv.cloudfront.net/pypi/ \
-      --index-strategy unsafe-best-match
+    pip install "data-bridges-client>=9,<10" --no-deps \
+      --index-url https://d2i4vvypvg40rv.cloudfront.net/pypi/
+    pip install "hdx-python-country[wfp]"
 ```
 
-If using `uv`, add the following to your project's `pyproject.toml`:
+Avoid `--extra-index-url`: pip then picks the highest version from either index, so a package
+published on PyPI under the name `data-bridges-client` would be installed instead.
+
+If using `uv`, add the following to your project's `pyproject.toml` so that only
+`data-bridges-client` is fetched from WFP's index. `data-bridges-client` must be a direct
+dependency because `tool.uv.sources` does not apply to transitive dependencies; without it, uv
+falls back to an old `hdx-python-country` that has no `wfp` extra:
 
 ```toml
-[tool.uv]
-index-strategy = "unsafe-best-match"
+[project]
+dependencies = [
+    "hdx-python-country[wfp]",
+    "data-bridges-client>=9,<10",
+]
 
 [[tool.uv.index]]
 name = "wfp"
 url = "https://d2i4vvypvg40rv.cloudfront.net/pypi/"
+explicit = true
+
+[tool.uv.sources]
+data-bridges-client = { index = "wfp" }
 ```
 
-then run `uv sync --extra wfp`.
+then run `uv sync`.

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

@@ -42,11 +42,13 @@ The code for the library is [here](https://github.com/OCHA-DAP/hdx-python-countr
 The library has detailed API documentation which can be found in the menu at the top.
 
 ## Breaking Changes
+From 4.2.4, the AdminLevel matcher parameter is removed and HDX Python Utilities
+4.2.3 or later is required.
+
 From 4.2.0, AdminLevel fuzzy matches using RapidFuzzMatcher (with its place_name_scorer)
-from HDX Python Utilities rather than Phonetics by default. Pass matcher=Phonetics() for
-the previous behaviour. Names made of parts are resolved from their parts and lists of
-names are not fuzzy matched (see Administration Level). Fuzzy matching is now tried when
-parent is "" as well as when it is None.
+from HDX Python Utilities rather than Phonetics by default. Names made of parts are
+resolved from their parts and lists of names are not fuzzy matched (see Administration
+Level). Fuzzy matching is now tried when parent is "" as well as when it is None.
 
 From 4.1.1, HXL hashtags no longer used in AdminLevel class. The header names are used
 instead. setup_from_iterable replaces setup_from_admin_info and
@@ -167,9 +169,8 @@ A Retrieve object can be passed in the *retriever* parameter that enables
 saving data downloaded to a file or loading previously saved data depending
 on how the Retrieve object is configured.
 
-The *matcher* parameter sets the fuzzy name matcher. It defaults to
-RapidFuzzMatcher from HDX Python Utilities with its place_name_scorer. Phonetics
-from HDX Python Utilities can be passed instead.
+Fuzzy name matching uses RapidFuzzMatcher from HDX Python Utilities with its
+place_name_scorer.
 
 Before fuzzy matching, a name made of parts split by separators (",", ";", "/",
 ":", "&", newline, "and", "et") or a hyphen is resolved from its parts. A name
@@ -212,7 +213,6 @@ Examples of usage:
     assert admintwo.get_pcode("AFG", "Kabul", parent="AF01") == ("AF0101", True)
     adminlevel.get_pcode("KHM", "Kampot & Kep")  # returns (None, False)
     admintwo.get_pcode("VEN", "Falcón, Acosta", parent="VE11")  # returns ("VE1101", False)
-    adminlevel = AdminLevel(config, matcher=Phonetics())  # use Phonetics
 
 There is basic admin 1 p-code length conversion by default. A more advanced
 p-code length conversion can be activated by calling *load_pcode_formats*

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

@@ -36,7 +36,7 @@ dynamic = ["version"]
 requires-python = ">=3.10"
 
 dependencies = [
-    "hdx-python-utilities>=4.2.1,<5",
+    "hdx-python-utilities>=4.2.4,<5",
     "tenacity",
 ]
 
@@ -82,12 +82,13 @@ allow-direct-references = true
 # uv (Package Management)
 # ----------------------------------------------------------------------------
 
-[tool.uv]
-index-strategy = "unsafe-best-match"
-
 [[tool.uv.index]]
 name = "wfp"
 url = "https://d2i4vvypvg40rv.cloudfront.net/pypi/"
+explicit = true
+
+[tool.uv.sources]
+data-bridges-client = { index = "wfp" }
 
 # ----------------------------------------------------------------------------
 # Ruff (Linting & Formatting)

{hdx_python_country-4.2.3 → hdx_python_country-4.2.5}/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.3'
-__version_tuple__ = version_tuple = (4, 2, 3)
+__version__ = version = '4.2.5'
+__version_tuple__ = version_tuple = (4, 2, 5)
 
 __commit_id__ = commit_id = None

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

@@ -6,7 +6,6 @@ from typing import Any
 
 from hdx.utilities.dictandlist import dict_of_sets_add
 from hdx.utilities.matching import (
-    Phonetics,
     RapidFuzzMatcher,
     multiple_replace,
     resolve_name_parts,
@@ -43,17 +42,14 @@ class AdminLevel:
     to files or to enable already saved files to be used instead of downloading
     from urls.
 
-    The matcher parameter overrides the fuzzy name matcher that fuzzy_pcode
-    tries last. It defaults to hdx.utilities.matching.RapidFuzzMatcher with
-    its place_name_scorer. hdx.utilities.matching.Phonetics can be passed
-    instead.
+    The fuzzy name matcher that fuzzy_pcode tries last is
+    hdx.utilities.matching.RapidFuzzMatcher with its place_name_scorer.
 
     Args:
         admin_config: Configuration dictionary. Defaults to {}.
         admin_level: Admin level. Defaults to 1.
         admin_level_overrides: Countries at other admin levels.
         retriever: Retriever object to use for loading/saving files.
-        matcher: Fuzzy name matcher to use. Defaults to None (RapidFuzzMatcher).
     """
 
     pcode_regex = re.compile(r"^([a-zA-Z]{2,3})(\d+)$")
@@ -69,7 +65,6 @@ class AdminLevel:
         admin_level: int = 1,
         admin_level_overrides: dict | None = None,
         retriever: Retrieve | None = None,
-        matcher: Phonetics | RapidFuzzMatcher | None = None,
     ) -> None:
         self._admin_level_overrides = admin_level_overrides or {}
         self._retriever: Retrieve | None = retriever
@@ -81,7 +76,7 @@ class AdminLevel:
         self._use_parent = False
         self._zeroes = {}
         self._parent_admins = []
-        self._matcher = matcher or RapidFuzzMatcher(RapidFuzzMatcher.place_name_scorer)
+        self._matcher = RapidFuzzMatcher(RapidFuzzMatcher.place_name_scorer)
         self.init_matches_errors()
         self.admin_level = admin_level
         self.pcodes = []

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

@@ -205,32 +205,6 @@ class TestAdminLevel:
             "test - YEM: Matching (fuzzy) Al_Dhale'a to Ad Dali on map",
         ]
 
-    def test_adminlevel_custom_matcher(self, config):
-        class AlwaysFirstMatcher:
-            def match(
-                self,
-                possible_names,
-                name,
-                alternative_name=None,
-                transform_possible_names=(),
-                threshold=None,
-            ):
-                return 0
-
-        adminone = AdminLevel(config)
-        adminone.setup_from_iterable(config["admin_info"])
-        assert adminone.get_pcode("YEM", "Zzznotarealplace", logname="test") == (
-            None,
-            False,
-        )
-
-        adminone = AdminLevel(config, matcher=AlwaysFirstMatcher())
-        adminone.setup_from_iterable(config["admin_info"])
-        pcode, exact = adminone.get_pcode("YEM", "Zzznotarealplace", logname="test")
-        assert exact is False
-        assert pcode is not None
-        assert adminone.pcode_to_iso3[pcode] == "YEM"
-
     def test_adminlevel_list_of_names(self):
         def row(countryiso3, level, pcode, name, parent):
             return {