Merge pull request #17 from esgf-nimbus/update-climate

Update climate

dockerfiles/Makefile

@@ -4,7 +4,7 @@ NAMESPACE ?= ghcr.io/esgf-nimbus
 
 build push run: REPOSITORY = $(lastword $(subst /, ,$(PWD)))
 
-build: changelog
+build:
 	docker build $(ARGS) -t $(NAMESPACE)/$(REPOSITORY):$(VERSION) . $(if $(POST_BUILD),&& $(POST_BUILD),)
 
 push:

dockerfiles/climate-notebook-gpu/Dockerfile

@@ -1,4 +1,4 @@
-ARG TAG=0.1.0
+ARG TAG=0.1.1
 ARG IMAGE=ghcr.io/esgf-nimbus/climate-notebook
 FROM ${IMAGE}:${TAG}
 

dockerfiles/climate-notebook-gpu/Makefile

@@ -1,6 +1,6 @@
 .DEFAULT_GOAL = build
 
-VERSION = 0.1.0
+VERSION = 0.1.1
 
 run: ARGS = -p 8888:8888
 

dockerfiles/climate-notebook-gpu/base.yaml

@@ -2,6 +2,7 @@ name: base
 channels:
   - conda-forge
 dependencies:
+  # ML packages
   - rapids
   - cupy
 prefix: /opt/conda

dockerfiles/climate-notebook-gpu/changelog.md

@@ -1,2 +1,6 @@
 # Changelog
