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

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/.github/workflows/publish.yaml

@@ -17,7 +17,7 @@ jobs:
       contents: read
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
     - name: Get history and tags for versioning to work
       run: |
@@ -25,7 +25,7 @@ jobs:
         git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v7
+      uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
 
     - name: Build with uv
       run: uv build

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/.github/workflows/run-python-tests.yaml

@@ -16,10 +16,10 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v7
+        uses: astral-sh/setup-uv@07a047e608db84b3d8c06cd9a7c7dcc9c355c18e # v10.3.2
         with:
           enable-cache: true
           python-version: "3.13"
@@ -36,13 +36,13 @@ jobs:
         run: uv run pytest
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
+        uses: EnricoMi/publish-unit-test-result-action@7622c5bf3d112a72ab4fa3951c2aa5723d8ab92d # v2.25.0
         if: success()
         with:
           files: test-results.xml
 
       - name: Publish in Coveralls
-        uses: coverallsapp/github-action@v2
+        uses: coverallsapp/github-action@8d6379e14d29928660c4ba802d8e85393440b329 # v2.3.8
         if: always()
         with:
           flag-name: tests

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: check-ast
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.13
+    rev: v0.17.3
     hooks:
       # Run the linter.
       - id: ruff-check
@@ -19,7 +19,7 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.9.25
+    rev: 0.13.6
     hooks:
       # Ensure the lockfile is up-to-date with pyproject.toml
       - id: uv-lock

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: hdx-python-country
-Version: 4.2.6
+Version: 4.2.7
 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
@@ -26,7 +26,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
-Requires-Dist: hdx-python-utilities<5,>=4.2.5
+Requires-Dist: hdx-python-utilities<5,>=4.2.6
 Requires-Dist: tenacity
 Provides-Extra: docs
 Requires-Dist: mkapi; extra == 'docs'

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

@@ -35,7 +35,7 @@ dynamic = ["version"]
 requires-python = ">=3.11"
 
 dependencies = [
-    "hdx-python-utilities>=4.2.5,<5",
+    "hdx-python-utilities>=4.2.6,<5",
     "tenacity",
 ]
 
@@ -48,7 +48,7 @@ dev = [
     "pytest",
     "pytest-cov",
     "pre-commit",
-    "ruff==0.14.13",
+    "ruff==0.17.3",
     "data-bridges-client>=9.0.0,<10",
 ]
 

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

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/src/hdx/location/adminlevel.py

@@ -72,7 +72,7 @@ class AdminLevel:
         self._countries_fuzzy_try = admin_config.get("countries_fuzzy_try")
         self._admin_name_mappings = admin_config.get("admin_name_mappings", {})
         self._admin_name_replacements = admin_config.get("admin_name_replacements", {})
-        self._admin_fuzzy_dont = admin_config.get("admin_fuzzy_dont", list())
+        self._admin_fuzzy_dont = admin_config.get("admin_fuzzy_dont", [])
         self._use_parent = False
         self._zeroes = {}
         self._parent_admins = []
