hdx-python-utilities 3.9.0__tar.gz → 3.9.2__tar.gz

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-utilities
-Version: 3.9.0
+Version: 3.9.2
 Summary: HDX Python Utilities for streaming tabular data, date and time handling and other helpful functions
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-utilities
 Author-email: Michael Rans <rans@email.com>

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/requirements.txt

@@ -2,7 +2,7 @@
 #    uv pip compile pyproject.toml --resolver=backtracking --all-extras -o requirements.txt
 annotated-types==0.7.0
     # via pydantic
-astdoc==1.3.1
+astdoc==1.3.2
     # via mkapi
 attrs==25.3.0
     # via
@@ -14,7 +14,7 @@ babel==2.17.0
     # via mkdocs-material
 backrefs==5.9
     # via mkdocs-material
-beautifulsoup4==4.13.4
+beautifulsoup4==4.13.5
     # via hdx-python-utilities (pyproject.toml)
 certifi==2025.8.3
     # via requests
@@ -22,27 +22,28 @@ cfgv==3.4.0
     # via pre-commit
 chardet==5.2.0
     # via frictionless
-charset-normalizer==3.4.2
+charset-normalizer==3.4.3
     # via requests
 click==8.2.1
     # via
     #   mkdocs
+    #   mkdocs-material
     #   typer
 colorama==0.4.6
     # via mkdocs-material
-coverage==7.10.2
+coverage==7.10.7
     # via pytest-cov
 cydifflib==1.2.0
     # via hdx-python-utilities (pyproject.toml)
 distlib==0.4.0
     # via virtualenv
-dnspython==2.7.0
+dnspython==2.8.0
     # via email-validator
-email-validator==2.2.0
+email-validator==2.3.0
     # via hdx-python-utilities (pyproject.toml)
 et-xmlfile==2.0.0
     # via openpyxl
-filelock==3.18.0
+filelock==3.19.1
     # via virtualenv
 frictionless==5.18.1
     # via hdx-python-utilities (pyproject.toml)
@@ -50,9 +51,9 @@ ghp-import==2.1.0
     # via mkdocs
 html5lib==1.1
     # via hdx-python-utilities (pyproject.toml)
-humanize==4.12.3
+humanize==4.13.0
     # via frictionless
-identify==2.6.12
+identify==2.6.14
     # via pre-commit
 idna==3.10
     # via
@@ -72,24 +73,24 @@ jinja2==3.1.6
     #   mkdocs-material
 jsonlines==4.0.0
     # via hdx-python-utilities (pyproject.toml)
-jsonschema==4.25.0
+jsonschema==4.25.1
     # via
     #   frictionless
     #   tableschema-to-template
-jsonschema-specifications==2025.4.1
+jsonschema-specifications==2025.9.1
     # via jsonschema
 loguru==0.7.3
     # via
     #   hdx-python-utilities (pyproject.toml)
     #   pytest-loguru
-markdown==3.8.2
+markdown==3.9
     # via
     #   mkdocs
     #   mkdocs-material
     #   pymdown-extensions
-markdown-it-py==3.0.0
+markdown-it-py==4.0.0
     # via rich
-marko==2.1.4
+marko==2.2.0
     # via frictionless
 markupsafe==3.0.2
     # via
@@ -109,7 +110,7 @@ mkdocs==1.6.1
     #   mkdocs-material
 mkdocs-get-deps==0.2.0
     # via mkdocs
-mkdocs-material==9.6.16
+mkdocs-material==9.6.20
     # via mkapi
 mkdocs-material-extensions==1.3.1
     # via mkdocs-material
@@ -127,7 +128,7 @@ pathspec==0.12.1
     # via mkdocs
 petl==1.7.17
     # via frictionless
-platformdirs==4.3.8
+platformdirs==4.4.0
     # via
     #   mkdocs-get-deps
     #   virtualenv
@@ -135,9 +136,9 @@ pluggy==1.6.0
     # via
     #   pytest
     #   pytest-cov
-pre-commit==4.2.0
+pre-commit==4.3.0
     # via hdx-python-utilities (pyproject.toml)
-pydantic==2.11.7
+pydantic==2.11.9
     # via frictionless
 pydantic-core==2.33.2
     # via pydantic
@@ -150,11 +151,11 @@ pymdown-extensions==10.16.1
     # via mkdocs-material
 pyphonetics==0.5.3
     # via hdx-python-utilities (pyproject.toml)
-pytest==8.4.1
+pytest==8.4.2
     # via
     #   hdx-python-utilities (pyproject.toml)
     #   pytest-cov
-pytest-cov==6.2.1
+pytest-cov==7.0.0
     # via hdx-python-utilities (pyproject.toml)
 pytest-loguru==0.4.0
     # via hdx-python-utilities (pyproject.toml)
@@ -182,7 +183,7 @@ referencing==0.36.2
     # via
     #   jsonschema
     #   jsonschema-specifications
-requests==2.32.4
+requests==2.32.5
     # via
     #   frictionless
     #   mkdocs-material
