Skip to content

Commit 26f7002

Browse files
authored
Prep for 1.8.40 release (#1013)
* Increment default version number. * Add test for Robbi's s3 URL displaying PR. * Update HISTORY.rst for 1.8.40 release. * Lintage. * Fix broken date call. * More lintage.
1 parent 9a4d8fd commit 26f7002

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

HISTORY.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ History
77

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

10+
1.8.40 (2024-04-29)
11+
-------------------
12+
13+
Bug fix release
14+
15+
* Loading now uses `skip_broken_datasets=True` by default. (#1001)
16+
* Bump base osgeo/gdal docker image version. (#1003)
17+
* Update versions of several upstream packages to avoid known security issues (#1004, #1005, #1008)
18+
* pre-commit autoupdate (#1006)
19+
* Make S3 URL rewriting work with metadata indexed from STAC (#1011)
20+
* Update HISTORY.rst and increment default version for release and some tests. (#1013)
21+
22+
This release includes contributions from @whatnick, @pjonsson, @SpacemanPaul, and various automatic updater bots.
23+
1024
1.8.39 (2024-03-13)
1125
-------------------
1226

datacube_ows/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
try:
77
from ._version import version as __version__
88
except ImportError:
9-
__version__ = "1.8.39+?"
9+
__version__ = "1.8.40?"

datacube_ows/data.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import datacube
1414
import numpy
1515
import numpy.ma
16-
import pytz
1716
import xarray
1817
from datacube.utils import geometry
1918
from datacube.utils.masking import mask_to_dict
@@ -393,8 +392,7 @@ def check_date(time_res, user_date, odc_date):
393392
elif time_res.is_summary():
394393
norm_date = date(ts.year,
395394
ts.month,
396-
ts.day,
397-
tzinfo=pytz.utc)
395+
ts.day)
398396
return norm_date == user_date
399397
else:
400398
norm_date = datetime(ts.year,

integration_tests/utils.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ def wcs1_args(
304304
crs_extent = extent.to_crs(crs)
305305
crs_bbox = crs_extent.boundingbox
306306
return {
307-
"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)}",
307+
"bbox": f"{min(crs_bbox.left, crs_bbox.right)},{min(crs_bbox.top, crs_bbox.bottom)},"
308+
f"{max(crs_bbox.left, crs_bbox.right)},{max(crs_bbox.top, crs_bbox.bottom)}",
308309
"times": ",".join(time_strs),
309310
}
310311

tests/test_data.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@ def __init__(self, uris):
3030
"s3://test-bucket/hello_world/data.yaml"
3131
])
3232
d2 = TestDataset([
33-
"s3://test-bucket/hello.word/foo.bar/hello.test.yaml",
34-
"s3://test-bucket/hello.word/foo.bar/hello-test.yaml"
33+
"s3://test-bucket/hello.word/foo.bar/hello.test.yaml",
34+
"s3://test-bucket/hello.word/foo.bar/hello-test.yaml"
35+
])
36+
d3 = TestDataset([
37+
"s3://test-bucket/this.is/from.stac/hello.test.json",
3538
])
3639

3740
datasets.append(d1)
3841
datasets.append(d2)
42+
datasets.append(d3)
3943

4044
class DataSetMock:
4145
def __init__(self, datasets):
@@ -67,6 +71,7 @@ def test_s3_browser_uris(s3_url_datasets):
6771

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

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

0 commit comments

Comments
 (0)