@@ -100,9 +100,7 @@ class AdminLevel:
         Returns:
             Whether string looks like a p-code
         """
-        if cls.pcode_regex.match(string):
-            return True
-        return False
+        return bool(cls.pcode_regex.match(string))
 
     @classmethod
     def set_default_admin_url(cls, admin_url: str | None = None) -> None:
@@ -403,19 +401,22 @@ class AdminLevel:
                             admin_changes.append(str(admin_no))
                     else:
                         admin_changes.append(str(admin_no))
-            elif len_new_pcode > total_length:
-                if admin_length <= 2 and pcode_part[0] == "0":
-                    pcode_part = pcode_part[1:]
-                    if self._parent_admins and admin_no < self.admin_level:
-                        parent_pcode = [pcode_parts[i] for i in range(admin_no)]
-                        parent_pcode.append(pcode_part[:admin_length])
-                        parent_pcode = "".join(parent_pcode)
-                        if parent_pcode not in self._parent_admins[admin_no - 1]:
-                            pcode_part = f"0{pcode_part}"
-                        else:
-                            admin_changes.append(str(admin_no))
+            elif (
+                len_new_pcode > total_length
+                and admin_length <= 2
+                and pcode_part[0] == "0"
+            ):
+                pcode_part = pcode_part[1:]
+                if self._parent_admins and admin_no < self.admin_level:
+                    parent_pcode = [pcode_parts[i] for i in range(admin_no)]
+                    parent_pcode.append(pcode_part[:admin_length])
+                    parent_pcode = "".join(parent_pcode)
+                    if parent_pcode not in self._parent_admins[admin_no - 1]:
+                        pcode_part = f"0{pcode_part}"
                     else:
                         admin_changes.append(str(admin_no))
+                else:
+                    admin_changes.append(str(admin_no))
             pcode_parts[admin_no] = pcode_part[:admin_length]
             pcode_parts.append(pcode_part[admin_length:])
             new_pcode = "".join(pcode_parts)
@@ -506,11 +507,10 @@ class AdminLevel:
                     relevant_name_replacements[key] = value
                 continue
             prefix, name = key.split("|")
-            if parent:
-                if prefix == parent:
-                    if name not in relevant_name_replacements:
-                        relevant_name_replacements[name] = value
-                    continue
+            if parent and prefix == parent:
+                if name not in relevant_name_replacements:
+                    relevant_name_replacements[name] = value
+                continue
             if prefix == countryiso3:
                 if name not in relevant_name_replacements:
                     relevant_name_replacements[name] = value
@@ -537,10 +537,8 @@ class AdminLevel:
                     relevant_admin_fuzzy_dont.append(value)
                 continue
             prefix, name = value.split("|")
-            if parent:
-                if prefix == parent:
-                    if name not in relevant_admin_fuzzy_dont:
-                        relevant_admin_fuzzy_dont.append(name)
+            if parent and prefix == parent and name not in relevant_admin_fuzzy_dont:
+                relevant_admin_fuzzy_dont.append(name)
             if prefix == countryiso3:
                 if name not in relevant_admin_fuzzy_dont:
                     relevant_admin_fuzzy_dont.append(name)

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/src/hdx/location/country.py

@@ -5,7 +5,7 @@ import os.path
 import re
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Any
+from typing import Any, ClassVar
 
 from hdx.utilities.base_downloader import BaseDownload, DownloadError
 from hdx.utilities.downloader import Download
@@ -24,7 +24,7 @@ class Country:
     region names and codes. Uses OCHA's countries and territories feed.
     """
 
