For 1.9.0 release (#1096)

* CI: cancel ongoing jobs on PR update (#1091) * Fix spelling * CI: cancel ongoing jobs on PR update This cancels the running CI jobs when a PR gets updated, so the CI runners aren't occupied on testing something that is no longer relevant. (cherry picked from commit cc4e4f6) * [pre-commit.ci] pre-commit autoupdate (#1093) updates: - [github.com/PyCQA/pylint: v3.3.1 → v3.3.2](pylint-dev/pylint@v3.3.1...v3.3.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> (cherry picked from commit 60d6c65) * Bump mambaorg/micromamba from 2.0.3 to 2.0.5 (#1095) Bumps mambaorg/micromamba from 2.0.3 to 2.0.5. --- updated-dependencies: - dependency-name: mambaorg/micromamba dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 2d79073) * Update default version nuber. * Update HISTORY.rst * Update GHA workflows * MyPy fixes (numpy>=2.2) * Fix a bungled mypy tweak * Fix typo * Fix mypy properly? * Fix typo - again? --------- Co-authored-by: Peter A. Jonsson <[email protected]> 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>
opendatacube · Dec 23, 2024 · b24b86b · b24b86b
1 parent afe0f83
commit b24b86b
Show file tree

Hide file tree

Showing 19 changed files with 116 additions and 27 deletions.
diff --git a/.github/workflows/complementary-config-test.yaml b/.github/workflows/complementary-config-test.yaml
@@ -4,7 +4,8 @@ name: Complementary config test
 on:
   pull_request:
     branches:
-        - 'master'
+      - 'develop-1.9'
+      - 'develop'
     paths:
       - '**'
       - '!docs/**'
@@ -16,7 +17,8 @@ on:
 
   push:
     branches:
-      - 'master'
+      - 'develop-1.9'
+      - 'develop'
     paths:
       - '**'
       - '!docs/**'
@@ -30,6 +32,12 @@ env:
   ORG: opendatacube
   IMAGE: ows
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   dea-config:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,7 +4,8 @@ name: Build Docker Image
 on:
   push:
     branches:
-      - master
+      - develop
+      - develop-1.9
     paths:
       - "**"
       - '!docs/**'
@@ -19,6 +20,12 @@ env:
   ORG: opendatacube
   IMAGE: ows
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   docker:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/dockerfile-lint.yml b/.github/workflows/dockerfile-lint.yml
@@ -4,20 +4,26 @@ name: dockerfile Linting
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'develop'
       - 'develop-1.9'
     paths:
       - 'Dockerfile'
       - '.github/workflows/dockerfile-lint.yml'
 
   push:
     branches:
-      - 'master'
+      - 'develop'
     paths:
       - 'Dockerfile'
       - '.github/workflows/dockerfile-lint.yml'
 
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   dockerfile-lint:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/docpreview.yaml b/.github/workflows/docpreview.yaml
@@ -9,6 +9,12 @@ on:
 permissions:
   pull-requests: write
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
 
   documentation-preview:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,7 +4,7 @@ name: Code Linting
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'develop'
       - 'develop-1.9'
     paths:
       - '**'
@@ -17,7 +17,7 @@ on:
 
   push:
     branches:
-      - 'master'
+      - 'develop'
       - 'develop-1.9'
     paths:
       - '**'
@@ -28,6 +28,12 @@ on:
       - '!.github/**'
       - '.github/workflows/lint.yml'
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   pylint:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/pyspy-profiling.yaml b/.github/workflows/pyspy-profiling.yaml
@@ -4,7 +4,7 @@ name: Pyspy Profiling Test
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'develop'
       - 'develop-1.9'
     paths:
       - '**'
@@ -17,7 +17,8 @@ on:
 
   push:
     branches:
-      - 'master'
+      - 'develop'
+      - 'develop-1.9'
     paths:
       - '**'
       - '!docs/**'
@@ -27,6 +28,12 @@ on:
       - '!.github/**'
       - '.github/workflows/pyspy-profiling.yaml'
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -4,15 +4,16 @@ name: Scan
 on:
   push:
     branches:
-      - master
+      - develop
       - develop-1.9
     paths:
       - ".github/workflows/scan.yml"
       - "Dockerfile"
 
   pull_request:
     branches:
-      - master
+      - develop
+      - develop-1.9
     paths:
       - ".github/workflows/scan.yml"
       - "Dockerfile"
@@ -23,6 +24,12 @@ on:
 env:
   IMAGE_NAME: opendatacube/ows
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   cve-scanner:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml
@@ -4,7 +4,7 @@ name: Spell check
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'develop'
       - 'develop-1.9'
     paths:
       - 'docs/**'
@@ -14,12 +14,19 @@ on:
 
   push:
     branches:
-      - 'master'
+      - 'develop'
+      - 'develop-1.9'
     paths:
       - 'docs/**'
       - '*.md'
       - '.github/workflows/spellcheck.yaml'
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
 
   pyspellcheck:

diff --git a/.github/workflows/test-prod.yaml b/.github/workflows/test-prod.yaml
@@ -4,7 +4,8 @@ name: Prod dockercompose test
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'develop'
+      - 'develop-1.9'
     paths:
       - '**'
       - '!docs/**'
@@ -16,7 +17,8 @@ on:
 
   push:
     branches:
-      - 'master'
+      - 'develop'
+      - 'develop-1.9'
     paths:
       - '**'
       - '!docs/**'
@@ -30,6 +32,12 @@ env:
   ORG: opendatacube
   IMAGE: ows
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   prod-docker-compose-tests:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ name: Tests
 on:
   pull_request:
     branches:
-      - 'master'
+      - 'develop'
       - 'develop-1.9'
     paths:
       - '**'
@@ -17,7 +17,8 @@ on:
 
   push:
     branches:
-      - 'master'
+      - 'develop'
+      - 'develop-1.9'
     paths:
       - '**'
       - '!docs/**'
@@ -31,6 +32,12 @@ env:
   ORG: opendatacube
   IMAGE: ows
 
+# When a PR is updated, cancel the jobs from the previous version. Merges
+# do not define head_ref, so use run_id to never cancel those jobs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   unit-integration-performance-tests:
     runs-on: ubuntu-latest

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
 #     hooks:
 #     -   id: bandit
 -   repo: https://github.com/PyCQA/pylint
-    rev: v3.3.1
+    rev: v3.3.2
     hooks:
       - id: pylint
         args: ["--disable=C,R,W,E1136"]
diff --git a/Dockerfile.micromamba b/Dockerfile.micromamba
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.3
+FROM mambaorg/micromamba:2.0.5
 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
@@ -7,6 +7,23 @@ History
 
 Datacube-ows version 1.9.x indicates that it is designed work with datacube-core versions 1.9.x.
 
+1.9.0 (2024-12-23)
+------------------
+
+This is the first OWS release compatible with the 1.9.x series datacube-core releases.
+
+New features from the 1.8.x series releases include:
+
+* Full support for the postgis index driver
+* Support for multi-database environment (Can serve data out of multiple indexes)
+* Seamless rendering around the antimeridian for most wms and wmts clients.
+
+Changes from 1.9.0-rc2:
+
+* Update HISTORY.rst and default version number ready for release
+* Active CI jobs are now cancelled on PR update (#1091)
+* Auto upstream library bumps (#1093, #1095)
+
 1.9.0-rc2 (2024-11-15)
 ----------------------
 

diff --git 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-rc2?"
+    __version__ = "1.9.0?"
diff --git a/datacube_ows/feature_info.py b/datacube_ows/feature_info.py
@@ -8,7 +8,7 @@
 import re
 from datetime import datetime
 from itertools import chain
-from typing import cast
+from typing import cast, Iterable
 
 import numpy
 import xarray
@@ -206,7 +206,7 @@ def feature_info(args: dict[str, str]) -> FlaskResponse:
                 ds: Dataset | None = None
                 for pbq, dss in time_datasets.items():
                     if pbq.main:
-                        ds = dss.sel(time=dt).values.tolist()[0]
+                        ds = cast(Dataset, dss.sel(time=dt).values.tolist()[0])
                         break
                 assert ds is not None
                 if params.layer.multi_product:
@@ -271,7 +271,7 @@ def feature_info(args: dict[str, str]) -> FlaskResponse:
         pt_native = None
         for d in all_time_datasets.coords["time"].values:
             dt_datasets = all_time_datasets.sel(time=d)
-            for ds in dt_datasets.values.item():
+            for ds in cast(Iterable[Dataset], dt_datasets.values.item()):
                 assert ds is not None  # For type checker
                 if pt_native is None:
                     pt_native = geo_point.to_crs(ds.crs)

diff --git a/datacube_ows/loading.py b/datacube_ows/loading.py
@@ -355,7 +355,7 @@ def manual_data_stack(self,
         for dt in datasets.time.values:
             tds = datasets.sel(time=dt)
             merged = None
-            for ds in tds.values.item():
+            for ds in cast(Iterable[datacube.model.Dataset], tds.values.item()):
                 d = self.read_data_for_single_dataset(ds, measurements, self._geobox, fuse_func=fuse_func)
                 extent_mask = None
                 for band in non_flag_bands:

diff --git a/datacube_ows/styles/ramp.py b/datacube_ows/styles/ramp.py
@@ -152,7 +152,7 @@ def read_mpl_ramp(mpl_ramp: str) -> RAMP_SPEC:
         }
     )
     for val in val_range:
-        rgba_hex = to_hex(cmap(val))
+        rgba_hex = to_hex(cast(tuple[float, float, float, float], cmap(val)))
         unscaled_cmap.append(
             {
                 "value": float(val),

diff --git a/datacube_ows/utils.py b/datacube_ows/utils.py
@@ -14,7 +14,6 @@
 from datacube import Datacube
 from datacube.api.query import GroupBy, solar_day
 from datacube.model import Dataset
-from numpy import datetime64
 from numpy import datetime64 as npdt64
 from sqlalchemy.engine.base import Connection
 
@@ -103,7 +102,7 @@ def group_by_solar(pnames: list[str] | None = None) -> GroupBy:
         sort_key = base_sort_key
     return GroupBy(
         dimension='time',
-        group_by_func=lambda x: datetime64(solar_day(x), "ns"),
+        group_by_func=lambda x: npdt64(solar_day(x), "ns"),  # type: ignore[call-overload]
         units='seconds since 1970-01-01 00:00:00',
         sort_key=sort_key
     )