Merge pull request #1115 from xylar/drop-python-3.9-and-clean-up

Drop python 3.9 and clean up

Author: xylar

.github/workflows/build_workflow.yml

@@ -27,7 +27,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
       fail-fast: false
     steps:
       - id: skip_check

.gitignore

@@ -99,3 +99,6 @@ ENV/
 /chrysalis_test_suite/
 /cori_test_suite/
 /compy_test_suite/
+
+# vscode settings
+.vscode/

ci/python3.9.yaml

@@ -1,5 +1,6 @@
 {% set name = "MPAS-Analysis" %}
 {% set version = "1.13.0" %}
+{% set python_min = "3.10" %}
 
 package:
   name: {{ name|lower }}
@@ -9,23 +10,25 @@ source:
   path: ../..
 
 build:
-    number: 0
-    script: {{ PYTHON }} -m pip install --no-deps --no-build-isolation -vv .
-    noarch: python
+  number: 0
+  script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv
+  noarch: python
+  entry_points:
+    - mpas_analysis = mpas_analysis.__main__:main
+    - download_analysis_data = mpas_analysis.download_data:download_analysis_data
 
 requirements:
   host:
-    - python >=3.9
+    - python {{ python_min }}
     - pip
-    - setuptools
+    - setuptools >=60
   run:
-    - python >=3.9
+    - python >={{ python_min }},<3.13
     - cartopy >=0.18.0
     - cartopy_offlinedata
     - cmocean
     - dask
     - esmf >=8.4.2,<9.0.0
-    - esmf=*=mpi_mpich_*
     - f90nml
     - geometric_features >=1.6.1
     - gsw
@@ -44,14 +47,14 @@ requirements:
     - python-dateutil
     - requests
     - scipy >=1.7.0
-    - setuptools
     - shapely >=2.0,<3.0
     - xarray >=0.14.1
 
 test:
   requires:
     - pytest
     - pip
+    - python {{ python_min }}
   imports:
     - mpas_analysis
     - pytest
@@ -78,5 +81,7 @@ about:
 
 extra:
   recipe-maintainers:
+    - andrewdnolan
+    - altheaden
     - xylar
-    - jhkennedy
+    - jhkennedy

ci/recipe/meta.yaml

@@ -2,23 +2,23 @@
 # $ conda create --name <env> --file <this file>
 
 # Base
-python>=3.9
+python >=3.10
 cartopy >=0.18.0
 cartopy_offlinedata
 cmocean
 dask
 esmf >=8.4.2,<9.0.0
 esmf=*=mpi_mpich_*
 f90nml
-geometric_features>=1.6.1
+geometric_features >=1.6.1
 gsw
 lxml
 mache >=1.11.0
-matplotlib-base>=3.9.0
+matplotlib-base >=3.9.0
 mpas_tools >=1.3.0,<2.0.0
-nco>=4.8.1,!=5.2.6
+nco >=4.8.1,!=5.2.6
 netcdf4
-numpy>=2.0,<3.0
+numpy >=2.0,<3.0
 pandas
 pillow >=10.0.0,<11.0.0
 progressbar2
@@ -27,18 +27,18 @@ pyremap >=2.0.0,<3.0.0
 python-dateutil
 requests
 scipy >=1.7.0
-setuptools
-shapely>=2.0,<3.0
-xarray>=0.14.1
+shapely >=2.0,<3.0
+xarray >=0.14.1
 
 # Development
 pip
 pytest
+setuptools >=60
 
 # Documentation
 mock
-m2r2>=0.3.3
-mistune<2
+m2r2 >=0.3.3
+mistune <2
 sphinx
 sphinx_rtd_theme
 tabulate

dev-spec.txt

@@ -1,8 +1,8 @@
 [project]
-name = "mpas_analysis"
+name = "mpas-analysis"
 dynamic = ["version"]
 authors = [
-    { name="Xylar Asay-Davis", email="xylar@lanl.gov" },
+    { name="Xylar Asay-Davis", email="xylarstorm@gmail.com" },
     { name="Carolyn Begeman" },
     { name="Phillip J. Wolfram" },
     { name="Milena Veneziani" },
@@ -27,10 +27,9 @@ description = """\
     """
 license = { file = "LICENSE" }
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
     # these are only for searching/browsing projects on PyPI
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -45,7 +44,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "cartopy>=0.18.0",
+    "cartopy >=0.18.0",
     "cmocean",
     "dask",
     "gsw",
@@ -59,11 +58,9 @@ dependencies = [
     "pyproj",
     "python-dateutil",
     "requests",
-    "scipy>=1.7.0",
-    "setuptools",
-    "shapely>=2.0,<3.0",
-    "six",
-    "xarray>=0.14.1"
+    "scipy >=1.7.0",
+    "shapely >=2.0,<3.0",
+    "xarray >=0.14.1"
 ]
 
 [project.optional-dependencies]

pyproject.toml

@@ -19,7 +19,7 @@ cd ..
 
 machine=$(python -c "from mache import discover_machine; print(discover_machine())")
 
-py=3.11
+py=3.13
 ./suite/setup.py -p ${py} -r main_py${py} -b ${branch} --copy_docs --clean -e ${env_name}
 ./suite/setup.py -p ${py} -r wc_defaults -b ${branch} --no_polar_regions -e ${env_name}
 ./suite/setup.py -p ${py} -r moc_am -b ${branch} -e ${env_name}
@@ -33,7 +33,7 @@ py=3.11
 # submit the jobs
 cd ${machine}_test_suite
 
-main_py=3.11
+main_py=3.13
 cd main_py${main_py}
 echo main_py${main_py}
 RES=$(sbatch job_script.bash)

suite/run_dev_suite.bash

@@ -5,8 +5,8 @@ set -e
 conda_base=$(dirname $(dirname $CONDA_EXE))
 source $conda_base/etc/profile.d/conda.sh
 
-main_py=3.11
-alt_py=3.10
+main_py=3.13
+alt_py=3.12
 
 export HDF5_USE_FILE_LOCKING=FALSE
 
@@ -41,7 +41,7 @@ conda deactivate
 py=${main_py}
 conda activate test_mpas_analysis_py${py}
 cd docs
-DOCS_VERSION=test make clean versioned-html 
+DOCS_VERSION=test make clean versioned-html
 cd ..
 
 machine=$(python -c "from mache import discover_machine; print(discover_machine())")