@@ -193,11 +194,11 @@ rfc3986==2.0.0
     # via frictionless
 rich==14.1.0
     # via typer
-rpds-py==0.26.0
+rpds-py==0.27.1
     # via
     #   jsonschema
     #   referencing
-ruamel-yaml==0.18.14
+ruamel-yaml==0.18.15
     # via hdx-python-utilities (pyproject.toml)
 ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
@@ -209,7 +210,7 @@ six==1.17.0
     # via
     #   html5lib
     #   python-dateutil
-soupsieve==2.7
+soupsieve==2.8
     # via beautifulsoup4
 tableschema-to-template==0.0.13
     # via hdx-python-utilities (pyproject.toml)
@@ -217,9 +218,9 @@ tabulate==0.9.0
     # via frictionless
 text-unidecode==1.3
     # via python-slugify
-typer==0.16.0
+typer==0.19.1
     # via frictionless
-typing-extensions==4.14.1
+typing-extensions==4.15.0
     # via
     #   beautifulsoup4
     #   frictionless
@@ -235,7 +236,7 @@ urllib3==2.5.0
     # via requests
 validators==0.35.0
     # via frictionless
-virtualenv==20.33.0
+virtualenv==20.34.0
     # via pre-commit
 watchdog==6.0.0
     # via mkdocs
@@ -245,7 +246,7 @@ xlrd==2.0.2
     # via hdx-python-utilities (pyproject.toml)
 xlsx2csv==0.8.4
     # via hdx-python-utilities (pyproject.toml)
-xlsxwriter==3.2.5
+xlsxwriter==3.2.9
     # via tableschema-to-template
 xlwt==1.3.0
     # via hdx-python-utilities (pyproject.toml)

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/src/hdx/utilities/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '3.9.0'
-__version_tuple__ = version_tuple = (3, 9, 0)
+__version__ = version = '3.9.2'
+__version_tuple__ = version_tuple = (3, 9, 2)
+
+__commit_id__ = commit_id = None

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/src/hdx/utilities/downloader.py

@@ -261,6 +261,7 @@ class Download(BaseDownload):
         timeout: Optional[float] = None,
         headers: Optional[Dict] = None,
         encoding: Optional[str] = None,
+        json_string: bool = False,
     ) -> requests.Response:
         """Setup download from provided url returning the response.
 
@@ -272,6 +273,7 @@ class Download(BaseDownload):
             timeout (Optional[float]): Timeout for connecting to URL. Defaults to None (no timeout).
             headers (Optional[Dict]): Headers to pass. Defaults to None.
             encoding (Optional[str]): Encoding to use for text response. Defaults to None (best guess).
+            json_string (bool): Whether to post parameters as JSON string. Defaults to False.
 
         Returns:
             requests.Response: requests.Response object
@@ -288,10 +290,11 @@ class Download(BaseDownload):
                     url = urlunsplit(spliturl)
             if post:
                 full_url, parameters = self.get_url_params_for_post(url, parameters)
-                json_parameters = json.dumps(parameters)
+                if json_string:
+                    parameters = json.dumps(parameters)
                 self.response = self.session.post(
                     full_url,
-                    data=json_parameters,
+                    data=parameters,
                     stream=stream,
                     timeout=timeout,
                     headers=headers,
@@ -423,6 +426,7 @@ class Download(BaseDownload):
             timeout (float): Timeout for connecting to URL. Defaults to None (no timeout).
             headers (Dict): Headers to pass. Defaults to None.
             encoding (str): Encoding to use for text response. Defaults to None (best guess).
+            json_string (bool): Whether to post parameters as JSON string. Defaults to False.
 
         Returns:
             str: Path of downloaded file
@@ -443,6 +447,7 @@ class Download(BaseDownload):
             timeout=kwargs.get("timeout"),
             headers=kwargs.get("headers"),
             encoding=kwargs.get("encoding"),
+            json_string=kwargs.get("json_string", False),
         )
         return self.stream_path(
             path, f"Download of {url} failed in retrieval of stream!"
@@ -459,6 +464,7 @@ class Download(BaseDownload):
             timeout (float): Timeout for connecting to URL. Defaults to None (no timeout).
             headers (Dict): Headers to pass. Defaults to None.
             encoding (str): Encoding to use for text response. Defaults to None (best guess).
+            json_string (bool): Whether to post parameters as JSON string. Defaults to False.
 
         Returns:
             requests.Response: Response
@@ -471,6 +477,7 @@ class Download(BaseDownload):
             timeout=kwargs.get("timeout"),
             headers=kwargs.get("headers"),
             encoding=kwargs.get("encoding"),
+            json_string=kwargs.get("json_string", False),
         )
 
     def get_header(self, header: str) -> Any:

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/src/hdx/utilities/loader.py

@@ -72,13 +72,14 @@ def load_yaml(
         Any: The data from the YAML file
     """
     with open(path, encoding=encoding) as f:
