hdx-python-country 4.2.4__tar.gz → 4.2.6__tar.gz

{hdx_python_country-4.2.4 → hdx_python_country-4.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-country
-Version: 4.2.4
+Version: 4.2.6
 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
@@ -20,14 +20,13 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 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.3
+Requires-Python: >=3.11
+Requires-Dist: hdx-python-utilities<5,>=4.2.5
 Requires-Dist: tenacity
 Provides-Extra: docs
 Requires-Dist: mkapi; extra == 'docs'
@@ -146,24 +145,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.4 → hdx_python_country-4.2.6}/README.md

@@ -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.4 → hdx_python_country-4.2.6}/documentation/index.md

@@ -42,6 +42,8 @@ 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.6, Python 3.11 or later and HDX Python Utilities 4.2.5 or later are required.
+
 From 4.2.4, the AdminLevel matcher parameter is removed and HDX Python Utilities
 4.2.3 or later is required.
 

{hdx_python_country-4.2.4 → hdx_python_country-4.2.6}/pyproject.toml

@@ -18,7 +18,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -33,10 +32,10 @@ classifiers = [
 ]
 readme = "README.md"
 dynamic = ["version"]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 dependencies = [
-    "hdx-python-utilities>=4.2.3,<5",
+    "hdx-python-utilities>=4.2.5,<5",
     "tenacity",
 ]
 
@@ -82,19 +81,20 @@ 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)
 # ----------------------------------------------------------------------------
 
 [tool.ruff]
-target-version = "py310"
+target-version = "py311"
 src = ["src"]
 exclude = ["_version.py"]
 

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

{hdx_python_country-4.2.4 → hdx_python_country-4.2.6}/src/hdx/location/currency.py

@@ -2,7 +2,7 @@
 
 import logging
 from copy import deepcopy
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from pathlib import Path
 
 from hdx.utilities.dateparse import (
@@ -484,9 +484,7 @@ class Currency:
         if currency == "USD":
             return 1
         if ignore_timeinfo:
-            date = date.replace(
-                hour=0, minute=0, second=0, microsecond=0, tzinfo=timezone.utc
-            )
+            date = date.replace(hour=0, minute=0, second=0, microsecond=0, tzinfo=UTC)
         timestamp = get_int_timestamp(date)
         return cls._get_historic_rate(currency, timestamp)
 

{hdx_python_country-4.2.4 → hdx_python_country-4.2.6}/src/hdx/location/wfp_exchangerates.py

@@ -1,6 +1,6 @@
 import logging
 from collections.abc import Sequence
-from datetime import timezone
+from datetime import UTC
 
 from .int_timestamp import get_int_timestamp
 from .wfp_api import WFPAPI
@@ -62,7 +62,7 @@ class WFPExchangeRates:
                 # data_bridges_client parses WFP's timezone-less date strings
                 # into naive datetimes; assume UTC to match previous
                 # parse_date-based behaviour
-                date = date.replace(tzinfo=timezone.utc)
+                date = date.replace(tzinfo=UTC)
             timestamp = get_int_timestamp(date)
             historic_rates[timestamp] = quote.value
         return historic_rates