hdx-python-country 3.8.4__tar.gz → 3.8.6__tar.gz

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/.config/pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: check-ast
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.0
+    rev: v0.8.6
     hooks:
       # Run the linter.
       - id: ruff
@@ -17,7 +17,7 @@ repos:
       - id: ruff-format
         args: [--config, .config/ruff.toml]
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.4.24
+    rev: 0.5.15
     hooks:
       # Run the pip compile
       - id: pip-compile

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/PKG-INFO

@@ -1,10 +1,11 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 3.8.4
+Version: 3.8.6
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Author: Michael Rans
 License: MIT
+License-File: LICENSE
 Keywords: HDX,country,country code,currencies,currency,exchange rate,foreign exchange,fx,iso 3166,iso2,iso3,location,region
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -24,9 +25,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
-Requires-Dist: hdx-python-utilities>=3.7.4
+Requires-Dist: hdx-python-utilities>=3.8.0
 Requires-Dist: libhxl>=5.2.2
-Requires-Dist: pyphonetics
 Requires-Dist: tenacity
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == 'dev'

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/pyproject.toml

@@ -34,9 +34,8 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "hdx-python-utilities>=3.7.4",
+    "hdx-python-utilities>=3.8.0",
     "libhxl>=5.2.2",
-    "pyphonetics",
     "tenacity",
 ]
 dynamic = ["version"]
@@ -65,6 +64,9 @@ packages = ["src/hdx"]
 [tool.hatch.build.hooks.vcs]
 version-file = "src/hdx/location/_version.py"
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 # Versioning
 
 [tool.hatch.version]
@@ -90,7 +92,7 @@ run = """
        """
 
 [tool.hatch.envs.hatch-static-analysis]
-dependencies = ["ruff==0.7.0"]
+dependencies = ["ruff==0.8.6"]
 
 [tool.hatch.envs.hatch-static-analysis.scripts]
 format-check = ["ruff format --config .config/ruff.toml --check --diff {args:.}",]

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/requirements.txt

@@ -2,23 +2,23 @@
 #    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-attrs==24.2.0
+attrs==24.3.0
     # via
     #   frictionless
     #   jsonlines
     #   jsonschema
     #   referencing
-certifi==2024.8.30
+certifi==2024.12.14
     # via requests
 cfgv==3.4.0
     # via pre-commit
 chardet==5.2.0
     # via frictionless
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
     # via requests
-click==8.1.7
+click==8.1.8
     # via typer
-coverage==7.6.7
+coverage==7.6.10
     # via pytest-cov
 distlib==0.3.9
     # via virtualenv
@@ -28,11 +28,11 @@ filelock==3.16.1
     # via virtualenv
 frictionless==5.18.0
     # via hdx-python-utilities
-hdx-python-utilities==3.7.4
+hdx-python-utilities==3.8.0
     # via hdx-python-country (pyproject.toml)
 humanize==4.11.0
     # via frictionless
-identify==2.6.2
+identify==2.6.5
     # via pre-commit
 idna==3.10
     # via requests
@@ -42,7 +42,7 @@ iniconfig==2.0.0
     # via pytest
 isodate==0.7.2
     # via frictionless
-jinja2==3.1.4
+jinja2==3.1.5
     # via frictionless
 jsonlines==4.0.0
     # via hdx-python-utilities
@@ -56,7 +56,7 @@ jsonschema-specifications==2024.10.1
     # via jsonschema
 libhxl==5.2.2
     # via hdx-python-country (pyproject.toml)
-loguru==0.7.2
+loguru==0.7.3
     # via hdx-python-utilities
 markdown-it-py==3.0.0
     # via rich
@@ -84,15 +84,15 @@ ply==3.11
     #   libhxl
 pre-commit==4.0.1
     # via hdx-python-country (pyproject.toml)
-pydantic==2.9.2
+pydantic==2.10.5
     # via frictionless
-pydantic-core==2.23.4
+pydantic-core==2.27.2
     # via pydantic
-pygments==2.18.0
+pygments==2.19.1
     # via rich
 pyphonetics==0.5.3
-    # via hdx-python-country (pyproject.toml)
-pytest==8.3.3
+    # via hdx-python-utilities
+pytest==8.3.4
     # via
     #   hdx-python-country (pyproject.toml)
     #   pytest-cov
@@ -129,11 +129,11 @@ rfc3986==2.0.0
     # via frictionless
 rich==13.9.4
     # via typer
-rpds-py==0.21.0
+rpds-py==0.22.3
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.18.6
+ruamel-yaml==0.18.10
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
@@ -141,7 +141,7 @@ shellingham==1.5.4
     # via typer
 simpleeval==1.0.3
     # via frictionless