+        data = f.read()
+        if not data:
+            if loaderror_if_empty:
+                raise LoadError(f"YAML file: {path} is empty!")
+            return None
         yaml = YAML()
-        yamlobj = yaml.load(f.read())
-    if not yamlobj:
-        if loaderror_if_empty:
-            raise LoadError(f"YAML file: {path} is empty!")
-        return None
-    return yamlobj
+        yamlobj = yaml.load(data)
+        return yamlobj
 
 
 def load_json(
@@ -95,12 +96,13 @@ def load_json(
         Any: The data from the JSON file
     """
     with open(path, encoding=encoding) as f:
-        jsonobj = json.loads(f.read())
-    if not jsonobj:
-        if loaderror_if_empty:
-            raise LoadError(f"JSON file: {path} is empty!")
-        return None
-    return jsonobj
+        data = f.read()
+        if not data:
+            if loaderror_if_empty:
+                raise LoadError(f"JSON file: {path} is empty!")
+            return None
+        jsonobj = json.loads(data)
+        return jsonobj
 
 
 def load_and_merge_yaml(

hdx_python_utilities-3.9.2/tests/fixtures/loader/empty_list.json

@@ -0,0 +1 @@
+[]

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/tests/hdx/utilities/test_downloader.py

@@ -386,6 +386,18 @@ class TestDownloader:
                 parameters=OrderedDict([("a", "3"), ("c", "2")]),
             )
             json = downloader.get_json()
+            assert list(json["form"].items()) == list(
+                OrderedDict(
+                    [("a", "3"), ("c", "2"), ("id", "3"), ("lala", "b")]
+                ).items()
+            )
+            downloader.setup(
+                f"{postfixtureurl}?id=3&lala=b",
+                post=True,
+                parameters=OrderedDict([("a", "3"), ("c", "2")]),
+                json_string=True,
+            )
+            json = downloader.get_json()
             assert list(json["json"].items()) == list(
                 OrderedDict(
                     [("a", "3"), ("c", "2"), ("id", "3"), ("lala", "b")]
@@ -526,6 +538,17 @@ class TestDownloader:
                 post=True,
                 parameters=OrderedDict([("a", "3"), ("c", "2")]),
             )
+            assert list(json["form"].items()) == list(
+                OrderedDict(
+                    [("a", "3"), ("c", "2"), ("id", "3"), ("lala", "b")]
+                ).items()
+            )
+            json = downloader.download_json(
+                f"{postfixtureurl}?id=3&lala=b",
+                post=True,
+                parameters=OrderedDict([("a", "3"), ("c", "2")]),
+                json_string=True,
+            )
             assert list(json["json"].items()) == list(
                 OrderedDict(
                     [("a", "3"), ("c", "2"), ("id", "3"), ("lala", "b")]

{hdx_python_utilities-3.9.0 → hdx_python_utilities-3.9.2}/tests/hdx/utilities/test_loader.py

@@ -113,17 +113,33 @@ a
 test"""
     expected_text_newlines_to_spaces = """  hello this is a test    """
 
-    def test_load_empty(self, fixturesfolder):
-        loaderfolder = join(fixturesfolder, "loader")
+    @pytest.fixture(scope="class")
+    def loaderfolder(self, fixturesfolder):
+        return join(fixturesfolder, "loader")
+
+    @pytest.fixture(scope="class")
+    def empty_yaml(self, loaderfolder):
+        return join(loaderfolder, "empty.yaml")
+
+    @pytest.fixture(scope="class")
+    def empty_json(self, loaderfolder):
+        return join(loaderfolder, "empty.json")
+
+    @pytest.fixture(scope="class")
+    def empty_list(self, loaderfolder):
+        return join(loaderfolder, "empty_list.json")
+
+    def test_load_empty(self, empty_yaml, empty_json, empty_list):
         with pytest.raises(LoadError):
-            load_text(join(loaderfolder, "empty.yaml"))
-        load_text(join(loaderfolder, "empty.yaml"), loaderror_if_empty=False) == ""
+            load_text(empty_yaml)
+        load_text(empty_yaml, loaderror_if_empty=False) == ""
         with pytest.raises(LoadError):
-            load_yaml(join(loaderfolder, "empty.yaml"))
-        load_yaml(join(loaderfolder, "empty.yaml"), loaderror_if_empty=False) is None
+            load_yaml(empty_yaml)
+        load_yaml(empty_yaml, loaderror_if_empty=False) is None
         with pytest.raises(LoadError):
-            load_json(join(loaderfolder, "empty.json"))
-        load_json(join(loaderfolder, "empty.json"), loaderror_if_empty=False) is None
+            load_json(empty_json)
+        load_json(empty_json, loaderror_if_empty=False) is None
+        load_json(empty_list)
 
     def test_load_and_merge_yaml(self, configfolder):
         result = load_and_merge_yaml(

hdx_python_utilities-3.9.0/tests/fixtures/loader/empty.json

@@ -1 +0,0 @@
-""