v3.1.5 release

Makefile

@@ -4,9 +4,9 @@ export BASE_IMAGE_NAME = "${PROJECT_PREFIX}base_${IMAGE_NAME}"
 export JUPYTER_IMAGE_NAME = "${PROJECT_PREFIX}jupyter_${IMAGE_NAME}"
 export RUN_OPTIONS = 
 
-build-images: build-base-image build-jupyter-image
+build-images: build-base-image build-jupyter-image		## Build both the base and jupyterlab image
 
-build-images-no-cache: build-base-image-no-cache build-jupyter-image-no-cache
+build-images-no-cache: build-base-image-no-cache build-jupyter-image-no-cache		## Build both the base and jupyterlab image without using the docker cache
 
 build-base-image:		## Build the base image for the 'vanilla' workspace (default), or the workspace specified by setting the argument, IMAGE_NAME=<image_name>
 	@cd base_images/${IMAGE_NAME}; \
@@ -46,11 +46,11 @@ help:						## (DEFAULT) This help information
 	@echo ====================================================================
 	@grep -E '^## .*$$'  \
 		$(MAKEFILE_LIST)  \
-		| awk 'BEGIN { FS="## " }; {printf "\033[33m%-20s\033[0m \n", $$2}'
+		| awk 'BEGIN { FS="## " }; {printf "\033[33m%-30s\033[0m \n", $$2}'
 	@echo
 	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$'  \
 		$(MAKEFILE_LIST)  \
-		| awk 'BEGIN { FS=":.*?## " }; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'  \
+		| awk 'BEGIN { FS=":.*?## " }; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'  \
 #		 | sort
 .PHONY: help
 .DEFAULT_GOAL := help

base_images/build-image.sh

@@ -4,7 +4,7 @@ set -ex
 base_image_dir=$(dirname $0)
 # Check if on a branch or in a detached HEAD state get commit sha
 BRANCH=$(basename $(git symbolic-ref -q --short HEAD || git rev-parse --short HEAD))
-DIRS="vanilla r rgedi rsgislib"
+DIRS="vanilla isce3 pangeo r"
 if [[ ! -z "$@" ]]; then
     DIRS=$@
 fi

base_images/isce3/docker/Dockerfile

@@ -22,7 +22,7 @@ RUN conda env create -y -f "/tmp/environment.yml" \
 SHELL ["conda", "run", "-n", "isce3", "/bin/bash", "-c"]
 
 RUN mkdir /maap-py \
-    && git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
+    && git clone --single-branch --branch v3.1.5 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
     && pip install -e /maap-py/
 
 RUN conda list

base_images/isce3/environment.yml

@@ -11,6 +11,7 @@ dependencies:
   - fsspec=2023.12.2
   - gdal=3.7.0
   - geopandas=0.14.1
+  - groff=1.22.4
   - h5py=3.9.0
   - hdf5=1.14.1
   - httpx=0.25.2
@@ -33,7 +34,7 @@ dependencies:
   - requests=2.31.0
   - rio-cogeo=5.1.0
   - rtree=1.1.0
-  - s3fs=0.4.2
+  - s3fs=2023.12.2
   - scikit-learn=1.3.2
   - scipy=1.11.4
   - seaborn=0.13.0
@@ -47,5 +48,6 @@ dependencies:
   - pip=23.3.2
   - pip:
     - git+https://github.com/opera-adt/[email protected]
+    - rio-tiler==6.2.8
 variables:
   MAAP_CONF: '/maap-py/'

base_images/pangeo/docker/Dockerfile

@@ -20,7 +20,7 @@ SHELL ["conda", "run", "-n", "pangeo", "/bin/bash", "-c"]
 
 # Install maap-py library
 RUN mkdir /maap-py \
-    && git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
+    && git clone --single-branch --branch v3.1.5 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
     && pip install -e /maap-py/
 
 RUN conda list

base_images/pangeo/environment.yml

@@ -10,6 +10,8 @@ dependencies:
   - boto3=1.33.13
   - bottleneck=1.3.7
   - cartopy=0.22.0
