hdx-python-utilities 4.0.2__tar.gz → 4.0.3__tar.gz

{hdx_python_utilities-4.0.2 → hdx_python_utilities-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hdx-python-utilities
-Version: 4.0.2
+Version: 4.0.3
 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-4.0.2 → hdx_python_utilities-4.0.3}/src/hdx/utilities/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.0.2'
-__version_tuple__ = version_tuple = (4, 0, 2)
+__version__ = version = '4.0.3'
+__version_tuple__ = version_tuple = (4, 0, 3)
 
 __commit_id__ = commit_id = None

{hdx_python_utilities-4.0.2 → hdx_python_utilities-4.0.3}/src/hdx/utilities/path.py

@@ -95,7 +95,7 @@ def get_temp_dir(
     tempdir = Path(tempdir)
     if folder:
         tempdir = tempdir / folder
-        if exists(tempdir):
+        if tempdir.exists():
             if delete_if_exists:
                 rmtree(tempdir)
                 makedirs(tempdir)

{hdx_python_utilities-4.0.2 → hdx_python_utilities-4.0.3}/src/hdx/utilities/saver.py

@@ -279,6 +279,7 @@ def save_iterable(
     format: str = "csv",
     encoding: str | None = None,
     row_function: Callable[[dict], dict | None] | None = None,
+    no_empty: bool = True,
 ) -> list:
     """Save an iterable of rows in dict or list form to a csv. (The headers
     argument is either a row number (rows start counting at 1), or the actual
@@ -293,6 +294,7 @@ def save_iterable(
         format: Format to write. Defaults to csv.
         encoding: Encoding to use. Defaults to None (infer encoding).
         row_function: Row function to call for each row. Defaults to None.
+        no_empty: Don't save file if there are no data rows. Defaults to True.
 
     Returns:
         List of rows written to file
@@ -302,12 +304,26 @@ def save_iterable(
         def row_function(row):
             return row
 
+    def write_rows(newrows, has_header, headers) -> None:
+        resource = get_frictionless_tableresource(
+            data=newrows,
+            has_header=has_header,
+            headers=headers,
+            encoding=encoding,
+        )
+        resource.write(filepath, format=format, encoding=encoding)
+        resource.close()
+
     newrows = []
     rows = iter(rows)
     try:
         row = next(rows)
     except StopIteration:
+        if not no_empty and headers:
+            newrows = [headers]
+            write_rows(newrows, None, None)
         return newrows
+
     if isinstance(row, dict):
         has_header = True
         row = row_function(row)
@@ -371,12 +387,5 @@ def save_iterable(
                 if row is None:
                     continue
                 newrows.append(row)
-    resource = get_frictionless_tableresource(
-        data=newrows,
-        has_header=has_header,
-        headers=headers,
-        encoding=encoding,
-    )
-    resource.write(filepath, format=format, encoding=encoding)
-    resource.close()
+    write_rows(newrows, has_header, headers)
     return newrows

{hdx_python_utilities-4.0.2 → hdx_python_utilities-4.0.3}/src/hdx/utilities/useragent.py

@@ -83,7 +83,7 @@ class UserAgent:
             user agent
         """
         if not user_agent_config_yaml:
-            user_agent_config_yaml = cls.default_user_agent_config_yaml
+            user_agent_config_yaml = Path(cls.default_user_agent_config_yaml)
             if not user_agent_config_yaml.is_file():
                 user_agent_config_yaml = user_agent_config_yaml.with_suffix(".yml")
             if user_agent_config_yaml.is_file():

{hdx_python_utilities-4.0.2 → hdx_python_utilities-4.0.3}/tests/hdx/utilities/test_saver.py

@@ -521,3 +521,12 @@ class TestLoader:
 
             rows = save_iterable(filepath, [], headers=["h1", "h3", "h4"])
             assert rows == []
+
+            rows = save_iterable(
+                filepath, [], headers=["h1", "h3", "h4"], no_empty=False
+            )
+            assert rows == [["h1", "h3", "h4"]]
+
+            newll = read_list_from_csv(str(filepath))
+            remove(filepath)
+            assert newll == [["h1", "h3", "h4"]]