Skip to content

Commit c89486e

Browse files
committed
Remove deprecated load_disk_collection/load_disk_data
ref Open-EO/openeo-geopyspark-driver#1457
1 parent 596660d commit c89486e

File tree

3 files changed

+2
-46
lines changed

3 files changed

+2
-46
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1616
- Internal reorganization of `openeo.extra.job_management` submodule to ease future development ([#741](https://github.com/Open-EO/openeo-python-client/issues/741))
1717
- `openeo.Connection`: add some more HTTP error codes to the default retry list: `502 Bad Gateway`, `503 Service Unavailable` and `504 Gateway Timeout` ([#835](https://github.com/Open-EO/openeo-python-client/issues/835))
1818

19-
2019
### Removed
2120

21+
- Remove `Connection.load_disk_collection` (wrapper for non-standard `load_disk_data` process), deprecated since version 0.25.0 (related to [Open-EO/openeo-geopyspark-driver#1457](https://github.com/Open-EO/openeo-geopyspark-driver/issues/1457))
22+
2223
### Fixed
2324

2425

openeo/rest/connection.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,26 +1873,6 @@ def service(self, service_id: str) -> Service:
18731873
"""
18741874
return Service(service_id, connection=self)
18751875

1876-
@deprecated(
1877-
reason="Depends on non-standard process, replace with :py:meth:`openeo.rest.connection.Connection.load_stac` where possible.",
1878-
version="0.25.0")
1879-
def load_disk_collection(
1880-
self, format: str, glob_pattern: str, options: Optional[dict] = None
1881-
) -> DataCube:
1882-
"""
1883-
Loads image data from disk as a :py:class:`DataCube`.
1884-
1885-
This is backed by a non-standard process ('load_disk_data'). This will eventually be replaced by standard options such as
1886-
:py:meth:`openeo.rest.connection.Connection.load_stac` or https://processes.openeo.org/#load_uploaded_files
1887-
1888-
:param format: the file format, e.g. 'GTiff'
1889-
:param glob_pattern: a glob pattern that matches the files to load from disk
1890-
:param options: options specific to the file format
1891-
"""
1892-
return DataCube.load_disk_collection(
1893-
self, format, glob_pattern, **(options or {})
1894-
)
1895-
18961876
def as_curl(
18971877
self,
18981878
data: Union[dict, DataCube, FlatGraphableMixin],

openeo/rest/datacube.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -307,31 +307,6 @@ def _build_load_properties_argument(
307307

308308
return properties
309309

310-
@classmethod
311-
@deprecated(reason="Depends on non-standard process, replace with :py:meth:`openeo.rest.connection.Connection.load_stac` where possible.",version="0.25.0")
312-
def load_disk_collection(cls, connection: Connection, file_format: str, glob_pattern: str, **options) -> DataCube:
313-
"""
314-
Loads image data from disk as a DataCube.
315-
This is backed by a non-standard process ('load_disk_data'). This will eventually be replaced by standard options such as
316-
:py:meth:`openeo.rest.connection.Connection.load_stac` or https://processes.openeo.org/#load_uploaded_files
317-
318-
319-
:param connection: The connection to use to connect with the backend.
320-
:param file_format: the file format, e.g. 'GTiff'
321-
:param glob_pattern: a glob pattern that matches the files to load from disk
322-
:param options: options specific to the file format
323-
:return: the data as a DataCube
324-
"""
325-
pg = PGNode(
326-
process_id='load_disk_data',
327-
arguments={
328-
'format': file_format,
329-
'glob_pattern': glob_pattern,
330-
'options': options
331-
}
332-
)
333-
return cls(graph=pg, connection=connection)
334-
335310
@classmethod
336311
def load_stac(
337312
cls,

0 commit comments

Comments
 (0)