add plotting; remove other conda env files

adrifoster · Mar 13, 2024 · ccaec33 · ccaec33
1 parent b7d3780
commit ccaec33
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 68 deletions.
diff --git a/python/Makefile b/python/Makefile
@@ -42,17 +42,6 @@ utest: FORCE
 stest: FORCE
 	$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --sys
 
-adv_test: adv_utest adv_stest
-
-.PHONY: adv_utest
-adv_utest: FORCE
-	$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --adv_unit
-
-.PHONY: adv_stest
-adv_stest: FORCE
-	$(PYTHON) ./run_ctsm_py_tests $(TEST_ARGS) --adv_sys
-
-
 .PHONY: lint
 lint: FORCE
 	$(PYLINT) $(PYLINT_ARGS) $(PYLINT_SRC)

diff --git a/python/conda_env_ctsm_py.txt b/python/conda_env_ctsm_py.txt
@@ -0,0 +1,26 @@
+#
+# NOTE: On Derecho you may need to "module load conda"
+#
+# use the top level bash script:
+# ../py_env_create                                           # Do this each time you update your CTSM Version
+# conda activate ctsm_pylib                                  # Do this anytime you want to run a CTSM python script
+# Or the individual conda commands:
+# conda create  -n ctsm_pylib                                # Do this one time for each machine
+# conda install -n ctsm_pylib --file conda_env_ctsm_py.txt   # Do this each time you update your CTSM Version
+# conda activate ctsm_pylib                                  # Do this anytime you want to run a CTSM python script
+#
+python=3.7.9
+pandas
+tqdm
+scipy
+netcdf4
+requests
+packaging
+numpy=1.19.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
+cartopy=0.20.2
+matplotlib=3.3.2
diff --git a/...da_env_requirements_ctsm_pylib_latest.txt → python/conda_env_ctsm_py_latest.txt b/...da_env_requirements_ctsm_pylib_latest.txt → python/conda_env_ctsm_py_latest.txt
@@ -1,13 +1,16 @@
 # This is a test python environment intended to represent the latest environment that can be built
 python>=3.9.13,<3.10    # Moving to 3.10 runs into conflicts
-pandas>=1.5.3
+pandas>=1.5.1
 tqdm>=4.64.1
 scipy
 netcdf4
 requests
 packaging
-numpy>=1.24.2
-xarray>=2023.2.0
+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
                       # By, 2.14.4 there are 75 errors
-black>=23.1.0       # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows
+black>=22.6.0       # NOTE: The version here needs to be coordinated with the black github action under ../.github/workflows
+cartopy=0.20.2
+matplotlib=3.3.2
diff --git a/python/conda_env_requirements_ctsm_pylib.txt b/python/conda_env_requirements_ctsm_pylib.txt
diff --git a/python/conda_env_requirements_ctsm_pylib_cgd.txt b/python/conda_env_requirements_ctsm_pylib_cgd.txt
diff --git a/python/conda_env_requirements_ctsm_pylib_dask.txt b/python/conda_env_requirements_ctsm_pylib_dask.txt
diff --git a/python/conda_env_requirements_ctsm_pylib_notcgd.txt b/python/conda_env_requirements_ctsm_pylib_notcgd.txt
diff --git a/python/conda_env_requirements_ctsm_pylib_specific.txt b/python/conda_env_requirements_ctsm_pylib_specific.txt