Skip to content

Commit

Permalink
1.8 to1.9 cherrypick (#1532)
Browse files Browse the repository at this point in the history
* update pandas version in docker image and update query docstring accordingly

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update whats_new

* update wordlist

* add pandas to constraints.in, fix docstring

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Ariana Barzinpour <ariana.barzinpour@ga.gov.au>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 14, 2024
1 parent 0122fd4 commit 906cd82
Show file tree
Hide file tree
Showing 227 changed files with 238 additions and 229 deletions.
2 changes: 1 addition & 1 deletion datacube/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Datacube
Expand Down
2 changes: 1 addition & 1 deletion datacube/api/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Modules for the Storage and Access Query API
Expand Down
4 changes: 2 additions & 2 deletions datacube/api/core.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
import logging
import uuid
Expand Down Expand Up @@ -221,7 +221,7 @@ def _list_measurements(self):
def load(self, product=None, measurements=None, output_crs=None, resolution=None, resampling=None,
skip_broken_datasets=False, dask_chunks=None, like=None, fuse_func=None, align=None,
datasets=None, dataset_predicate=None, progress_cbk=None, patch_url=None, **query):
"""
r"""
Load data as an ``xarray.Dataset`` object.
Each measurement will be a data variable in the :class:`xarray.Dataset`.
Expand Down
4 changes: 2 additions & 2 deletions datacube/api/query.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Storage Query and Access API module
Expand Down Expand Up @@ -77,7 +77,7 @@ def __init__(self, index=None, product=None, geopolygon=None, like=None, **searc
Use by accessing :attr:`search_terms`:
>>> query.search_terms['time'] # doctest: +NORMALIZE_WHITESPACE
Range(begin=datetime.datetime(2001, 1, 1, 0, 0, tzinfo=<UTC>), \
Range(begin=datetime.datetime(2001, 1, 1, 0, 0, tzinfo=datetime.timezone.utc), \
end=datetime.datetime(2002, 1, 1, 23, 59, 59, 999999, tzinfo=tzutc()))
By passing in an ``index``, the search parameters will be validated as existing on the ``product``.
Expand Down
2 changes: 1 addition & 1 deletion datacube/cfg/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0


Expand Down
2 changes: 1 addition & 1 deletion datacube/cfg/api.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

"""
Expand Down
2 changes: 1 addition & 1 deletion datacube/cfg/cfg.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Low level config path resolution, loading and multi-format parsing functions.
Expand Down
2 changes: 1 addition & 1 deletion datacube/cfg/exceptions.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Config reading/loading exceptions
Expand Down
2 changes: 1 addition & 1 deletion datacube/cfg/opt.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

import os
Expand Down
2 changes: 1 addition & 1 deletion datacube/cfg/utils.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

import re
Expand Down
2 changes: 1 addition & 1 deletion datacube/config.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
User configuration.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
This module implements a simple plugin manager for storage and index drivers.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/_tools.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from threading import Lock
from typing import Any
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/_types.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
""" Defines abstract types for IO drivers.
"""
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/datasource.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
""" Defines abstract types for IO reader drivers.
"""
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/driver_cache.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
import logging
from typing import Dict, Any, Tuple, Iterable
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/indexes.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from typing import List, Optional

Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/netcdf/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from ._write import write_dataset_to_netcdf, create_netcdf_storage_unit
from . import writer as netcdf_writer
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/netcdf/_write.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from pathlib import Path
import logging
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/netcdf/driver.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from urllib.parse import urlsplit

Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/netcdf/writer.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Create netCDF4 Storage Units and write data to them
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Lower-level database access.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/_api.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

# We often have one-arg-per column, so these checks aren't so useful.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/_connections.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

# We often have one-arg-per column, so these checks aren't so useful.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/_core.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Core SQL schema settings.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/_fields.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Build and index fields within documents.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/_schema.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Tables for indexing the datasets which were ingested into the AGDC.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/_spatial.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Tracking spatial indexes
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/alembic/env.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from alembic import context

Expand Down
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""Initial revision
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgis/sql.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Custom types for postgres & sqlalchemy
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Lower-level database access.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/_api.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

# We often have one-arg-per column, so these checks aren't so useful.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/_connections.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0

# We often have one-arg-per column, so these checks aren't so useful.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/_core.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Core SQL schema settings.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/_dynamic.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Methods for managing dynamic dataset field indexes and views.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/_fields.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Build and index fields within documents.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/_schema.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Tables for indexing the datasets which were ingested into the AGDC.
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/postgres/sql.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Custom types for postgres & sqlalchemy
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/readers.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from typing import List, Optional, Callable
from .driver_cache import load_drivers
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/rio/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
""" RasterIO based driver
"""
2 changes: 1 addition & 1 deletion datacube/drivers/rio/_reader.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
""" reader
"""
Expand Down
2 changes: 1 addition & 1 deletion datacube/drivers/writers.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
from typing import List

Expand Down
2 changes: 1 addition & 1 deletion datacube/helpers.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Useful functions for Datacube users
Expand Down
2 changes: 1 addition & 1 deletion datacube/index/__init__.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Modules for interfacing with the index/database.
Expand Down
2 changes: 1 addition & 1 deletion datacube/index/_api.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
"""
Access methods for indexing datasets & products.
Expand Down
2 changes: 1 addition & 1 deletion datacube/index/abstract.py
@@ -1,6 +1,6 @@
# This file is part of the Open Data Cube, see https://opendatacube.org for more information
#
# Copyright (c) 2015-2023 ODC Contributors
# Copyright (c) 2015-2024 ODC Contributors
# SPDX-License-Identifier: Apache-2.0
import datetime
import logging
Expand Down

0 comments on commit 906cd82

Please sign in to comment.