Skip to content

Commit

Permalink
Merge pull request #1463 from opendatacube/deprecate_ingestion
Browse files Browse the repository at this point in the history
mark ingestion as deprecated
  • Loading branch information
Ariana-B committed Jun 26, 2023
2 parents 074f494 + 0c7d777 commit 3affff3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions datacube/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
from ._base import Range, ranges_overlap # noqa: F401
from .eo3 import validate_eo3_compatible_type

from deprecat import deprecat

_LOG = logging.getLogger(__name__)

DEFAULT_SPATIAL_DIMS = ('y', 'x') # Used when product lacks grid_spec
Expand Down Expand Up @@ -438,6 +440,7 @@ def license(self) -> str:
return self.definition.get("license", None)

@property
@deprecat(reason="Ingestion has been deprecated and will be removed in a future version.", version="1.8.14")
def managed(self) -> bool:
return self.definition.get('managed', False)

Expand Down Expand Up @@ -713,6 +716,7 @@ def __hash__(self):
DatasetType = Product


@deprecat(reason="Ingestion has been deprecated and will be removed in a future version.", version="1.8.14")
@schema_validated(SCHEMA_PATH / 'ingestor-config-type-schema.yaml')
class IngestorConfig:
"""
Expand Down
1 change: 1 addition & 0 deletions datacube/model/schema/dataset-type-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ properties:
items:
"$ref": "#/definitions/measurement"
managed:
# Indicates ingested product - deprecated
type: boolean

required:
Expand Down
3 changes: 2 additions & 1 deletion datacube/scripts/ingest.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,8 @@ def get_driver_from_config(config):
return driver


@cli.command('ingest', help="Ingest datasets")
@cli.command('ingest', help="WARNING: Ingestion has been deprecated in v1.8.14 and will be removed in v1.9\n"
"Ingest datasets")
@click.option('--config-file', '-c',
type=click.Path(exists=True, readable=True, writable=False, dir_okay=False),
help='Ingest configuration file')
Expand Down
1 change: 1 addition & 0 deletions docs/about/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ v1.8.next
- Increase default maturity leniency to +-500ms (:pull:`1458`)
- Add option to specify maturity timedelta when using ``--archive-less-mature`` option (:pull:`1460`)
- Mark executors as deprecated (:pull:`1461`)
- Mark ingestion as deprecated (:pull:`1463`)


v1.8.13 (6th June 2023)
Expand Down

0 comments on commit 3affff3

Please sign in to comment.