Merge remote-tracking branch 'glemieux/python/xesmf-add' into subset_…

…data_fix
slevis-lmwg · Dec 8, 2023 · f335221 · f335221
2 parents 6168aa1 + 8842be8
commit f335221
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/python/conda_env_ctsm_py.txt b/python/conda_env_ctsm_py.txt
@@ -19,5 +19,7 @@ requests
 packaging
 numpy=1.18.5
 xarray=0.17.0
+xesmf
+numba=0.55.2  # Avoid 0.56 until numpy>=1.20.  This is the minimum for xesmf
 pylint=2.8.3
-black=22.3.0       # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows
+black=22.3.0  # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows
diff --git a/python/conda_env_ctsm_py_latest.txt b/python/conda_env_ctsm_py_latest.txt
@@ -6,6 +6,7 @@ scipy
 netcdf4
 requests
 packaging
+xesmf
 numpy>=1.23.0
 xarray>=2022.3.0
 pylint>=2.8.3,<2.9.0  # Once, you move off of 2.8.3, make lint shows 2 errors, at 2.11.1 there are 2 more errors beyond that