oda-data 2.8.2__tar.gz → 2.9.0__tar.gz

{oda_data-2.8.2 → oda_data-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: oda_data
-Version: 2.8.2
+Version: 2.9.0
 Summary: A python package to work with Official Development Assistance data from the OECD DAC.
 Author: Jorge Rivera, Miguel Haro Ruiz
 Author-email: Jorge Rivera <jorge.rivera@one.org>, Miguel Haro Ruiz <miguel.haroruiz@one.org>
@@ -10,20 +10,20 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: cachetools>=6.2.0
 Requires-Dist: filelock>=3.20.0
-Requires-Dist: oda-reader>=1.9.0
+Requires-Dist: oda-reader>=1.13.0
 Requires-Dist: platformdirs>=4.0.0
 Requires-Dist: pandas[excel,parquet,performance]>=2.2.0
 Requires-Dist: pydeflate>=2.3.3
 Requires-Dist: reader>=3.18
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Project-URL: Homepage, https://github.com/ONEcampaign/oda_data_package
 Project-URL: Repository, https://github.com/ONEcampaign/oda_data_package
 Project-URL: Documentation, https://github.com/ONEcampaign/oda_data_package
@@ -64,7 +64,7 @@ The latest version of the package can be installed using pip:
 pip install oda-data --upgrade
 ```
 
-The package is compatible with Python 3.11 and above.
+The package is compatible with Python 3.12 and above.
 
 ## Basic usage
 

{oda_data-2.8.2 → oda_data-2.9.0}/README.md

@@ -33,7 +33,7 @@ The latest version of the package can be installed using pip:
 pip install oda-data --upgrade
 ```
 
-The package is compatible with Python 3.11 and above.
+The package is compatible with Python 3.12 and above.
 
 ## Basic usage
 

{oda_data-2.8.2 → oda_data-2.9.0}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "oda_data"
-version = "2.8.2"
+version = "2.9.0"
 description = "A python package to work with Official Development Assistance data from the OECD DAC."
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 readme = "README.md"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
@@ -10,9 +10,9 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Scientific/Engineering",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -20,7 +20,7 @@ classifiers = [
 dependencies = [
     "cachetools>=6.2.0",
     "filelock>=3.20.0",
-    "oda-reader>=1.9.0",
+    "oda-reader>=1.13.0",
     "platformdirs>=4.0.0",
     "pandas[excel,parquet,performance]>=2.2.0",
     "pydeflate>=2.3.3",
@@ -62,8 +62,8 @@ test = [
     "freezegun>=1.4.0",
 ]
 maintenance = [
-    "resolvekit==0.1.12 ; python_version >= '3.12'",
-    "pyyaml>=6.0 ; python_version >= '3.12'",
+    "resolvekit==0.1.12",
+    "pyyaml>=6.0",
 ]
 
 [tool.uv]
@@ -74,7 +74,7 @@ default-groups = [
 
 [tool.ruff]
 line-length = 88
-target-version = "py311"
+target-version = "py312"
 extend-include = ["*.ipynb"]
 exclude = [
     ".git",
@@ -151,7 +151,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.ty.environment]
-python-version = "3.11"
+python-version = "3.12"
 
 [tool.ty.src]
 include = ["src/oda_data"]

{oda_data-2.8.2 → oda_data-2.9.0}/pyproject.toml.orig

@@ -1,8 +1,8 @@
 [project]
 name = "oda_data"
-version = "2.8.2"
+version = "2.9.0"
 description = "A python package to work with Official Development Assistance data from the OECD DAC."
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 
 license = {text = "MIT"}
 readme = "README.md"
@@ -17,9 +17,9 @@ classifiers = [
     "Intended Audience :: Science/Research",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Scientific/Engineering",
     "Topic :: Software Development :: Libraries :: Python Modules",
@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
     "cachetools>=6.2.0",
     "filelock>=3.20.0",
-    "oda-reader>=1.9.0",
+    "oda-reader>=1.13.0",
     "platformdirs>=4.0.0",
     "pandas[excel,parquet,performance]>=2.2.0",
     "pydeflate>=2.3.3",
@@ -60,12 +60,11 @@ test = [
 ]
 # Maintenance-only tooling for scripts/refresh_channel_crosswalk.py. Never a
 # runtime dependency of the oda_data package; excluded from the default
-# groups below so a plain `uv sync` never requires it (resolvekit needs
-# Python >=3.12, oda_data supports >=3.11). Install explicitly with
-# `uv sync --group maintenance`.
+# groups below so a plain `uv sync` never requires it. Install explicitly
+# with `uv sync --group maintenance`.
 maintenance = [
-    "resolvekit==0.1.12 ; python_version >= '3.12'",
-    "pyyaml>=6.0 ; python_version >= '3.12'",
+    "resolvekit==0.1.12",
+    "pyyaml>=6.0",
 ]
 
 [tool.uv]
@@ -78,8 +77,8 @@ default-groups = ["dev", "test"]
 # Set the maximum line length
 line-length = 88
 
-# Target Python 3.11+
-target-version = "py311"
+# Target Python 3.12+
+target-version = "py312"
 
 # Lint/format notebooks too
 extend-include = ["*.ipynb"]
@@ -167,7 +166,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.ty.environment]
-python-version = "3.11"
+python-version = "3.12"
 
 [tool.ty.src]
 include = ["src/oda_data"]

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/api/oecd.py

@@ -1,3 +1,4 @@
+import logging
 from collections.abc import Callable
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
@@ -22,9 +23,10 @@ from oda_data.indicators.crs import crs_functions
 from oda_data.indicators.crs.common import group_data_based_on_indicator
 from oda_data.indicators.dac1 import dac1_functions
 from oda_data.indicators.dac2a import dac2a_functions
-from oda_data.logger import logger
 from oda_data.tools.groupings import provider_groupings, recipient_groupings
 
+logger = logging.getLogger(__name__)
+
 source_to_module = {
     "DAC1": dac1_functions,
     "DAC2A": dac2a_functions,

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/api/sources.py

@@ -1,3 +1,4 @@
+import logging
 import threading
 from abc import abstractmethod
 from collections.abc import Callable
@@ -27,7 +28,6 @@ from oda_data.clean_data.validation import (
     validate_years_providers_recipients,
 )
 from oda_data.config import ODAPaths
-from oda_data.logger import logger
 from oda_data.tools.cache import (
     BulkCacheEntry,
     BulkCacheManager,
@@ -40,6 +40,8 @@ from oda_data.tools.cache import (
     generate_projection_hash,
 )
 
+logger = logging.getLogger(__name__)
+
 
 def _filters_to_query(filters: list[tuple[str, str, list]]) -> str:
     """Transform a list of filters into a query string.

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/cache/api.py

@@ -6,18 +6,20 @@ http/raw caches into a single Scope-keyed view.
 
 import contextlib
 import json
+import logging
 import time
 import warnings
 from pathlib import Path
-from typing import TYPE_CHECKING, TypeVar
+from typing import TYPE_CHECKING
 
 from oda_data.cache.config import oda_data_cache_root
 from oda_data.cache.types import CacheRecord, ReleaseInfo, Scope, _validate_scope
-from oda_data.logger import logger
 
 if TYPE_CHECKING:
     from oda_data.api.sources import Source
 
+logger = logging.getLogger(__name__)
+
 # Scopes that belong to oda_data's own disk layout.
 _ODA_DATA_SCOPES: tuple[str, ...] = ("bulk", "query")
 # Leaf sub-directory names inside cache_root / "oda-data".
@@ -484,12 +486,9 @@ def release_info(dataset: "type[Source] | str") -> ReleaseInfo | None:
     )
 
 
-_T = TypeVar("_T")
-
-
-def _all_source_subclasses(base: type[_T]) -> list[type[_T]]:
+def _all_source_subclasses[T](base: type[T]) -> list[type[T]]:
     """Recursively collect all concrete subclasses of *base*."""
-    result: list[type[_T]] = []
+    result: list[type[T]] = []
     for sub in base.__subclasses__():
         result.append(sub)
         result.extend(_all_source_subclasses(sub))

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/cache/config.py

@@ -4,6 +4,7 @@ Priority: set_cache_root() override > ODA_DATA_CACHE_DIR env var >
 platformdirs default (user_cache_dir("oda-data") / __version__).
 """
 
+import logging
 import os
 import warnings
 from importlib.metadata import PackageNotFoundError
@@ -12,7 +13,7 @@ from pathlib import Path
 
 import platformdirs
 
-from oda_data.logger import logger
+logger = logging.getLogger(__name__)
 
 try:
     _PACKAGE_VERSION = _pkg_version("oda_data")

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/clean_data/channels.py

@@ -1,3 +1,4 @@
+import logging
 import string
 import warnings
 from typing import Literal
@@ -6,7 +7,8 @@ import pandas as pd
 
 from oda_data.clean_data.schema import ODASchema
 from oda_data.config import ODAPaths
-from oda_data.logger import logger
+
+logger = logging.getLogger(__name__)
 
 CROSSWALK_FILE = "multilateral_channel_crosswalk.csv"
 

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/clean_data/common.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import pathlib
 from functools import partial
 from pathlib import Path
@@ -12,7 +13,8 @@ from oda_data.clean_data.dtypes import set_default_types
 from oda_data.clean_data.schema import CRS_MAPPING, ODASchema
 from oda_data.clean_data.validation import validate_currency
 from oda_data.config import ODAPaths
-from oda_data.logger import logger
+
+logger = logging.getLogger(__name__)
 
 
 def clean_column_name(column_name: str) -> str:

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/clean_data/dtypes.py

@@ -1,9 +1,11 @@
+import logging
 from collections import defaultdict
 
 import pandas as pd
 
 from oda_data.clean_data.schema import ODASchema
-from oda_data.logger import logger
+
+logger = logging.getLogger(__name__)
 
 FALLBACK_STRING_DTYPE = "string[pyarrow]"
 

oda_data-2.9.0/src/oda_data/logger.py

@@ -0,0 +1,38 @@
+"""Deprecated until 3.0: configure logging.getLogger("oda_data") instead."""
+
+import logging
+import warnings
+
+warnings.warn(
+    "oda_data.logger is deprecated and will be removed in 3.0. "
+    "Configure logging.getLogger('oda_data') instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
+logger = logging.getLogger("oda_data")
+
+
+def setup_logger(name: str) -> logging.Logger:
+    """Attach an INFO stderr handler to the named logger and stop it propagating.
+
+    Args:
+        name: The name of the logger.
+
+    Returns:
+        The configured logger.
+    """
+    logger_ = logging.getLogger(name)
+    logger_.setLevel(logging.INFO)
+
+    if not logger_.handlers:
+        console_handler = logging.StreamHandler()
+        console_handler.setLevel(logging.INFO)
+        console_handler.setFormatter(
+            logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+        )
+        logger_.addHandler(console_handler)
+
+    logger_.propagate = False
+
+    return logger_

{oda_data-2.8.2 → oda_data-2.9.0}/src/oda_data/tools/cache.py

@@ -12,6 +12,7 @@ Design follows pydeflate patterns for robustness and thread safety.
 import contextlib
 import hashlib
 import json
+import logging
 import os
 import socket
 import threading
@@ -27,9 +28,10 @@ import pandas as pd
 from cachetools import TTLCache
 from filelock import FileLock
 
-from oda_data.logger import logger
 from oda_data.tools.names.create_mapping import snake_to_pascal
 
+logger = logging.getLogger(__name__)
+
 # ISO format for timestamps
 ISO_FORMAT = "%Y-%m-%dT%H:%M:%S%z"
 

oda_data-2.8.2/src/oda_data/logger.py

@@ -1,34 +0,0 @@
-import logging
-
-
-def setup_logger(name: str) -> logging.Logger:
-    """Set up the logger.
-
-    Args:
-        name (str): The name of the logger.
-
-    Returns:
-        logging.Logger: The logger.
-    """
-    logger_ = logging.getLogger(name)
-    logger_.setLevel(logging.INFO)
-
-    # Avoid adding multiple handlers
-    if not logger_.handlers:
-        console_handler = logging.StreamHandler()
-        console_handler.setLevel(logging.INFO)
-
-        formatter = logging.Formatter(
-            "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
-        )
-        console_handler.setFormatter(formatter)
-
-        logger_.addHandler(console_handler)
-
-    # Disable propagation to the root logger
-    logger_.propagate = False
-
-    return logger_
-
-
-logger = setup_logger("oda_data")