-    abbreviations = {
+    abbreviations: ClassVar[dict[str, str]] = {
         "DEM.": "DEMOCRATIC",
         "FMR.": "FORMER",
         "PROV.": "PROVINCE",
@@ -37,7 +37,7 @@ class Country:
         "W.": "WEST",
         "K.": "KINGDOM",
     }
-    major_differentiators = [
+    major_differentiators: ClassVar[list[str]] = [
         "DEMOCRATIC",
         "NORTH",
         "SOUTH",
@@ -45,13 +45,13 @@ class Country:
         "WEST",
         "STATES",
     ]
-    multiple_abbreviations = {
+    multiple_abbreviations: ClassVar[dict[str, list[str]]] = {
         "FED.": ["FEDERATION", "FEDERAL", "FEDERATED"],
         "ISL.": ["ISLAND", "ISLANDS"],
         "S.": ["SOUTH", "STATES"],
         "TERR.": ["TERRITORY", "TERRITORIES"],
     }
-    simplifications = [
+    simplifications: ClassVar[list[str]] = [
         "AND",
         "THE",
         "OF",
@@ -80,8 +80,8 @@ class Country:
         CountryError,
     )
     _ochapath = _ochapath_default
-    _country_name_overrides = {}
-    _country_name_mappings = {}
+    _country_name_overrides: ClassVar[dict] = {}
+    _country_name_mappings: ClassVar[dict] = {}
     _country_name_keys = (
         "Preferred Term",
         "ISO Alt Term",
@@ -223,7 +223,7 @@ class Country:
         def sort_list(colname):
             for idval in cls._countriesdata[colname]:
                 cls._countriesdata[colname][idval] = sorted(
-                    list(cls._countriesdata[colname][idval])
+                    cls._countriesdata[colname][idval]
                 )
 
         sort_list("regioncodes2countries")
@@ -317,7 +317,7 @@ class Country:
         cls._use_live = use_live
 
     @classmethod
-    def set_ocha_url(cls, url: str = None) -> None:
+    def set_ocha_url(cls, url: str | None = None) -> None:
         """
         Set OCHA url from which to retrieve countries data
 
@@ -376,7 +376,7 @@ class Country:
     def get_country_info_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> dict[str, str] | None:
@@ -404,7 +404,7 @@ class Country:
     def get_country_name_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         formal: bool = False,
         downloader: BaseDownload | None = None,
@@ -441,7 +441,7 @@ class Country:
     def get_currency_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> int | None:
@@ -469,7 +469,7 @@ class Country:
     def get_iso2_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> str | None:
@@ -497,7 +497,7 @@ class Country:
     def get_iso3_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> str | None:
@@ -525,7 +525,7 @@ class Country:
     def get_country_info_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> dict[str, str] | None:
@@ -553,7 +553,7 @@ class Country:
     def get_country_name_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         formal: bool = False,
         downloader: BaseDownload | None = None,
@@ -583,7 +583,7 @@ class Country:
     def get_currency_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> str | None:
@@ -611,7 +611,7 @@ class Country:
     def get_m49_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> int | None:
@@ -639,7 +639,7 @@ class Country:
     def get_iso3_from_m49(
         cls,
         m49: int,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> str | None:
@@ -667,7 +667,7 @@ class Country:
     def get_country_info_from_m49(
         cls,
         m49: int,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> dict[str, str] | None:
@@ -695,7 +695,7 @@ class Country:
     def get_country_name_from_m49(
         cls,
         m49: int,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         formal: bool = False,
         downloader: BaseDownload | None = None,
@@ -725,7 +725,7 @@ class Country:
     def get_currency_from_m49(
         cls,
         m49: int,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> str | None:
@@ -876,7 +876,7 @@ class Country:
     def get_iso3_country_code(
         cls,
         country: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> str | None:
@@ -912,13 +912,13 @@ class Country:
                 if iso3 is not None:
                     return iso3
         elif re.search(r"[\u4e00-\u9fff]+", countryupper):
-            for country in countriesdata["countries"]:
-                if countriesdata["countries"][country]["Chinese Short"] == countryupper:
-                    return country
+            for iso3 in countriesdata["countries"]:
+                if countriesdata["countries"][iso3]["Chinese Short"] == countryupper:
+                    return iso3
         elif re.search(r"[\u0600-\u06FF]+", countryupper):
-            for country in countriesdata["countries"]:
-                if countriesdata["countries"][country]["Arabic Short"] == countryupper:
-                    return country
+            for iso3 in countriesdata["countries"]:
+                if countriesdata["countries"][iso3]["Arabic Short"] == countryupper:
+                    return iso3
 
         if exception is not None:
             raise exception
@@ -928,7 +928,7 @@ class Country:
     def get_iso3_country_code_fuzzy(
         cls,
         country: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         min_chars: int = 5,
         downloader: BaseDownload | None = None,
@@ -1023,7 +1023,7 @@ class Country:
     def get_countries_in_region(
         cls,
         region: int | str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> list[str]:
@@ -1056,7 +1056,7 @@ class Country:
     def get_hrp_status_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> bool | None:
@@ -1082,7 +1082,7 @@ class Country:
     def get_gho_status_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = None,
+        use_live: bool | None = None,
         exception: Exception | None = None,
         downloader: BaseDownload | None = None,
     ) -> bool | None:

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

@@ -4,6 +4,7 @@ import logging
 from copy import deepcopy
 from datetime import UTC, datetime
 from pathlib import Path
+from typing import ClassVar
 
 from hdx.utilities.dateparse import (
     now_utc,
@@ -34,11 +35,11 @@ class Currency:
     _secondary_historic_url = (
         "https://codeforiati.org/imf-exchangerates/imf_exchangerates.csv"
     )
-    _cached_current_rates = {}
-    _cached_historic_rates = {}
+    _cached_current_rates: ClassVar[dict] = {}
+    _cached_historic_rates: ClassVar[dict] = {}
     _rates_api = ""
-    _secondary_rates = {}
-    _secondary_historic_rates = {}
+    _secondary_rates: ClassVar[dict] = {}
+    _secondary_historic_rates: ClassVar[dict] = {}
     _fallback_to_current = False
     _no_historic = False
     _user_agent = "hdx-python-country-rates"
@@ -60,8 +61,8 @@ class Currency:
         no_historic: bool = False,
         fixed_now: datetime | None = None,
         log_level: int = logging.DEBUG,
-        current_rates_cache: dict = {"USD": 1},
-        historic_rates_cache: dict = {},
+        current_rates_cache: dict | None = None,
+        historic_rates_cache: dict | None = None,
         use_secondary_historic: bool = False,
     ) -> None:
         """
@@ -88,6 +89,10 @@ class Currency:
             None
         """
 
+        if historic_rates_cache is None:
+            historic_rates_cache = {}
+        if current_rates_cache is None:
+            current_rates_cache = {"USD": 1}
         cls._cached_current_rates = deepcopy(current_rates_cache)
         cls._cached_historic_rates = deepcopy(historic_rates_cache)
         cls._rates_api = primary_rates_url
@@ -194,14 +199,10 @@ class Currency:
             return None
 
         def beyond_threshold(x, y):
-            if max(x, y) / min(x, y) > cls._threshold:
-                return True
-            return False
+            return max(x, y) / min(x, y) > cls._threshold
 
         def within_threshold(x, y):
-            if max(x, y) / min(x, y) > cls._threshold:
-                return False
-            return True
+            return max(x, y) / min(x, y) <= cls._threshold
 
         # Compare adjclose to other variables returned by Yahoo API
         adjclose = adjclose[0]
@@ -232,29 +233,27 @@ class Currency:
             secondary_fx_rate = cls._get_secondary_historic_rate(currency, timestamp)
         if not secondary_fx_rate:
             # compare with high and low to reveal errors from Yahoo feed
-            if high and low:
-                if within_threshold(low, high):
-                    return low + (high - low) / 2
+            if high and low and within_threshold(low, high):
+                return low + (high - low) / 2
             return None
 
         # compare with secondary historic rate
         if within_threshold(adjclose, secondary_fx_rate):
             return adjclose
         # if adjclose is wacky, find another value to return that is ok
-        if high and low:
-            if within_threshold(high, secondary_fx_rate) and within_threshold(
-                low, secondary_fx_rate
-            ):
-                return low + (high - low) / 2
-        if open:
-            if within_threshold(open, secondary_fx_rate):
-                return open
-        if high:
-            if within_threshold(high, secondary_fx_rate):
-                return high
-        if low:
-            if within_threshold(low, secondary_fx_rate):
-                return low
+        if (
+            high
+            and low
+            and within_threshold(high, secondary_fx_rate)
+            and within_threshold(low, secondary_fx_rate)
+        ):
+            return low + (high - low) / 2
+        if open and within_threshold(open, secondary_fx_rate):
+            return open
+        if high and within_threshold(high, secondary_fx_rate):
+            return high
+        if low and within_threshold(low, secondary_fx_rate):
+            return low
         return secondary_fx_rate
 
     @classmethod
@@ -329,7 +328,7 @@ class Currency:
         raise CurrencyError(f"Failed to get rate for currency {currency}!")
 
     @classmethod
-    def get_current_value_in_usd(cls, value: int | float, currency: str) -> float:
+    def get_current_value_in_usd(cls, value: float, currency: str) -> float:
         """
         Get the current USD value of the value in local currency
 
@@ -347,9 +346,7 @@ class Currency:
         return value / fx_rate
 
     @classmethod
-    def get_current_value_in_currency(
-        cls, usdvalue: int | float, currency: str
-    ) -> float:
+    def get_current_value_in_currency(cls, usdvalue: float, currency: str) -> float:
         """
         Get the current value in local currency of the value in USD
 
@@ -389,7 +386,7 @@ class Currency:
             return fx_rate
         timestamp1 = None
         timestamp2 = None
-        for ts in currency_data.keys():
+        for ts in currency_data:
             if timestamp > ts:
                 timestamp1 = ts
             else:
@@ -491,7 +488,7 @@ class Currency:
     @classmethod
     def get_historic_value_in_usd(
         cls,
-        value: int | float,
+        value: float,
         currency: str,
         date: datetime,
         ignore_timeinfo: bool = True,
@@ -521,7 +518,7 @@ class Currency:
     @classmethod
     def get_historic_value_in_currency(
         cls,
-        usdvalue: int | float,
+        usdvalue: float,
         currency: str,
         date: datetime,
         ignore_timeinfo: bool = True,

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/src/hdx/location/int_timestamp.py

@@ -17,6 +17,6 @@ def get_int_timestamp(date: datetime) -> int:
     """
     timestamp = _cache_timestamp_lookup.get(date)
     if timestamp is None:
-        timestamp = int(round(get_timestamp_from_datetime(date)))
+        timestamp = round(get_timestamp_from_datetime(date))
         _cache_timestamp_lookup[date] = timestamp
     return timestamp

{hdx_python_country-4.2.6 → hdx_python_country-4.2.7}/src/hdx/location/wfp_api.py

@@ -3,7 +3,7 @@ import logging
 from collections.abc import Callable
 from datetime import date, datetime
 from os import getenv
-from typing import Any
+from typing import Any, ClassVar
 
 from data_bridges_client import (
     ApiClient,
@@ -60,7 +60,7 @@ class WFPAPI:
         retriever: Retrieve object for interacting with WFP API
     """
 
-    default_retry_params = {
+    default_retry_params: ClassVar[dict[str, Any]] = {
         "retry": retry_if_exception_type(ApiException),
         "after": after_log(logger, logging.INFO),
     }