hdx-python-utilities 3.5.7__tar.gz → 3.5.8__tar.gz

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hdx-python-utilities
-Version: 3.5.7
+Version: 3.5.8
 Summary: HDX Python Utilities for streaming tabular data, date and time handling and other helpful functions
 Home-page: https://github.com/OCHA-DAP/hdx-python-utilities
 Author: Michael Rans

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/setup.cfg

@@ -58,9 +58,6 @@ email = email_validator
 [options.packages.find]
 where = src
 
-[bdist_wheel]
-universal = 1
-
 [egg_info]
 tag_build = 
 tag_date = 0

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/src/hdx/utilities/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '3.5.7'
-__version_tuple__ = version_tuple = (3, 5, 7)
+__version__ = version = '3.5.8'
+__version_tuple__ = version_tuple = (3, 5, 8)

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/src/hdx/utilities/dictandlist.py

@@ -4,7 +4,7 @@ import itertools
 from collections import UserDict
 from typing import Any, Callable, Dict, List, Optional, Union
 
-from .frictionless_wrapper import get_frictionless_resource
+from .frictionless_wrapper import get_frictionless_tableresource
 from .typehint import ListDict, ListTuple, ListTupleDict
 
 
@@ -389,7 +389,7 @@ def read_list_from_csv(
     """
     if dict_form and headers is None:
         raise ValueError("If dict_form is True, headers must not be None!")
-    resource = get_frictionless_resource(url, headers=headers, **kwargs)
+    resource = get_frictionless_tableresource(url, headers=headers, **kwargs)
     result = []
     if not dict_form:
         result.append(resource.header)
@@ -456,7 +456,7 @@ def write_list_to_csv(
                         newrow.append(row[column - 1])
                     newrows.append(newrow)
                 rows = newrows
-        resource = get_frictionless_resource(
+        resource = get_frictionless_tableresource(
             data=rows,
             has_header=has_header,
             headers=headers,

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/src/hdx/utilities/downloader.py

@@ -8,15 +8,15 @@ from pathlib import Path
 from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, Union
 from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
 
-import frictionless
 import requests
 from frictionless import FrictionlessException
+from frictionless.resources import TableResource
 from ratelimit import RateLimitDecorator, sleep_and_retry
 from requests import Request
 from ruamel.yaml import YAML
 
 from .base_downloader import BaseDownload, DownloadError
-from .frictionless_wrapper import get_frictionless_resource
+from .frictionless_wrapper import get_frictionless_tableresource
 from .path import get_filename_from_url, get_temp_dir
 from .session import get_session
 from .typehint import ListDict, ListTuple
@@ -560,14 +560,14 @@ class Download(BaseDownload):
         self.download(url, **kwargs)
         return self.get_json()
 
-    def get_frictionless_resource(
+    def get_frictionless_tableresource(
         self,
         url: str,
         ignore_blank_rows: bool = True,
         infer_types: bool = False,
         **kwargs: Any,
-    ) -> frictionless.Resource:
-        """Get Frictionless Resource.
+    ) -> TableResource:
+        """Get Frictionless TableResource.
 
         Args:
             url (str): URL or path to download
@@ -596,11 +596,11 @@ class Download(BaseDownload):
             schema (Schema): This can be set to override the above. See Frictionless docs.
 
         Returns:
-            frictionless.Resource: frictionless Resource object
+            TableResource: frictionless TableResource object
         """
         self.close_response()
         try:
-            self.response = get_frictionless_resource(
+            self.response = get_frictionless_tableresource(
                 url, ignore_blank_rows, infer_types, self.session, **kwargs
             )
         except FrictionlessException as e:
@@ -670,7 +670,7 @@ class Download(BaseDownload):
         """
         if headers is None:
             raise DownloadError("Argument headers cannot be None!")
-        resource = self.get_frictionless_resource(
+        resource = self.get_frictionless_tableresource(
             url,
             ignore_blank_rows=ignore_blank_rows,
             infer_types=infer_types,

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/src/hdx/utilities/easy_logging.py

@@ -55,10 +55,15 @@ def setup_logging(
                 frame = frame.f_back
                 depth += 1
 
-            msg = record.getMessage().replace("<locals>", "\\<locals>")
-            logger.opt(
-                colors=True, depth=depth, exception=record.exc_info
-            ).log(level, msg)
+            msg = record.getMessage()
+            try:
+                logger.opt(
+                    colors=True, depth=depth, exception=record.exc_info
+                ).log(level, msg)
+            except ValueError:
+                logger.opt(
+                    colors=False, depth=depth, exception=record.exc_info
+                ).log(level, msg)
 
     root_logger = logging.getLogger()
     while root_logger.hasHandlers():

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/src/hdx/utilities/frictionless_wrapper.py

@@ -7,7 +7,6 @@ from frictionless import (
     Detector,
     Dialect,
     FrictionlessException,
-    Resource,
     system,
 )
 from frictionless.errors import ResourceError
@@ -120,15 +119,15 @@ def get_frictionless_dialect(
     return dialect, kwargs
 
 
-def get_frictionless_resource(
+def get_frictionless_tableresource(
     url: Optional[str] = None,
     ignore_blank_rows: bool = True,
     infer_types: bool = False,
     session: Optional[requests.Session] = None,
     data: Optional[Any] = None,
     **kwargs: Any,
-) -> Resource:
-    """Get Frictionless Resource. Either url or data must be supplied.
+) -> TableResource:
+    """Get Frictionless TableResource. Either url or data must be supplied.
 
     Args:
         url (Optional[str]): URL or path to download. Defaults to None.
@@ -161,7 +160,7 @@ def get_frictionless_resource(
         schema (Schema): This can be set to override the above. See Frictionless docs.
 
     Returns:
-        Resource: frictionless Resource object
+        TableResource: frictionless TableResource object
     """
     if not url and not data:
         error = ResourceError(note="Neither url or data supplied!")

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/src/hdx_python_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hdx-python-utilities
-Version: 3.5.7
+Version: 3.5.8
 Summary: HDX Python Utilities for streaming tabular data, date and time handling and other helpful functions
 Home-page: https://github.com/OCHA-DAP/hdx-python-utilities
 Author: Michael Rans

{hdx-python-utilities-3.5.7 → hdx-python-utilities-3.5.8}/test-requirements.txt

@@ -3,8 +3,8 @@ autohooks-plugin-black==22.11.0
 autohooks-plugin-isort==22.8.0
 autohooks-plugin-flake8==23.1.0
 autohooks-plugin-pylint==22.8.1
-pytest==7.2.1
+pytest==7.2.2
 pytest-cov==4.0.0
-tox==4.4.4
+tox==4.4.8
 pytest-loguru==0.2.0
 -r requirements.txt