From 9f32e50671097bc551cfddbfb1fff9d454c74b78 Mon Sep 17 00:00:00 2001 From: Nicola Spanti Date: Wed, 15 Jul 2026 11:19:08 +0200 Subject: [PATCH] use `deprecated` from standard library See https://docs.python.org/3.13/library/warnings.html#warnings.deprecated --- geocube/admin.py | 3 ++- geocube/client.py | 7 ++++--- geocube/utils/__init__.py | 1 - geocube/utils/deprecated.py | 15 --------------- 4 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 geocube/utils/deprecated.py diff --git a/geocube/admin.py b/geocube/admin.py index 3cf53d1..65386f7 100644 --- a/geocube/admin.py +++ b/geocube/admin.py @@ -1,9 +1,10 @@ from typing import List, Union, Dict, Tuple +from warnings import deprecated from geocube import utils, entities, Client from geocube.pb import admin_pb2, admin_pb2_grpc from geocube.stub import Stub -from geocube.utils import deprecated, GeocubeError +from geocube.utils import GeocubeError class Admin(Client): diff --git a/geocube/client.py b/geocube/client.py index db0d766..85ff1c9 100644 --- a/geocube/client.py +++ b/geocube/client.py @@ -196,8 +196,8 @@ def create_records(self, aoi_ids: List[str], names: List[str], """ return self._create_records(aoi_ids, names, tags, dates) + @warnings.deprecated("Use record() instead") def get_record(self, _id: str) -> entities.Record: - """ Deprecated: use record() instead """ return self.record(_id) def record(self, _id: str) -> entities.Record: @@ -529,8 +529,8 @@ def job(self, name: str = None, id_: str = None, log_page: int = 0, log_limit: i return self._get_job_by_id(id_, log_page, log_limit) raise ValueError("job: either name or id_ must be defined") + @warnings.deprecated("Use job() instead") def get_job(self, job_id: Union[str, entities.Job], log_page=0, log_limit=1000): - """ Deprecated: use job() """ return self.job(id_=job_id, log_page=log_page, log_limit=log_limit) def list_jobs(self, name_like: str = "", page=0, limit=10): @@ -1030,5 +1030,6 @@ def _consolidate(self, )) return self.get_job(self.stub.Consolidate(req).job_id) +@warnings.deprecated("Use Client instead") class Consolidater(Client): - """ Deprecated: use Client instead """ \ No newline at end of file + pass diff --git a/geocube/utils/__init__.py b/geocube/utils/__init__.py index 7107ad2..cb06d5b 100644 --- a/geocube/utils/__init__.py +++ b/geocube/utils/__init__.py @@ -2,5 +2,4 @@ from geocube.utils.exceptions import catch_rpc_error, GeocubeError from geocube.utils.aoi import read_aoi, plot_aoi from geocube.utils.pb import pb_string, pb_null_timestamp -from geocube.utils.deprecated import deprecated from geocube.utils.retry import exponential_retry, retry_on_geocube_error diff --git a/geocube/utils/deprecated.py b/geocube/utils/deprecated.py deleted file mode 100644 index 01da029..0000000 --- a/geocube/utils/deprecated.py +++ /dev/null @@ -1,15 +0,0 @@ -import functools -import warnings - -def deprecated(message): - def deprecated_decorator(func): - @functools.wraps(func) - def deprecated_func(*args, **kwargs): - warnings.simplefilter('always', DeprecationWarning) - warnings.warn(f"{func.__name__} is a deprecated function. {message}", - category=DeprecationWarning, - stacklevel=2) - warnings.simplefilter('default', DeprecationWarning) - return func(*args, **kwargs) - return deprecated_func - return deprecated_decorator \ No newline at end of file