Merge pull request #36 from ecmwf/bump/2024-11-05

Update dependencies2024 11 08

Dockerfile

@@ -108,7 +108,7 @@ ARG ecbuild_version=3.8.2
 ARG eccodes_version=2.33.1
 ARG eckit_version=1.28.0
 ARG fdb_version=5.13.2
-ARG pyfdb_version=0.0.3
+ARG pyfdb_version=0.1.0
 RUN apt update
 # COPY polytope-deployment/common/default_fdb_schema /polytope/config/fdb/default
 
@@ -229,9 +229,12 @@ FROM mars-base AS mars-base-c
 RUN apt update && apt install -y liblapack3 mars-client=${mars_client_c_version} mars-client-cloud
 
 FROM mars-base AS mars-base-cpp
+ARG pyfdb_version=0.1.0
 RUN apt update && apt install -y mars-client-cpp=${mars_client_cpp_version}
 RUN set -eux \
-    && python3 -m pip install git+https://github.com/ecmwf/pyfdb.git@master --user
+    && git clone --single-branch --branch ${pyfdb_version} https://github.com/ecmwf/pyfdb.git \
+    && python -m pip install ./pyfdb --user
+
 
 FROM blank-base AS blank-base-c
 FROM blank-base AS blank-base-cpp
@@ -342,7 +345,6 @@ COPY --chown=polytope --from=gribjump-base-final /root/.local /home/polytope/.lo
 # Copy python requirements
 COPY --chown=polytope --from=worker-base /root/.venv /home/polytope/.local
 
-
 # Install the server source
 COPY --chown=polytope . /polytope/
 

polytope_server/common/datasource/polytope.py

@@ -72,16 +72,6 @@ def retrieve(self, request):
         polytope_mars_config = copy.deepcopy(self.config)
         polytope_mars_config["options"]["pre_path"] = pre_path
 
-        transforms = []
-        for transform in polytope_mars_config["options"]["axis_config"]:
-            if transform["axis_name"] in r.keys():
-                logging.info("Found axis {} in request".format(transform["axis_name"]))
-                transforms.append(transform)
-            if transform["axis_name"] in ("latitude", "longitude", "values"):
-                transforms.append(transform)
-
-        polytope_mars_config["options"]["axis_config"] = transforms
-
         polytope_mars = PolytopeMars(
             polytope_mars_config,
             log_context={

requirements.txt

@@ -1,6 +1,6 @@
 attrdict==2.0.1
 boto3==1.35.19
-covjsonkit==0.0.24
+covjsonkit==0.0.27
 deepmerge==2.0
 docker==7.1.0
 ecmwf-api-client==1.6.3
@@ -20,8 +20,8 @@ Markdown==3.7
 minio==7.2.8
 moto[dynamodb]==5.0.16
 pika==1.3.2
-polytope-mars==0.0.12
-polytope-python==1.0.8
+polytope-mars==0.1.2
+polytope-python==1.0.12
 py-bcrypt==0.4
 pykwalify==1.8.0
 pymemcache==4.0.0

skaffold.yaml

@@ -40,12 +40,12 @@ build:
         mars_config_branch: "{{ .mars_config_branch }}"
         developer_mode: "{{ .developer_mode }}"
         # mars_client_c_version: 6.33.20.2
-        gribjump_version: 0.6.2
+        gribjump_version: 0.6.3
         # mars_client_cpp_version: 6.99.3.0
         # ecbuild_version: 3.8.2
         # eccodes_version: 2.33.1
         # eckit_version: 1.28.0
-        # pyfdb_version: 0.0.3
+        # pyfdb_version: 0.1.0
         # fdb_version: 5.13.2
         mars_base_c: mars-base-c
         mars_base_cpp: mars-base-cpp