owid-datautils 0.6.1__tar.gz → 0.6.3__tar.gz

{owid_datautils-0.6.1 → owid_datautils-0.6.3}/.readthedocs.yaml

@@ -6,7 +6,7 @@ version: 2
 
 # Set the version of Python and other tools you might need
 build:
-  os: ubuntu-20.04
+  os: ubuntu-24.04
   tools: {python: "3.8"}
   jobs:
     pre_create_environment:

{owid_datautils-0.6.1 → owid_datautils-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owid-datautils
-Version: 0.6.1
+Version: 0.6.3
 Summary: Data utils library by the Data Team at Our World in Data
 Author-email: Our World in Data <tech@ourworldindata.org>
 License-Expression: MIT
@@ -8,13 +8,21 @@ License-File: LICENSE
 Keywords: data cleaning,data processing,data utils,our world in data
 Requires-Python: <4.0,>=3.10
 Requires-Dist: boto3>=1.38.23
+Requires-Dist: brotli>=1.2.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: colorama>=0.4.4
-Requires-Dist: gdown>=4.5.2
+Requires-Dist: cryptography>=46.0.3
+Requires-Dist: gdown>=5.2.2
 Requires-Dist: gsheets>=0.6.1
-Requires-Dist: pandas>=2.2.3
+Requires-Dist: jinja2>=3.1.6
+Requires-Dist: pandas<3,>=2.2.3
+Requires-Dist: protobuf>=6.33.4
 Requires-Dist: py7zr>=0.22.0
 Requires-Dist: pyarrow>=18.0.0
+Requires-Dist: pyasn1>=0.6.3
 Requires-Dist: pydrive2>=1.15.0
+Requires-Dist: pyopenssl>=26.0.0
+Requires-Dist: requests>=2.32.5
 Requires-Dist: structlog>=21.5.0
-Requires-Dist: urllib3<2
+Requires-Dist: tornado>=6.5.5
+Requires-Dist: urllib3<3

{owid_datautils-0.6.1 → owid_datautils-0.6.3}/owid/datautils/common.py

@@ -1,20 +1,20 @@
 """Common objects shared by other modules."""
 
 import warnings
-from typing import Any, List, Set, Union, cast
+from typing import Any, cast
 
 
 class ExceptionFromDocstring(Exception):
     """Exception that returns its own docstring, if no message is explicitly given."""
 
-    def __init__(self, exception_message: Union[str, None] = None, *args: Any):
+    def __init__(self, exception_message: str | None = None, *args: Any):
         super().__init__(exception_message or self.__doc__, *args)
 
 
 class ExceptionFromDocstringWithKwargs(Exception):
     """Exception that returns its own docstring, if no message is explicitly given."""
 
-    def __init__(self, exception_message: Union[str, None] = None, *args: Any, **kwargs: Any):
+    def __init__(self, exception_message: str | None = None, *args: Any, **kwargs: Any):
         text = cast(str, exception_message or self.__doc__)
         if kwargs:
             additional_text = ", ".join([f"{key}: {value}" for key, value in kwargs.items()])
@@ -23,22 +23,17 @@ class ExceptionFromDocstringWithKwargs(Exception):
         super().__init__(text, *args)
 
 
-def warn_on_list_of_entities(
-    list_of_entities: Union[List[Any], Set[Any]], warning_message: str, show_list: bool
-) -> None:
+def warn_on_list_of_entities(list_of_entities: list[Any] | set[Any], warning_message: str, show_list: bool) -> None:
     """Raise a warning with a custom message, and optionally print a list of affected elements.
 
-    Parameters
-    ----------
-    list_of_entities : list or set
-        Elements to optionally print one by one (only relevant if show_list is True).
-    warning_message : str
-        Warning message.
-    show_list : bool
-        True to print a list of affected entities.
+    Args:
+        list_of_entities: Elements to optionally print one by one (only relevant if show_list is True).
+        warning_message: Warning message.
+        show_list: True to print a list of affected entities.
 
     """
-    warnings.warn(warning_message)
     if show_list:
-        print(warning_message)
-        print("\n".join(["* " + str(entity) for entity in list_of_entities]))
+        entity_list = "\n".join(["* " + str(entity) for entity in list_of_entities])
+        warnings.warn(f"{warning_message}\n{entity_list}")
+    else:
+        warnings.warn(warning_message)