+- Bump climate-notebook-gpu to 0.1.1 [0c44e66](https://github.com/esgf-nimbus/nimbus/commit/0c44e66) (2024-04-18)
+- Bump climate-notebook to 0.1.1 [ff7e50e](https://github.com/esgf-nimbus/nimbus/commit/ff7e50e) (2024-04-18)
+  - Adds climate-notebook-gpu [1acc458](https://github.com/esgf-nimbus/nimbus/commit/1acc458) (2024-03-08)
+  - Renames minimal-notebook* to climate-notebook and adds new minimal-notebook [7a64382](https://github.com/esgf-nimbus/nimbus/commit/7a64382) (2024-02-20)
 

dockerfiles/climate-notebook-gpu/tbump.toml

@@ -1,5 +1,5 @@
 [version]
-current = "0.1.0"
+current = "0.1.1"
 
 regex = '''
   (?P<major>\d+)

dockerfiles/climate-notebook/Dockerfile

@@ -17,6 +17,9 @@ USER root
 
 COPY base.yaml /base.yaml
 
+ARG BUILD
+ENV BUILD ${BUILD}
+
 RUN --mount=type=cache,target=/opt/conda/pkgs \
     mamba env update -n base -f /base.yaml && \
     rm /base.yaml && \

dockerfiles/climate-notebook/Makefile

@@ -1,9 +1,10 @@
 .DEFAULT_GOAL = build
 
-VERSION = 0.1.0
+VERSION = 0.1.1
 
 run: ARGS = -p 8888:8888 -v $(PWD)/../dask-gateway/conda-envs:/conda-envs
 
+build: ARGS = --build-arg="BUILD=$(shell date)"
 build: POST_BUILD = make export-env
 
 .PHONY: export-env

dockerfiles/climate-notebook/base.yaml

@@ -2,31 +2,37 @@ name: base
 channels:
   - conda-forge
 dependencies:
-  - pcmdi_metrics
-  - xcdat
+  # Data packages
   - xarray
   - xarray-datatree
   - pandas
-  - xesmf
-  - xgcm
+  - flox
   - netcdf4
   - s3fs
   - zarr
-  - intake
-  - intake-esm
-  - intake-stac
-  - intake-xarray
+  # Climate packages
+  - xcdat
+  - xesmf
+  - xgcm
+  - pcmdi_metrics
   - gsw-xarray
-  - geoviews
-  - flox
+  # Plotting packages
+  - matplotlib
   - holoviews
   - hvplot
-  - datashader
+  - geoviews
   - seaborn
   - cartopy
-  - matplotlib
+  - datashader
+  # Computing packages
+  - dask-gateway
+  # Discovery packages
+  - intake-esm
+  - intake-stac
+  - intake-xarray
+  # ignore
+  - intake
   - nc-time-axis
   - ipywidgets
-  - dask-gateway
   - bokeh<3
 prefix: /opt/conda

dockerfiles/climate-notebook/changelog.md

@@ -1,2 +1,7 @@
 # Changelog
+- Bump climate-notebook to 0.1.1 [ff7e50e](https://github.com/esgf-nimbus/nimbus/commit/ff7e50e) (2024-04-18)
+  - Adds trigger to always rebuild conda env [0d8dffa](https://github.com/esgf-nimbus/nimbus/commit/0d8dffa) (2024-04-18)
+  - Updates changelog [90f43bf](https://github.com/esgf-nimbus/nimbus/commit/90f43bf) (2024-04-18)
+- Bump minimal-notebook to 0.1.19 [b227abe](https://github.com/esgf-nimbus/nimbus/commit/b227abe) (2024-03-08)
+  - Renames minimal-notebook* to climate-notebook and adds new minimal-notebook [7a64382](https://github.com/esgf-nimbus/nimbus/commit/7a64382) (2024-02-20)
 

dockerfiles/climate-notebook/tbump.toml

@@ -1,5 +1,5 @@
 [version]
-current = "0.1.0"
+current = "0.1.1"
 
 regex = '''
   (?P<major>\d+)

dockerfiles/dask-gateway/Makefile

@@ -1,5 +1,5 @@
 .DEFAULT_GOAL = build
 
-VERSION = 0.1.5
+VERSION = 0.1.6
 
 include ../Makefile

dockerfiles/dask-gateway/changelog.md

@@ -1,4 +1,8 @@
 # Changelog
+- Bump dask-gateway to 0.1.6 [b25f9ba](https://github.com/esgf-nimbus/nimbus/commit/b25f9ba) (2024-04-18)
+  - Updates dask-gateway environment [784e822](https://github.com/esgf-nimbus/nimbus/commit/784e822) (2024-04-18)
+  - Renames minimal-notebook* to climate-notebook and adds new minimal-notebook [7a64382](https://github.com/esgf-nimbus/nimbus/commit/7a64382) (2024-02-20)
+  - Updates changelog [45e7c8a](https://github.com/esgf-nimbus/nimbus/commit/45e7c8a) (2024-01-30)
 - Bump dask-gateway to 0.1.5 [ab73505](https://github.com/esgf-nimbus/nimbus/commit/ab73505) (2024-01-30)
   - Removes before_commit hook [5e7bcc8](https://github.com/esgf-nimbus/nimbus/commit/5e7bcc8) (2024-01-30)
 - Bump dask-gateway to 0.1.4 [080a3fd](https://github.com/esgf-nimbus/nimbus/commit/080a3fd) (2024-01-22)

dockerfiles/dask-gateway/conda-envs/base.yaml

@@ -3,16 +3,16 @@ channels:
 - conda-forge
 dependencies:
 - ca-certificates=2022.12.7
-- cartopy=0.22.0
+- cartopy=0.23.0
 - certifi=2022.12.7
 - dask-gateway=2024.1.0
 - datashader=0.16.0
-- flox=0.9.2
+- flox=0.9.6
 - geoviews=1.9.6
 - gsw-xarray=0.3.0
 - holoviews=1.17.1
 - hvplot=0.9.2
-- intake=2.0.1
+- intake=2.0.4
 - intake-esm=2023.11.10
 - intake-stac=0.4.0
 - intake-xarray=0.7.0
@@ -21,20 +21,20 @@ dependencies:
 - jupyterhub=4.0.0
 - jupyterlab=3.6.3
 - mamba=1.4.2
-- matplotlib=3.8.3
+- matplotlib=3.8.4
 - nc-time-axis=1.4.1
 - netcdf4=1.6.5
 - notebook=6.5.4
 - openssl=3.1.5
-- pandas=2.2.0
-- pcmdi_metrics=3.3.1
+- pandas=2.2.2
+- pcmdi_metrics=3.3.4
 - python=3.10.10
-- s3fs=2024.2.0
+- s3fs=2024.3.1
 - seaborn=0.13.2
-- xarray=2024.2.0
+- xarray=2024.3.0
 - xarray-datatree=0.0.14
-- xcdat=0.6.1
-- xesmf=0.8.2
+- xcdat=0.7.0
+- xesmf=0.8.5
 - xgcm=0.8.1
-- zarr=2.17.0
+- zarr=2.17.2
 prefix: /opt/conda

dockerfiles/dask-gateway/tbump.toml

@@ -1,5 +1,5 @@
 [version]
-current = "0.1.5"
+current = "0.1.6"
 
 regex = '''
   (?P<major>\d+)