Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prep for 1.8.40 release #1013

Merged
merged 6 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ History

Datacube-ows version 1.8.x indicates that it is designed work with datacube-core versions 1.8.x.

1.8.40 (2024-04-29)
-------------------

Bug fix release

* Loading now uses `skip_broken_datasets=True` by default. (#1001)
* Bump base osgeo/gdal docker image version. (#1003)
* Update versions of several upstream packages to avoid known security issues (#1004, #1005, #1008)
* pre-commit autoupdate (#1006)
* Make S3 URL rewriting work with metadata indexed from STAC (#1011)
* Update HISTORY.rst and increment default version for release and some tests. (#1013)

This release includes contributions from @whatnick, @pjonsson, @SpacemanPaul, and various automatic updater bots.

1.8.39 (2024-03-13)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion datacube_ows/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
try:
from ._version import version as __version__
except ImportError:
__version__ = "1.8.39+?"
__version__ = "1.8.40?"
4 changes: 1 addition & 3 deletions datacube_ows/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import datacube
import numpy
import numpy.ma
import pytz
import xarray
from datacube.utils import geometry
from datacube.utils.masking import mask_to_dict
Expand Down Expand Up @@ -393,8 +392,7 @@ def check_date(time_res, user_date, odc_date):
elif time_res.is_summary():
norm_date = date(ts.year,
ts.month,
ts.day,
tzinfo=pytz.utc)
ts.day)
return norm_date == user_date
else:
norm_date = datetime(ts.year,
Expand Down
3 changes: 2 additions & 1 deletion integration_tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ def wcs1_args(
crs_extent = extent.to_crs(crs)
crs_bbox = crs_extent.boundingbox
return {
"bbox": f"{min(crs_bbox.left,crs_bbox.right)},{min(crs_bbox.top,crs_bbox.bottom)},{max(crs_bbox.left,crs_bbox.right)},{max(crs_bbox.top,crs_bbox.bottom)}",
"bbox": f"{min(crs_bbox.left, crs_bbox.right)},{min(crs_bbox.top, crs_bbox.bottom)},"
f"{max(crs_bbox.left, crs_bbox.right)},{max(crs_bbox.top, crs_bbox.bottom)}",
"times": ",".join(time_strs),
}

Expand Down
9 changes: 7 additions & 2 deletions tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@ def __init__(self, uris):
"s3://test-bucket/hello_world/data.yaml"
])
d2 = TestDataset([
"s3://test-bucket/hello.word/foo.bar/hello.test.yaml",
"s3://test-bucket/hello.word/foo.bar/hello-test.yaml"
"s3://test-bucket/hello.word/foo.bar/hello.test.yaml",
"s3://test-bucket/hello.word/foo.bar/hello-test.yaml"
])
d3 = TestDataset([
"s3://test-bucket/this.is/from.stac/hello.test.json",
])

datasets.append(d1)
datasets.append(d2)
datasets.append(d3)

class DataSetMock:
def __init__(self, datasets):
Expand Down Expand Up @@ -67,6 +71,7 @@ def test_s3_browser_uris(s3_url_datasets):

assert "http://test-bucket.s3-website-ap-southeast-2.amazonaws.com/?prefix=hello_world" in uris
assert "http://test-bucket.s3-website-ap-southeast-2.amazonaws.com/?prefix=hello.word/foo.bar" in uris
assert "http://test-bucket.s3-website-ap-southeast-2.amazonaws.com/?prefix=this.is/from.stac" in uris

# TODO: read_data is now a method of the DataStacker class. This test needs a rewrite.
# @patch('xarray.Dataset')
Expand Down
Loading