Get docker image working with latest gdal ubuntu

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5 as builder
+FROM ghcr.io/osgeo/gdal:ubuntu-small-latest as builder
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LC_ALL=C.UTF-8 \
@@ -18,9 +18,9 @@ RUN apt-get update && \
 
 WORKDIR /build
 
-RUN python3.10 -m pip --disable-pip-version-check -q wheel --no-binary psycopg2 psycopg2
+RUN python3 -m pip --disable-pip-version-check -q wheel --no-binary psycopg2 psycopg2
 
-FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.5
+FROM ghcr.io/osgeo/gdal:ubuntu-small-latest
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LC_ALL=C.UTF-8 \
@@ -48,7 +48,7 @@ RUN apt-get update && \
     rm -rf /var/lib/{apt,dpkg,cache,log} && \
     echo "Environment is: $ENVIRONMENT" && \
     ([ "$ENVIRONMENT" = "deployment" ] || \
-      pip install --disable-pip-version-check pip-tools pytest-cov)
+        pip install --disable-pip-version-check pip-tools pytest-cov --break-system-packages)
 
 # Set up a nice workdir and add the live code
 ENV APPDIR=/code
@@ -59,12 +59,12 @@ COPY . $APPDIR
 # then we want to link the source (with the -e flag) and if we're in prod, we
 # want to delete the stuff in the /code folder to keep it simple.
 COPY --from=builder --link /build/*.whl ./
-RUN python3.10 -m pip --disable-pip-version-check -q install *.whl && \
+RUN python3 -m pip --disable-pip-version-check -q install *.whl --break-system-packages && \
     rm *.whl && \
     ([ "$ENVIRONMENT" = "deployment" ] || \
-        pip --disable-pip-version-check install --editable .[$ENVIRONMENT]) && \
+        pip --disable-pip-version-check install --editable .[$ENVIRONMENT] --break-system-packages) && \
     ([ "$ENVIRONMENT" != "deployment" ] || \
-        (pip --no-cache-dir --disable-pip-version-check install .[$ENVIRONMENT] && \
+        (pip --no-cache-dir --disable-pip-version-check install .[$ENVIRONMENT] --break-system-packages && \
          rm -rf /code/* /code/.git*)) && \
     pip freeze && \
     ([ "$ENVIRONMENT" != "deployment" ] || \

cubedash/summary/_stores.py

@@ -30,9 +30,9 @@
 from geoalchemy2 import WKBElement
 from geoalchemy2 import shape as geo_shape
 from geoalchemy2.shape import from_shape, to_shape
-from pygeofilter import ast
-from pygeofilter.backends.evaluator import handle
-from pygeofilter.backends.sqlalchemy.evaluate import SQLAlchemyFilterEvaluator
+from pygeofilter.backends.sqlalchemy.evaluate import (
+    SQLAlchemyFilterEvaluator as FilterEvaluator,
+)
 from pygeofilter.parsers.cql2_json import parse as parse_cql2_json
 from pygeofilter.parsers.cql2_text import parse as parse_cql2_text
 from shapely.geometry.base import BaseGeometry
@@ -43,7 +43,6 @@
     exists,
     func,
     literal,
-    null,
     or_,
     select,
     union_all,
@@ -1267,7 +1266,7 @@ def _add_filter_to_query(
             if filter_lang == "cql2-text"
             else parse_cql2_json(filter_cql)
         )
-        query = query.filter(FilterEvaluator(field_exprs).evaluate(filter_cql))
+        query = query.filter(FilterEvaluator(field_exprs, True).evaluate(filter_cql))
 
         return query
 
@@ -1881,19 +1880,6 @@ def get_dataset_footprint_region(self, dataset_id):
         )
 
 
-class FilterEvaluator(SQLAlchemyFilterEvaluator):
-    """
-    Since pygeofilter's SQLAlchemyFilterEvaluator doesn't support treating
-    invalid/undefined attributes as NULL as per the STAC API Filter spec,
-    this class overwrites the Evaluator's handling of attributes to return NULL
-    as the default value if a field is not present in the mapping of sqlalchemy expressions.
-    """
-
-    @handle(ast.Attribute)
-    def attribute(self, node: ast.Attribute):
-        return self.field_mapping.get(node.name, null())
-
-
 def _refresh_data(please_refresh: Set[PleaseRefresh], store: SummaryStore):
     """
     Refresh product information after a schema update, plus the given kind of data.

docs/rtd-requirements.txt

@@ -86,9 +86,9 @@ datacube==1.8.18
 dateparser==1.2.0
     # via pygeofilter
 defusedxml==0.7.1
-    # via datacube
-deprecat==2.1.1
     # via eodatasets3
+deprecat==2.1.1
+    # via datacube
 distributed==2023.1.1
     # via datacube
 eodatasets3==0.30.1
@@ -196,9 +196,9 @@ psutil==5.9.4
     # via distributed
 psycopg2==2.9.5
     # via datacube
-pygeofilter==0.2.1
+pygeofilter==0.2.4
     # via datacube-explorer (setup.py)
-pygeoif==1.4.0
+pygeoif==1.5.0
     # via pygeofilter
 pyorbital==1.7.3
     # via datacube-explorer (setup.py)
@@ -241,7 +241,7 @@ referencing==0.32.0
     # via
     #   jsonschema
     #   jsonschema-specifications
-regex==2023.12.25
+regex==2024.5.15
     # via dateparser
 requests==2.28.2
     # via pyorbital
@@ -296,7 +296,7 @@ toolz==0.12.0
     #   partd
 tornado==6.2
     # via distributed
-typing-extensions==4.11.0
+typing-extensions==4.12.2
     # via pygeoif
 tzlocal==5.2
     # via dateparser

setup.py

@@ -96,7 +96,7 @@
         "sqlalchemy>=1.4",
         "structlog>=20.2.0",
         "pytz",
-        "pygeofilter",
+        "pygeofilter>=0.2.2",
     ],
     tests_require=tests_require,
     extras_require=extras_require,