Merge remote-tracking branch 'origin/develop' into ci_reusable_workfl…

…ow_fix

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8.13-bullseye@sha256:2a01d88a1684e6d7f08030cf5ae73b536926c64076cab197e9e3d9f699255283
+FROM python:3.11-slim-bookworm@sha256:7cd3fa11d619688317226bc93dc59bc8966e9aec6bc2a6abb847e8ab7d656706
 
 RUN apt-get update && apt-get install -y make \
     software-properties-common \
@@ -13,14 +13,11 @@ RUN apt-get update && apt-get install -y make \
     proj-bin \
     proj-data \
     python3 \
-    python3-pip
+    python3-pip \
+    git
 
 RUN pip3 install --upgrade setuptools wheel
 
-COPY constraints.txt /pace/constraints.txt
-
-RUN pip3 install -r /pace/constraints.txt
-
 COPY . /pace
 
 RUN cd /pace && \
@@ -36,7 +33,7 @@ RUN python3 -m pip install \
     ipyparallel==8.4.1 \
     jupyterlab==3.4.4 \
     shapely==1.8.5 \
-    cartopy==0.18.0 \
+    cartopy==0.23.0 \
     jupyterlab_code_formatter==1.5.2 \
     isort==5.10.1 \
     black==22.3.0 \

README.md

@@ -116,7 +116,7 @@ make build
 
 ```shell
 make dev
-mpirun --mca btl_vader_single_copy_mechanism none -n 6 python3 -m pace.run /examples/configs/baroclinic_c12.yaml
+mpirun --mca btl_vader_single_copy_mechanism none -n 6 python -m pace.run /examples/configs/baroclinic_c12.yaml
 ```
 
 ## History

constraints.txt

@@ -27,6 +27,7 @@ attrs==23.2.0
     #   aiohttp
     #   gt4py
     #   jsonschema
+    #   pytest-subtests
     #   referencing
 babel==2.9.1
     # via sphinx
@@ -48,6 +49,7 @@ cfgv==3.3.1
     # via pre-commit
 cftime==1.6.3
     # via
+    #   -r requirements_dev.txt
     #   ndsl
     #   netcdf4
 charset-normalizer==3.3.2
@@ -60,9 +62,7 @@ click==8.1.7
 cloudpickle==3.0.0
     # via dask
 cmake==3.29.2
-    # via
-    #   dace
-    #   gt4py
+    # via gt4py
 comm==0.2.2
     # via ipykernel
 commonmark==0.9.1
@@ -76,7 +76,9 @@ dacite==1.8.1
     #   fv3config
     #   pace
 dask==2024.4.2
-    # via ndsl
+    # via
+    #   -r requirements_dev.txt
+    #   ndsl
 debugpy==1.8.1
     # via ipykernel
 decorator==5.1.1
@@ -91,8 +93,6 @@ dill==0.3.8
     # via dace
 distlib==0.3.2
     # via virtualenv
-distro==1.9.0
-    # via scikit-build
 docutils==0.16
     # via
     #   recommonmark
@@ -104,6 +104,7 @@ executing==2.0.1
     #   stack-data
 f90nml==1.4.4
     # via
+    #   -r requirements_dev.txt
     #   fv3config
     #   ndsl
     #   pyfv3
@@ -221,6 +222,7 @@ matplotlib-inline==0.1.7
     #   ipython
 mpi4py==3.1.5
     # via
+    #   -r requirements_dev.txt
     #   ndsl
     #   pace
 mpmath==1.3.0
@@ -245,8 +247,9 @@ nest-asyncio==1.6.0
     # via
     #   ipykernel
     #   nbclient
-netcdf4==1.6.5
+netcdf4==1.7.0
     # via
+    #   -r requirements_dev.txt
     #   ndsl
     #   pace
 networkx==3.3
@@ -259,12 +262,15 @@ numcodecs==0.12.1
     # via zarr
 numpy==1.26.4
     # via
+    #   -r requirements_dev.txt
     #   cftime
     #   dace
     #   gt4py
     #   h5py
+    #   ndsl
     #   netcdf4
     #   numcodecs
+    #   pace
     #   pandas
     #   pyfv3
     #   pyshield
@@ -283,7 +289,6 @@ packaging==24.0
     #   h5netcdf
     #   ipykernel
     #   pytest
-    #   scikit-build
     #   setuptools-scm
     #   sphinx
     #   xarray
@@ -339,11 +344,13 @@ pygments==2.17.2
     #   sphinx
 pytest==8.1.1
     # via
+    #   -r requirements_dev.txt
     #   nbmake
     #   pytest-cov
     #   pytest-datadir
     #   pytest-profiling
     #   pytest-regressions
+    #   pytest-subtests
 pytest-cov==5.0.0
     # via -r requirements_dev.txt
 pytest-datadir==1.5.0
@@ -352,6 +359,8 @@ pytest-profiling==1.7.0
     # via -r requirements_dev.txt
 pytest-regressions==2.5.0
     # via -r requirements_dev.txt
+pytest-subtests==0.12.1
+    # via -r requirements_dev.txt
 python-dateutil==2.9.0.post0
     # via
     #   faker
@@ -394,10 +403,10 @@ rpds-py==0.18.0
     #   referencing
 rsa==4.9
     # via google-auth
-scikit-build==0.17.6
-    # via dace
 scipy==1.13.0
-    # via ndsl
+    # via
+    #   -r requirements_dev.txt
+    #   ndsl
 setuptools-scm==8.0.4
     # via fparser
 six==1.16.0
@@ -461,9 +470,7 @@ traitlets==5.14.3
     #   matplotlib-inline
     #   nbclient
     #   nbformat
-types-pyyaml==6.0.12.20240311
-    # via pace
-typing-extensions==4.5.0
+typing-extensions==4.12.2
     # via
     #   gt4py
     #   ipython
@@ -479,19 +486,19 @@ wcwidth==0.2.13
 websockets==12.0
     # via dace
 wheel==0.43.0
-    # via
-    #   astunparse
-    #   scikit-build
+    # via astunparse
 xarray==2024.3.0
     # via
+    #   -r requirements_dev.txt
     #   ndsl
+    #   pace
     #   pyfv3
     #   pyshield
 xxhash==3.0.0
     # via gt4py
 yarl==1.9.4
     # via aiohttp
-zarr==2.17.2
+zarr==2.18.2
     # via
     #   -r requirements_dev.txt
     #   pace

requirements_dev.txt

@@ -1,9 +1,19 @@
+pytest
+pytest-subtests
 pytest-regressions
 pytest-profiling
 pytest-cov
+scipy
 nbmake
+mpi4py
+xarray
 zarr
+dask
+netCDF4
+cftime
 fv3config
+f90nml
+numpy
 -e NDSL
 -e pySHiELD
 -e pyFV3

setup.py

@@ -12,12 +12,14 @@ def local_pkg(name: str, relative_path: str) -> str:
 
 
 requirements: List[str] = [
+    "ndsl",
     "dacite",
     "pyyaml",
     "mpi4py",
+    "numpy",
     "netCDF4",
+    "xarray",
     "zarr",
-    "types-pyyaml",
 ]