+  - cdsapi=0.6.1
+  - cf_xarray=0.9.0
   - cfgrib=0.9.10.4
   - cython=3.0.7
   - dask-ml=2023.3.24
@@ -20,48 +22,58 @@ dependencies:
   - eofs=1.4.0
   - erddapy=2.2.0
   - esmpy=8.4.2
+  - fastjmd95=0.2.1
   - flox=0.8.6
   - fsspec=2023.12.2
   - gcm_filters=0.3.0
   - gdal=3.7.0
   - geocube=0.4.2
+  - geogif=0.1.5
   - geopandas=0.14.2
+  - geopy=2.4.1
   - geoviews-core=1.11.0
+  - groff=1.22.4
   - h5netcdf=1.3.0
   - h5py=3.9.0
   - hdf5=1.14.0
   - holoviews=1.18.1
   - httpx=0.26.0
   - hvplot=0.9.1
-  - intake=0.7.0
+  - intake-esm=2024.2.6
   - intake-geopandas=0.4.0
   - intake-stac=0.4.0
   - intake-xarray=0.7.0
+  - intake=0.7.0
   - kerchunk=0.2.2
+  - line_profiler=4.1.1
   - lxml=4.9.3
   - lz4=4.3.2
   - mapclassify=2.6.1
   - matplotlib=3.7.3
+  - memory_profiler=0.61.0
+  - metpy=1.6.1
   - mizani=0.10.0
   - mpl-scatter-density=0.7
   - nc-time-axis=1.4.1
   - netcdf4=1.6.4
   - numba=0.58.1
+  - numbagg=0.8.0
   - numcodecs=0.11.0
   - numpy=1.26.3
   - odc-stac=0.3.8
-  - pandas=2.1.4
   - pandarallel=1.6.5
+  - pandas=2.1.4
   - pyarrow=14.0.1
+  - pycamhd=0.7.0
   - pycurl=7.45.1
   - pydap=3.4.0
   - pygeos=0.14
   - pyogrio=0.6.0
   - pyproj=3.5.0
-  - pystac=1.9.0
   - pystac-client=0.6.1
-  - python=3.10.13
+  - pystac=1.9.0
   - python-blosc=1.10.6
+  - python=3.10.13
   - rasterio=1.3.7
   - rasterstats=0.19.0
   - rechunker=0.5.2
@@ -70,6 +82,7 @@ dependencies:
   - rioxarray=0.15.0
   - rtree=1.1.0
   - s3fs=2023.12.2
+  - satpy=0.47.0
   - scikit-image=0.22.0
   - scikit-learn=1.3.2
   - scipy=1.11.4
@@ -79,18 +92,31 @@ dependencies:
   - sparse=0.15.0
   - stackstac=0.5.0
   - statsmodels=0.14.1
+  - tiledb-py=0.19.1 
+  - timezonefinder=6.4.1
   - tqdm=4.66.1
   - unidecode=1.3.7
-  - xarray=2023.12.0
   - xarray-datatree=0.0.13
   - xarray-spatial=0.3.5
+  - xarray=2023.12.0
   - xarrayutils=2.0.0
+  - xbatcher=0.3.0
+  - xcape=0.1.4
+  - xclim=0.46.0
+  - xcube=0.9.1
   - xesmf=0.8.2
+  - xgboost=2.0.3
+  - xgcm=0.8.1
   - xhistogram=0.3.2
+  - xmip=0.7.2
+  - xmitgcm=0.5.2
   - xmltodict=0.13.0
+  - xpublish=0.3.3
+  - xrft=1.0.1
   - zarr=2.16.1
   - pip=23.3.2
   - pip:
     - morecantile==5.1.0
+    - rio-tiler==6.2.8
 variables:
   MAAP_CONF: '/maap-py/'

base_images/r/docker/Dockerfile

@@ -21,7 +21,7 @@ RUN apt-get clean && apt-get update && \
     libhdf4-alt-dev=4.2.15-3 \
     libhdf5-dev=1.10.6+repack-4+deb11u1 \
     libjq-dev=1.6-2.1 \
