diff --git a/CHANGELOG.md b/CHANGELOG.md index 644c74c..087dae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [0.31.0] + +- Remove deprecated `collection_whitelist` config ([#139](https://github.com/Open-EO/openeo-aggregator/issues/139)) + ## [0.30.0] - Add backend-aware collection allow-list option ([#139](https://github.com/Open-EO/openeo-aggregator/issues/139)) diff --git a/src/openeo_aggregator/about.py b/src/openeo_aggregator/about.py index b605f82..44dbebd 100644 --- a/src/openeo_aggregator/about.py +++ b/src/openeo_aggregator/about.py @@ -2,7 +2,7 @@ import sys from typing import Optional -__version__ = "0.30.0a1" +__version__ = "0.31.0a1" def log_version_info(logger: Optional[logging.Logger] = None): diff --git a/src/openeo_aggregator/backend.py b/src/openeo_aggregator/backend.py index 7bef2aa..58ee2ca 100644 --- a/src/openeo_aggregator/backend.py +++ b/src/openeo_aggregator/backend.py @@ -213,8 +213,7 @@ def _get_all_metadata(self) -> Tuple[List[dict], _InternalCollectionMetadata]: """ # Group collection metadata by hierarchically: collection id -> backend id -> metadata grouped = defaultdict(dict) - # TODO: remove deprecated collection_whitelist usage - collection_allow_list = get_backend_config().collection_allow_list or get_backend_config().collection_whitelist + collection_allow_list = get_backend_config().collection_allow_list if collection_allow_list: collection_allow_list = CollectionAllowList(collection_allow_list) diff --git a/src/openeo_aggregator/config.py b/src/openeo_aggregator/config.py index 0800368..dd0da7f 100644 --- a/src/openeo_aggregator/config.py +++ b/src/openeo_aggregator/config.py @@ -58,10 +58,6 @@ class AggregatorBackendConfig(OpenEoBackendConfig): # TTL for connection caching. connections_cache_ttl: float = 5 * 60.0 - # List of collection ids to cover with the aggregator (when None: support union of all upstream collections) - # TODO: remove this deprecated field - collection_whitelist: Optional[List[Union[str, re.Pattern]]] = None - # Allow list for collection ids to cover with the aggregator. # By default (value `None`): support union of all upstream collections. # To enable a real allow list, use a list of items as illustrated: