hdx-python-country 4.0.0__tar.gz → 4.0.1__tar.gz

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-country
-Version: 4.0.0
+Version: 4.0.1
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Author: Michael Rans
@@ -25,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
-Requires-Dist: hdx-python-utilities>=4.0.0
+Requires-Dist: hdx-python-utilities>=4.0.1
 Requires-Dist: libhxl>=5.2.2
 Requires-Dist: tenacity
 Provides-Extra: dev

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/pyproject.toml

@@ -34,7 +34,7 @@ classifiers = [
 requires-python = ">=3.10"
 
 dependencies = [
-    "hdx-python-utilities>=4.0.0",
+    "hdx-python-utilities>=4.0.1",
     "libhxl>=5.2.2",
     "tenacity",
 ]

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/requirements.txt

@@ -20,7 +20,7 @@ et-xmlfile==2.0.0
     # via openpyxl
 frictionless==5.18.1
     # via hdx-python-utilities
-hdx-python-utilities==4.0.0
+hdx-python-utilities==4.0.1
     # via hdx-python-country (pyproject.toml)
 humanize==4.15.0
     # via frictionless

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/src/hdx/location/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.0.0'
-__version_tuple__ = version_tuple = (4, 0, 0)
+__version__ = version = '4.0.1'
+__version_tuple__ = version_tuple = (4, 0, 1)
 
 __commit_id__ = commit_id = None

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/src/hdx/location/adminlevel.py

@@ -1,6 +1,7 @@
 import logging
 import re
 from collections.abc import Sequence
+from pathlib import Path
 from typing import Any
 
 import hxl
@@ -116,7 +117,7 @@ class AdminLevel:
 
     @staticmethod
     def get_libhxl_dataset(
-        url: str = admin_url, retriever: Retrieve | None = None
+        url: Path | str = admin_url, retriever: Retrieve | None = None
     ) -> hxl.Dataset:
         """
         Get libhxl Dataset object given a URL which defaults to global p-codes
@@ -139,7 +140,7 @@ class AdminLevel:
             url_to_use = url
         try:
             return hxl.data(
-                url_to_use,
+                str(url_to_use),
                 InputOptions(InputOptions(allow_local=True, encoding="utf-8")),
             )
         except (FileNotFoundError, HXLIOException):
@@ -247,7 +248,7 @@ class AdminLevel:
 
     def setup_from_url(
         self,
-        admin_url: str = admin_url,
+        admin_url: Path | str = admin_url,
         countryiso3s: Sequence[str] | None = None,
     ) -> None:
         """
@@ -289,7 +290,7 @@ class AdminLevel:
             for x in re.finditer("0", pcode):
                 dict_of_sets_add(self.zeroes, countryiso3, x.start())
 
-    def load_pcode_formats(self, formats_url: str = formats_url) -> None:
+    def load_pcode_formats(self, formats_url: Path | str = formats_url) -> None:
         """
         Load p-code formats from a URL. Defaults to global p-codes dataset on HDX.
 

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/src/hdx/location/country.py

@@ -3,6 +3,7 @@
 import logging
 import os.path
 import re
+from pathlib import Path
 
 import hxl
 from hdx.utilities.path import script_dir_plus_file
@@ -239,14 +240,16 @@ class Country:
                 cls.set_country_name_mappings(country_name_mappings)
             if cls._use_live:
                 try:
-                    countries = hxl.data(cls._ochaurl, InputOptions(encoding="utf-8"))
+                    countries = hxl.data(
+                        str(cls._ochaurl), InputOptions(encoding="utf-8")
+                    )
                 except OSError:
                     logger.exception(
                         "Download from OCHA feed failed! Falling back to stored file."
                     )
             if countries is None:
                 countries = hxl.data(
-                    cls._ochapath,
+                    str(cls._ochapath),
                     InputOptions(allow_local=True, encoding="utf-8"),
                 )
             cls.set_countriesdata(countries)
@@ -302,7 +305,7 @@ class Country:
         cls._ochaurl = url
 
     @classmethod
-    def set_ocha_path(cls, path: str | None = None) -> None:
+    def set_ocha_path(cls, path: Path | str | None = None) -> None:
         """
         Set local path from which to retrieve OCHA countries data
 

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/src/hdx/location/currency.py

@@ -3,6 +3,7 @@
 import logging
 from copy import deepcopy
 from datetime import datetime, timezone
+from pathlib import Path
 
 from hdx.utilities.dateparse import (
     now_utc,
@@ -50,9 +51,9 @@ class Currency:
     def setup(
         cls,
         retriever: Retrieve | None = None,
-        primary_rates_url: str = _primary_rates_url,
-        secondary_rates_url: str = _secondary_rates_url,
-        secondary_historic_url: str | None = _secondary_historic_url,
+        primary_rates_url: Path | str = _primary_rates_url,
+        secondary_rates_url: Path | str = _secondary_rates_url,
+        secondary_historic_url: Path | str | None = _secondary_historic_url,
         secondary_historic_rates: dict | None = None,
         fallback_historic_to_current: bool = False,
         fallback_current_to_static: bool = False,
@@ -100,7 +101,7 @@ class Currency:
             temp_dir = get_temp_dir(cls._user_agent)
             retriever = Retrieve(
                 downloader,
-                None,
+                temp_dir,
                 temp_dir,
                 temp_dir,
                 save=False,

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/src/hdx/location/wfp_api.py

@@ -1,4 +1,5 @@
 import logging
+from pathlib import Path
 from typing import Any
 
 from hdx.utilities.base_downloader import DownloadError
@@ -65,7 +66,7 @@ class WFPAPI:
 
     def retrieve(
         self,
-        url: str,
+        url: Path | str,
         filename: str,
         log: str,
         parameters: dict | None = None,

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/tests/hdx/location/conftest.py

@@ -1,4 +1,4 @@
-from os.path import join
+from pathlib import Path
 
 import pytest
 
@@ -7,12 +7,12 @@ from hdx.location.currency import Currency
 
 @pytest.fixture(scope="session")
 def fixtures_dir():
-    return join("tests", "fixtures")
+    return Path("tests") / "fixtures"
 
 
 @pytest.fixture(scope="session")
 def input_dir(fixtures_dir):
-    return join(fixtures_dir, "wfp")
+    return fixtures_dir / "wfp"
 
 
 @pytest.fixture(scope="function")

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/tests/hdx/location/test_adminlevel.py

@@ -1,7 +1,5 @@
 """location Tests"""
 
-from os.path import join
-
 import pytest
 from hdx.utilities.base_downloader import DownloadError
 from hdx.utilities.downloader import Download
@@ -15,19 +13,19 @@ from hdx.location.adminlevel import AdminLevel
 class TestAdminLevel:
     @pytest.fixture(scope="function")
     def config(self, fixtures_dir):
-        return load_yaml(join(fixtures_dir, "adminlevel.yaml"))
+        return load_yaml(fixtures_dir / "adminlevel.yaml")
 
     @pytest.fixture(scope="function")
     def config_parent(self, fixtures_dir):
-        return load_yaml(join(fixtures_dir, "adminlevelparent.yaml"))
+        return load_yaml(fixtures_dir / "adminlevelparent.yaml")
 
     @pytest.fixture(scope="function")
     def url(self, fixtures_dir):
-        return join(fixtures_dir, "download-global-pcodes-adm-1-2.csv")
+        return fixtures_dir / "download-global-pcodes-adm-1-2.csv"
 
     @pytest.fixture(scope="function")
     def formats_url(self, fixtures_dir):
-        return join(fixtures_dir, "download-global-pcode-lengths.csv")
+        return fixtures_dir / "download-global-pcode-lengths.csv"
 
     def test_adminlevel(self, config):
         adminone = AdminLevel(config)

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/tests/hdx/location/test_country.py

@@ -996,7 +996,7 @@ class TestCountry:
 
     def test_ocha_feed_file_working(self):
         countries = hxl.data(
-            script_dir_plus_file("Countries_UZB_Deleted.csv", TestCountry),
+            str(script_dir_plus_file("Countries_UZB_Deleted.csv", TestCountry)),
             InputOptions(allow_local=True, encoding="utf-8"),
         )
         Country.set_countriesdata(countries)

{hdx_python_country-4.0.0 → hdx_python_country-4.0.1}/tests/hdx/location/test_currency.py

@@ -1,7 +1,5 @@
 """Currency Tests"""
 
-from os.path import join
-
 import pytest
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.downloader import Download
@@ -16,11 +14,11 @@ from hdx.location.int_timestamp import get_int_timestamp
 class TestCurrency:
     @pytest.fixture(scope="class")
     def secondary_rates_url(self, fixtures_dir):
-        return join(fixtures_dir, "secondary_rates.json")
+        return fixtures_dir / "secondary_rates.json"
 
     @pytest.fixture(scope="class")
     def secondary_historic_url(self, fixtures_dir):
-        return join(fixtures_dir, "secondary_historic_rates.csv")
+        return fixtures_dir / "secondary_historic_rates.csv"
 
     @pytest.fixture(scope="class", autouse=True)
     def retrievers(self, fixtures_dir):