-    libpq-dev=13.13-0+deb11u1 \
+    libpq-dev=13.14-0+deb11u1 \
     libproj-dev=7.2.1-1 \
     libprotobuf-dev=3.12.4-1+deb11u1 \
     libnetcdf-dev=1:4.7.4-1 \
@@ -54,7 +54,7 @@ RUN /scripts/install_cran_packages_r.sh
 
 # Install maap-py library
 RUN mkdir /maap-py \
-    && git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
+    && git clone --single-branch --branch v3.1.5 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
     && pip install -e /maap-py/
 
 RUN conda list

base_images/r/environment.yml

@@ -6,13 +6,16 @@ channels:
 dependencies:
   - awscli=2.14.1
   - earthaccess=0.8.2
+  - groff=1.22.4
   - parallel=20231122
   - perl=5.32.1
   - postgis=3.4.0
   - python=3.10.13
   - r=4.2
+  - r-arrow=14.0.1
   - r-aws.s3=0.3.22
   - r-base=4.2.3
+  - r-BiocManager=1.30.22
   - r-broom=1.0.5
   - r-car=3.1_2
   - r-chron=2.3_61
@@ -104,5 +107,6 @@ dependencies:
   - pip:
     - ff==0.0.10
     - grid==0.7.1
+    - rio-tiler==6.2.8
 variables:
   MAAP_CONF: '/maap-py/'

base_images/vanilla/docker/Dockerfile

@@ -20,7 +20,7 @@ SHELL ["conda", "run", "-n", "vanilla", "/bin/bash", "-c"]
 
 # Install maap-py library
 RUN mkdir /maap-py \
-    && git clone --single-branch --branch v3.1.4 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
+    && git clone --single-branch --branch v3.1.5 https://github.com/MAAP-Project/maap-py.git /maap-py/ \
     && pip install -e /maap-py/
 
 RUN conda list

base_images/vanilla/environment.yml

@@ -12,6 +12,7 @@ dependencies:
   - gdal=3.7.0
   - geocube=0.4.2
   - geopandas=0.14.2
+  - groff=1.22.4
   - h5py=3.9.0
   - hdf5=1.14.0
   - httpx=0.26.0
@@ -34,7 +35,7 @@ dependencies:
   - requests=2.31.0
   - rio-cogeo=5.1.1
   - rtree=1.1.0
-  - s3fs=0.4.2
+  - s3fs=2023.12.2
   - scikit-learn=1.3.2
   - scipy=1.11.4
   - seaborn=0.13.1
@@ -47,5 +48,6 @@ dependencies:
   - pip=23.3.2
   - pip:
     - morecantile==5.1.0
+    - rio-tiler==6.2.8
 variables:
   MAAP_CONF: '/maap-py/'

devfiles/edav/devfile/devfile.yaml

@@ -56,7 +56,7 @@ components:
                     subPath: shared-buckets
                     mountPropagation: HostToContainer
               - name: s3fs
-                image: 'mas.ops.maap-project.org/root/che-sidecar-s3fs:master'
+                image: 'mas.dit.maap-project.org/root/che-sidecar-s3fs:master'
                 imagePullPolicy: Always
                 resources:
                   limits:

devfiles/index_example.json

@@ -28,21 +28,6 @@
       "self": "/devfiles/maap-vanilla/devfile_2.0.yaml"
     }
   },
-  {
-    "displayName": "MAAP RGEDI Stable",
-    "description": "Latest version of MAAP RGEDI",
-    "tags": [
-      "JupyterLab",
-      "Python",
-      "R",
-      "MAAP"
-    ],
-    "icon": "/images/r.png",
-    "globalMemoryLimit": "2710Mi",
-    "links": {
-      "self": "/devfiles/rgedi/devfile.yaml"
-    }
-  },
   {
     "displayName": "MAAP ESA EDAV",
     "description": "Latest version of MAAP ESA EDAV",