From afe0f83588a3756d5acb0991b3b08360db4b523e Mon Sep 17 00:00:00 2001 From: Paul Haesler Date: Fri, 15 Nov 2024 16:12:22 +1100 Subject: [PATCH] Cherrypicks and 1.9.0 rc2 (#1087) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/pre-commit-hooks: v4.6.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.6.0...v5.0.0) - [github.com/PyCQA/pylint: v3.2.6 → v3.3.1](https://github.com/PyCQA/pylint/compare/v3.2.6...v3.3.1) (cherry picked from commit 1377fea86e304b9006a9b425051b88deb20441f8) * Bump mambaorg/micromamba from 1.5.8 to 2.0.2 Bumps mambaorg/micromamba from 1.5.8 to 2.0.2. --- updated-dependencies: - dependency-name: mambaorg/micromamba dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] (cherry picked from commit a403799b598ac71b8e83838213d8c6c94ca55ae7) * Bump osgeo/gdal from ubuntu-small-3.9.2 to ubuntu-small-3.9.3 Bumps [osgeo/gdal](https://github.com/OSGeo/gdal) from ubuntu-small-3.9.2 to ubuntu-small-3.9.3. - [Release notes](https://github.com/OSGeo/gdal/releases) - [Changelog](https://github.com/OSGeo/gdal/blob/master/NEWS.md) - [Commits](https://github.com/OSGeo/gdal/compare/v3.9.2...v3.9.3) --- updated-dependencies: - dependency-name: osgeo/gdal dependency-type: direct:production ... Signed-off-by: dependabot[bot] (cherry picked from commit 7790ff023eb11b7fa27a9b8c697fedc992ac27a9) * Bump mambaorg/micromamba from 2.0.2 to 2.0.3 Bumps mambaorg/micromamba from 2.0.2 to 2.0.3. --- updated-dependencies: - dependency-name: mambaorg/micromamba dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] (cherry picked from commit ad9461dcf842cb08c6b24239677c9a0d55fe52c9) * Bump osgeo/gdal from ubuntu-small-3.9.3 to ubuntu-small-3.10.0 (#1084) Bumps [osgeo/gdal](https://github.com/OSGeo/gdal) from ubuntu-small-3.9.3 to ubuntu-small-3.10.0. - [Release notes](https://github.com/OSGeo/gdal/releases) - [Changelog](https://github.com/OSGeo/gdal/blob/master/NEWS.md) - [Commits](https://github.com/OSGeo/gdal/compare/v3.9.3...v3.10.0) --- updated-dependencies: - dependency-name: osgeo/gdal dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c565b96592765a6e99461afcceb297a3193e7a9d) * Bump default version for pre-release. * Update HISTORY.rst for 1.9.0-rc2 release. * Update HISTORY.rst. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- Dockerfile | 4 ++-- Dockerfile.micromamba | 2 +- HISTORY.rst | 26 ++++++++++++++++++++++++++ datacube_ows/__init__.py | 2 +- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a1fafef53..0b4a8fd43 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: check-yaml - id: end-of-file-fixer @@ -15,7 +15,7 @@ repos: # hooks: # - id: bandit - repo: https://github.com/PyCQA/pylint - rev: v3.2.6 + rev: v3.3.1 hooks: - id: pylint args: ["--disable=C,R,W,E1136"] diff --git a/Dockerfile b/Dockerfile index 623ab635f..93f4bc6bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Note that this is now pinned to a fixed version. Remember to check for new versions periodically. -FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.2 AS builder +FROM ghcr.io/osgeo/gdal:ubuntu-small-3.10.0 AS builder # Environment is test or deployment. ARG ENVIRONMENT=deployment @@ -26,7 +26,7 @@ RUN python3 -m pip --disable-pip-version-check -q wheel --no-binary psycopg2 psy python3 -m pip --disable-pip-version-check -q wheel --no-binary pyproj pyproj) # Should match builder base. -FROM ghcr.io/osgeo/gdal:ubuntu-small-3.9.2 +FROM ghcr.io/osgeo/gdal:ubuntu-small-3.10.0 # Environment is test or deployment. ARG ENVIRONMENT=deployment diff --git a/Dockerfile.micromamba b/Dockerfile.micromamba index 67960feec..edbeb02a7 100644 --- a/Dockerfile.micromamba +++ b/Dockerfile.micromamba @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.8 +FROM mambaorg/micromamba:2.0.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env.micromamba.yaml /tmp/env.yaml RUN --mount=type=cache,target=/opt/conda/pkgs micromamba install -y -n base -f /tmp/env.yaml && \ micromamba clean --all --yes --force-pkgs-dirs && \ diff --git a/HISTORY.rst b/HISTORY.rst index bed5f58bf..3edac0332 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,18 @@ History Datacube-ows version 1.9.x indicates that it is designed work with datacube-core versions 1.9.x. +1.9.0-rc2 (2024-11-15) +---------------------- + +Now supports seamless rendering across the antimeridian for most wms clients. + +* Antimeridian handling (#1076, #1083, #1086, +* Fix bug in resource limiting defaults (#1077) +* Add support for proxy fix header handling (#1085) +* Cherry pick recent updates from mainline (#1087) + +This release includes contributions from @SpacemanPaul, @alexgleith, @christophfriedrich and @pjonsson. + 1.9.0-rc1 (2024-08-01) ---------------------- @@ -27,6 +39,20 @@ This release includes contributions from @SpacemanPaul Datacube-ows version 1.8.x indicates that it is designed work with datacube-core versions 1.8.x. +1.8.43 (2024-11-15) +------------------- + +* Suppress various upstream warning messages (#1045) +* Various docker image cleanups and updates (#1046, #1047, #1048, #1057, #1059, #1061, #1080) +* Various CI cleanups/improvements (#1050, #1052, #1053, #1055) +* Fix TIFF statistics in case WCS output has NaNs (#1054) +* Documentation improvements (#1064) +* Various auto-updates (#1066. #1071, #1075, #1078, #1082, #1088) +* Fix bug in resource limiting defaults (#1077) +* Prepare for release (#1089) + +This release includes contributions from @SpacemanPaul, @alexgleith, @christophfriedrich and @pjonsson. + 1.8.42 (2024-08-01) ------------------- diff --git a/datacube_ows/__init__.py b/datacube_ows/__init__.py index 9cc4fed8e..b945c6f36 100644 --- a/datacube_ows/__init__.py +++ b/datacube_ows/__init__.py @@ -7,4 +7,4 @@ try: from ._version import version as __version__ except ImportError: - __version__ = "1.9.0-rc1?" + __version__ = "1.9.0-rc2?"