-six==1.16.0
+six==1.17.0
     # via python-dateutil
 stringcase==1.2.0
     # via frictionless
@@ -155,7 +155,7 @@ tenacity==9.0.0
     # via hdx-python-country (pyproject.toml)
 text-unidecode==1.3
     # via python-slugify
-typer==0.13.0
+typer==0.15.1
     # via frictionless
 typing-extensions==4.12.2
     # via
@@ -167,21 +167,21 @@ unidecode==1.3.8
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.2.3
+urllib3==2.3.0
     # via
     #   libhxl
     #   requests
 validators==0.34.0
     # via frictionless
-virtualenv==20.27.1
+virtualenv==20.28.1
     # via pre-commit
-wheel==0.45.0
+wheel==0.45.1
     # via libhxl
 xlrd==2.0.1
     # via hdx-python-utilities
 xlrd3==1.1.0
     # via libhxl
-xlsx2csv==0.8.3
+xlsx2csv==0.8.4
     # via hdx-python-utilities
 xlsxwriter==3.2.0
     # via tableschema-to-template

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/src/hdx/location/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.8.4'
-__version_tuple__ = version_tuple = (3, 8, 4)
+__version__ = version = '3.8.6'
+__version_tuple__ = version_tuple = (3, 8, 6)

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/src/hdx/location/adminlevel.py

@@ -7,11 +7,11 @@ from hxl import InputOptions
 from hxl.input import HXLIOException
 
 from hdx.location.country import Country
-from hdx.location.phonetics import Phonetics
 from hdx.utilities.base_downloader import DownloadError
 from hdx.utilities.dictandlist import dict_of_sets_add
+from hdx.utilities.matching import Phonetics, multiple_replace
 from hdx.utilities.retriever import Retrieve
-from hdx.utilities.text import multiple_replace, normalise
+from hdx.utilities.text import normalise
 from hdx.utilities.typehint import ListTuple
 
 logger = logging.getLogger(__name__)

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/src/hdx/location/country.py

@@ -212,7 +212,7 @@ class Country:
     @classmethod
     def countriesdata(
         cls,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         country_name_overrides: Dict = None,
         country_name_mappings: Dict = None,
     ) -> List[Dict[str, Dict]]:
@@ -227,6 +227,8 @@ class Country:
         Returns:
             List[Dict[str,Dict]]: Countries dictionaries
         """
+        if use_live is None:
+            use_live = cls._use_live
         if cls._countriesdata is None:
             countries = None
             if country_name_overrides is not None:
@@ -326,7 +328,7 @@ class Country:
     def get_country_info_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[Dict[str, str]]:
         """Get country information from ISO3 code
@@ -352,7 +354,7 @@ class Country:
     def get_country_name_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
         formal: bool = False,
     ) -> Optional[str]:
@@ -389,7 +391,7 @@ class Country:
     def get_currency_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[int]:
         """Get currency code from ISO3 code
@@ -415,7 +417,7 @@ class Country:
     def get_iso2_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[str]:
         """Get ISO2 from ISO3 code
@@ -441,7 +443,7 @@ class Country:
     def get_iso3_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[str]:
         """Get ISO3 from ISO2 code
@@ -467,7 +469,7 @@ class Country:
     def get_country_info_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[Dict[str, str]]:
         """Get country name from ISO2 code
@@ -493,7 +495,7 @@ class Country:
     def get_country_name_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
         formal: bool = False,
     ) -> Optional[str]:
@@ -521,7 +523,7 @@ class Country:
     def get_currency_from_iso2(
         cls,
         iso2: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[str]:
         """Get currency from ISO2 code
@@ -547,7 +549,7 @@ class Country:
     def get_m49_from_iso3(
         cls,
         iso3: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[int]:
         """Get M49 from ISO3 code
@@ -573,7 +575,7 @@ class Country:
     def get_iso3_from_m49(
         cls,
         m49: int,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[str]:
         """Get ISO3 from M49 code
@@ -599,7 +601,7 @@ class Country:
     def get_country_info_from_m49(
         cls,
         m49: int,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[Dict[str, str]]:
         """Get country name from M49 code
@@ -623,7 +625,7 @@ class Country:
     def get_country_name_from_m49(
         cls,
         m49: int,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
         formal: bool = False,
     ) -> Optional[str]:
@@ -651,7 +653,7 @@ class Country:
     def get_currency_from_m49(
         cls,
         m49: int,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[str]:
         """Get currency from M49 code
@@ -754,7 +756,7 @@ class Country:
     def get_iso3_country_code(
         cls,
         country: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> Optional[str]:
         """Get ISO3 code for cls. Only exact matches or None are returned.
@@ -814,7 +816,7 @@ class Country:
     def get_iso3_country_code_fuzzy(
         cls,
         country: str,
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
         min_chars: int = 5,
     ) -> Tuple[Optional[str], bool]:
@@ -904,7 +906,7 @@ class Country:
     def get_countries_in_region(
         cls,
         region: Union[int, str],
-        use_live: bool = _use_live,
+        use_live: bool = None,
         exception: Optional[ExceptionUpperBound] = None,
     ) -> List[str]:
         """Get countries (ISO3 codes) in region

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/tests/hdx/location/test_adminlevel.py

@@ -421,7 +421,7 @@ class TestAdminLevel:
         adminone = AdminLevel(config)
         adminone.setup_from_url()
         assert adminone.get_admin_level("YEM") == 1
-        assert len(adminone.get_pcode_list()) == 2526
+        assert len(adminone.get_pcode_list()) == 2527
         assert adminone.get_pcode_length("YEM") == 4
         assert adminone.get_pcode("YEM", "YE30", logname="test") == (
             "YE30",

{hdx_python_country-3.8.4 → hdx_python_country-3.8.6}/tests/hdx/location/test_country.py

@@ -12,8 +12,19 @@ class LocationError(Exception):
     pass
 
 
-# Note that the Country class is set up in __init__.py
 class TestCountry:
+    @pytest.fixture(scope="function", autouse=True)
+    def setup(self):
+        # Clean up Country class before each test
+        Country._countriesdata = None
+        Country.set_use_live_default(False)
+        Country.set_ocha_url()
+        Country.set_ocha_path()
+        Country.countriesdata(
+            country_name_overrides={"PSE": "oPt"},
+            country_name_mappings={"Congo DR": "COD"},
+        )
+
     def test_get_country_name_from_iso3(self):
         assert Country.get_country_name_from_iso3("jpn") == "Japan"
         assert Country.get_country_name_from_iso3("awe") is None
@@ -696,8 +707,17 @@ class TestCountry:
         assert Country._use_live is True
         Country.set_use_live_default(False)
         assert Country._use_live is False
+        # We should now be able to load from local data without setting use_live=False
+        Country._countriesdata = None
+        Country.set_ocha_path(
+            script_dir_plus_file("Countries_UZB_Deleted.csv", TestCountry)
+        )
+        assert Country.get_iso3_country_code("UZBEKISTAN") is None
         Country.set_use_live_default(None)
         assert Country._use_live is True
+        Country._countriesdata = None
+        assert Country.get_iso3_country_code("UZBEKISTAN") == "UZB"
+        Country._countriesdata = None
 
     def test_ocha_feed_file_working(self):
         countries = hxl.data(

hdx_python_country-3.8.4/src/hdx/location/phonetics.py

@@ -1,56 +0,0 @@
-from typing import Callable, Optional
-
-import pyphonetics
-
-from hdx.utilities.typehint import ListTuple
-
-
-class Phonetics(pyphonetics.RefinedSoundex):
-    def match(
-        self,
-        possible_names: ListTuple,
-        name: str,
-        alternative_name: Optional[str] = None,
-        transform_possible_names: ListTuple[Callable] = [],
-        threshold: int = 2,
-    ) -> Optional[int]:
-        """
-        Match name to one of the given possible names. Returns None if no match
-        or the index of the matching name
-
-        Args:
-            possible_names (ListTuple): Possible names
-            name (str): Name to match
-            alternative_name (str): Alternative name to match. Defaults to None.
-            transform_possible_names (ListTuple[Callable]): Functions to transform possible names.
-            threshold: Match threshold. Defaults to 2.
-
-        Returns:
-            Optional[int]: Index of matching name from possible names or None
-        """
-        mindistance = None
-        matching_index = None
-
-        transform_possible_names.insert(0, lambda x: x)
-
-        def check_name(name, possible_name):
-            nonlocal mindistance, matching_index  # noqa: E999
-
-            distance = self.distance(name, possible_name)
-            if mindistance is None or distance < mindistance:
-                mindistance = distance
-                matching_index = i
-
-        for i, possible_name in enumerate(possible_names):
-            for transform_possible_name in transform_possible_names:
-                transformed_possible_name = transform_possible_name(
-                    possible_name
-                )
-                if not transformed_possible_name:
-                    continue
-                check_name(name, transformed_possible_name)
-                if alternative_name:
-                    check_name(alternative_name, transformed_possible_name)
-        if mindistance is None or mindistance > threshold:
-            return None
-        return matching_index

hdx_python_country-3.8.4/tests/hdx/location/__init__.py

@@ -1,8 +0,0 @@
-from hdx.location.country import Country
-
-Country.set_use_live_default(False)
-
-Country.countriesdata(
-    country_name_overrides={"PSE": "oPt"},
-    country_name_mappings={"Congo DR": "COD"},
-)