From d323dc0984a5cc9c0e962a634b5bf7c396b7e248 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Thu, 23 May 2024 16:10:08 -0400
Subject: [PATCH 01/14] BLD: Initial try at pyproject.toml

I think I got every key from setup.py.
The main difference is if the READTHEDOCS environment variable is set: I don't know how to change the dependencies based on that.

On the other hand, given 3.8 is close to or past EOL, I suspect 3.3 is relatively uncommon, and the RTD install, without the unneeded bits, could be accomplished with pip install --no-deps.
---
 pyproject.toml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..b5e8154
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,53 @@
+[build-system]
+requires = ["setuptools", "numpy"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "wrf-python"
+authors = ["Bill Ladwig"]
+maintainers = [
+    { name = "GeoCAT", email = "geocat@ucar.edu" },
+]
+description = "Diagnostic and interpolation routines for WRF-ARW data."
+readme = "README.md"
+requires-python = ">=3.7, <3.12"
+keywords = [
+    "python", "wrf-python", "wrf", "forecast", "model",
+    "weather research and forecasting", "interpolation",
+    "plotting", "plots", "meteorology", "nwp",
+    "numerical weather prediction", "diagnostic",
+    "science", "numpy"
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Science/Research",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: Apache Software License",
+    "Programming Language :: Fortran",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Topic :: Scientific/Engineering :: Atmospheric Science",
+    "Topic :: Software Development",
+    "Operating System :: POSIX",
+    "Operating System :: Unix",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows"
+]
+license = { text = "Apache-2.0", file = "LICENSE" }
+dynamic = [ "version", "dependencies" ]
+
+[project.urls]
+Repository = "https://github.com/NCAR/wrf-python"
+Documentation = "https://wrf-python.rtfd.org"
+
+[tool.setuptools]
+package-data = { "wrf" = ["data/psadilookup.dat"]}
+platforms = ["any"]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.dynamic]
+version = { attr = "wrf.version.__version__" }
+dependencies = { file = "requirements.txt" }

From 8322c424885faad29ec16ad432284ca6aa72e280 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Thu, 23 May 2024 22:58:33 -0400
Subject: [PATCH 02/14] BLD,BUG: Fix pyproject.toml configuration and remove
 setup.py duplicates.

numpy.distutils recommends setuptools<60, but that breaks pyproject.toml
configuration.  I like this way better.  Still needs setup.py for the
fortran module and for the Cheyenne configuration.
---
 pyproject.toml |  6 +++--
 setup.py       | 62 +-------------------------------------------------
 2 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index b5e8154..cebbf73 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wrf-python"
-authors = ["Bill Ladwig"]
+authors = [
+    { name = "Bill Ladwig" }
+]
 maintainers = [
     { name = "GeoCAT", email = "geocat@ucar.edu" },
 ]
@@ -34,7 +36,7 @@ classifiers = [
     "Operating System :: MacOS",
     "Operating System :: Microsoft :: Windows"
 ]
-license = { text = "Apache-2.0", file = "LICENSE" }
+license = { text = "Apache-2.0" }
 dynamic = [ "version", "dependencies" ]
 
 [project.urls]
diff --git a/setup.py b/setup.py
index 9c38c9a..8fd210c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,7 @@
 import os
-import sys
 import setuptools
 import socket
 
-# Bootstrap a numpy installation before trying to import it.
-import importlib
-try:
-    numpy_module = importlib.util.find_spec('numpy')
-    if numpy_module is None:
-        raise ModuleNotFoundError
-except (ImportError, ModuleNotFoundError):
-    import subprocess
-    subprocess.call([sys.executable, '-m', 'pip', 'install', 'numpy'])
-
 if not socket.gethostname().startswith("cheyenne"):
     import numpy.distutils.core
 else:
@@ -53,18 +42,10 @@
              "fortran/omp.f90"]
     )
 
-#Note: __version__ will be set in the version.py script loaded below
-__version__ = None
-with open("src/wrf/version.py") as f:
-    exec(f.read())
-
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 # on_rtd=True
 if on_rtd:
-    if sys.version_info < (3, 3):
-        requirements = ["mock"]  # for python2 and python < 3.3
-    else:
-        requirements = []  # for >= python3.3
+    requirements = ["mock; python_version < 3.3"]
     ext_modules = []
 
 else:
@@ -72,51 +53,10 @@
     with open("requirements.txt") as f2:
         requirements = f2.read().strip().splitlines()
 
-        # if sys.version_info < (3,3):
-        #     requirements.append("mock")
     ext_modules = [ext1]
 
 numpy.distutils.core.setup(
-    name='wrf-python',
-    author="Bill Ladwig",
-    maintainer="GeoCAT",
-    maintainer_email="geocat@ucar.edu",
-    description="Diagnostic and interpolation routines for WRF-ARW data.",
-    long_description=("A collection of diagnostic and interpolation "
-                      "routines to be used with WRF-ARW data.\n\n"
-                      "GitHub Repository:\n\n"
-                      "https://github.com/NCAR/wrf-python\n\n"
-                      "Documentation:\n\n"
-                      "https://wrf-python.rtfd.org\n"),
-    url="https://github.com/NCAR/wrf-python",
-    version=__version__,
-    package_dir={"": "src"},
-    keywords=["python", "wrf-python", "wrf", "forecast", "model",
-              "weather research and forecasting", "interpolation",
-              "plotting", "plots", "meteorology", "nwp",
-              "numerical weather prediction", "diagnostic",
-              "science", "numpy"],
-    python_requires='>=3.7',
     install_requires=requirements,
-    classifiers=["Development Status :: 5 - Production/Stable",
-                 "Intended Audience :: Science/Research",
-                 "Intended Audience :: Developers",
-                 "License :: OSI Approved :: Apache Software License",
-                 "Programming Language :: Fortran",
-                 "Programming Language :: Python :: 3.9",
-                 "Programming Language :: Python :: 3.10",
-                 "Programming Language :: Python :: 3.11",
-                 "Topic :: Scientific/Engineering :: Atmospheric Science",
-                 "Topic :: Software Development",
-                 "Operating System :: POSIX",
-                 "Operating System :: Unix",
-                 "Operating System :: MacOS",
-                 "Operating System :: Microsoft :: Windows"],
-    platforms=["any"],
-    license="Apache License 2.0",
-    packages=setuptools.find_packages("src"),
     ext_modules=ext_modules,
-    download_url="https://python.org/pypi/wrf-python",
-    package_data={"wrf": ["data/psadilookup.dat"]},
     scripts=[]
 )

From 5c169ebf1a2fe8a5440f1712cd31f9e234c8af11 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Fri, 24 May 2024 06:53:01 -0400
Subject: [PATCH 03/14] FIX: Require a setuptools version that understands the
 configuration.

setuptools<60 just gets confused, and has no idea what the project name is.
I just inverted that requirement: not sure if setuptools needs to be more recent still.
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index cebbf73..b5f078c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "numpy"]
+requires = ["setuptools>=60", "numpy"]
 build-backend = "setuptools.build_meta"
 
 [project]

From c854ae9820888c9d02a3b1ec1689f57ac157d577 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Sun, 26 May 2024 08:49:47 -0400
Subject: [PATCH 04/14] BLD: Quote version requirement.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8fd210c..6033410 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 # on_rtd=True
 if on_rtd:
-    requirements = ["mock; python_version < 3.3"]
+    requirements = ['mock; python_version < "3.3"']
     ext_modules = []
 
 else:

From a3f5263e45dc50ddd96c1713c6e038fc6d8d16e5 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Mon, 27 May 2024 08:30:08 -0400
Subject: [PATCH 05/14] BLD: Specify dependencies in pyproject.toml only.

Remove requirements.txt.
---
 MANIFEST.in      |  1 -
 pyproject.toml   | 12 +++++++++---
 requirements.txt |  5 -----
 setup.py         |  5 -----
 4 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/MANIFEST.in b/MANIFEST.in
index 79b786b..44c6fbd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,5 @@
 include README.md
 include LICENSE
-include requirements.txt
 
 include fortran/*.f90
 include fortran/*.pyf
diff --git a/pyproject.toml b/pyproject.toml
index b5f078c..810a510 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=60", "numpy"]
+requires = ["setuptools>=61", "numpy"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -37,7 +37,14 @@ classifiers = [
     "Operating System :: Microsoft :: Windows"
 ]
 license = { text = "Apache-2.0" }
-dynamic = [ "version", "dependencies" ]
+dynamic = [ "version" ]
+dependencies = [
+    "basemap",
+    "numpy >=1.11, !=1.24.3",
+    "setuptools",
+    "wrapt",
+    "xarray"
+]
 
 [project.urls]
 Repository = "https://github.com/NCAR/wrf-python"
@@ -52,4 +59,3 @@ where = ["src"]
 
 [tool.setuptools.dynamic]
 version = { attr = "wrf.version.__version__" }
-dependencies = { file = "requirements.txt" }
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index e9cbcfa..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-basemap
-numpy >=1.11, !=1.24.3
-setuptools
-wrapt
-xarray
diff --git a/setup.py b/setup.py
index 6033410..959885d 100755
--- a/setup.py
+++ b/setup.py
@@ -45,14 +45,9 @@
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 # on_rtd=True
 if on_rtd:
-    requirements = ['mock; python_version < "3.3"']
     ext_modules = []
 
 else:
-    # Place install_requires into the text file "requirements.txt"
-    with open("requirements.txt") as f2:
-        requirements = f2.read().strip().splitlines()
-
     ext_modules = [ext1]
 
 numpy.distutils.core.setup(

From 116ab31a36df83621daabc1d27781f2d64362ce1 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Tue, 28 May 2024 10:20:40 -0400
Subject: [PATCH 06/14] DOC: Don't install dependencies on RTD

The old setup script replaced the dependencies listed in requirements.txt with mock if python was old enough and nothing if python was recent.

The package no longer supports python versions that old (<3.3), so installing without dependencies is likely the correct way to handle the RTD configuration.
---
 .readthedocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index d059c2c..8cb6480 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -11,7 +11,7 @@ build:
     python: "mambaforge-4.10"
   jobs:
     post_create_environment:
-      - python -m pip install --no-cache-dir .
+      - python -m pip install --no-cache-dir --no-deps .
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

From c86c10893d02e4bb5531f5cd110ab1c585ea34a9 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 29 May 2024 14:50:40 -0400
Subject: [PATCH 07/14] BLD,BUG: Remove references to requirements, not just
 definitions

Forgot to remove this two or three commits back.
---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 959885d..eaa0f91 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,6 @@
     ext_modules = [ext1]
 
 numpy.distutils.core.setup(
-    install_requires=requirements,
     ext_modules=ext_modules,
     scripts=[]
 )

From d67b8df607d0ef6af6f2b02f34da003c2c04cf19 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:10:55 -0400
Subject: [PATCH 08/14] BLD: Let's see if NumPy < 2.0 fixes the error

---
 pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 810a510..82ecd43 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61", "numpy"]
+requires = ["setuptools>=61", "numpy<2.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -40,7 +40,7 @@ license = { text = "Apache-2.0" }
 dynamic = [ "version" ]
 dependencies = [
     "basemap",
-    "numpy >=1.11, !=1.24.3",
+    "numpy >=1.11, !=1.24.3, <2.0",
     "setuptools",
     "wrapt",
     "xarray"

From a4c1a9ee7e8bd965d93366f2e9718583fbae84d8 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:23:21 -0400
Subject: [PATCH 09/14] BLD: Pin setuptools<60

NumPy suggested it, it might help with the distutils failure.
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 82ecd43..c8d847b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61", "numpy<2.0"]
+requires = ["setuptools<60", "numpy<2.0"]
 build-backend = "setuptools.build_meta"
 
 [project]

From 7bfbb2b716f25c6df15a581149e596502b5c9d93 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Fri, 13 Sep 2024 08:46:32 -0400
Subject: [PATCH 10/14] BLD: Pin setuptools<71

Let's see if that change is the one that broke things.
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c8d847b..924fb02 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools<60", "numpy<2.0"]
+requires = ["setuptools>=61, <=70.0", "numpy<2.0"]
 build-backend = "setuptools.build_meta"
 
 [project]

From b56bfbcdd18af2c02b7aabfb6a21e1acd3404fb6 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 18 Sep 2024 22:43:00 -0400
Subject: [PATCH 11/14] BLD: Add subroutines to f90 modules so f2py adds code
 for them.

If it's just constants used somewhere, f2py drops the module.
---
 fortran/omp.f90             | 3 +++
 fortran/ompgen.F90          | 4 ++++
 fortran/ompgen.F90.template | 4 ++++
 fortran/wrf_constants.f90   | 3 +++
 pyproject.toml              | 4 ++--
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/fortran/omp.f90 b/fortran/omp.f90
index dce6b1d..0480fe6 100644
--- a/fortran/omp.f90
+++ b/fortran/omp.f90
@@ -7,6 +7,9 @@ MODULE omp_constants
     INTEGER(KIND=fomp_sched_kind), PARAMETER :: fomp_sched_dynamic = 2
     INTEGER(KIND=fomp_sched_kind), PARAMETER :: fomp_sched_guided = 3
     INTEGER(KIND=fomp_sched_kind), PARAMETER :: fomp_sched_auto = 4
+contains
+  subroutine have_omp_constants()
+  end subroutine have_omp_constants
 END MODULE omp_constants
 
 
diff --git a/fortran/ompgen.F90 b/fortran/ompgen.F90
index 14fa7d4..4b2920b 100644
--- a/fortran/ompgen.F90
+++ b/fortran/ompgen.F90
@@ -20,6 +20,10 @@ MODULE omp_constants
     INTEGER(KIND=4), PARAMETER :: fomp_sched_auto = 4
 #endif
 
+contains
+  subroutine have_omp_constants()
+  end subroutine have_omp_constants
+
 END MODULE omp_constants
 
 
diff --git a/fortran/ompgen.F90.template b/fortran/ompgen.F90.template
index 00a50d5..92be74b 100644
--- a/fortran/ompgen.F90.template
+++ b/fortran/ompgen.F90.template
@@ -20,6 +20,10 @@ MODULE omp_constants
     INTEGER(KIND=4), PARAMETER :: fomp_sched_auto = 4
 #endif
 
+contains
+  subroutine have_omp_constants()
+  end subroutine have_omp_constants
+
 END MODULE omp_constants
 
 
diff --git a/fortran/wrf_constants.f90 b/fortran/wrf_constants.f90
index 0864502..ebc5667 100644
--- a/fortran/wrf_constants.f90
+++ b/fortran/wrf_constants.f90
@@ -69,6 +69,9 @@ MODULE wrf_constants
     REAL(KIND=8), PARAMETER :: EXPON =  RD*USSALR/G
     REAL(KIND=8), PARAMETER :: EXPONI =  1./EXPON
 
+  contains
+    subroutine have_wrf_constants()
+    end subroutine have_wrf_constants
 
 END MODULE wrf_constants
 
diff --git a/pyproject.toml b/pyproject.toml
index 924fb02..cf4dc79 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61, <=70.0", "numpy<2.0"]
+requires = ["setuptools>=61, <=70.0", "numpy"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -40,7 +40,7 @@ license = { text = "Apache-2.0" }
 dynamic = [ "version" ]
 dependencies = [
     "basemap",
-    "numpy >=1.11, !=1.24.3, <2.0",
+    "numpy >=1.11, !=1.24.3",
     "setuptools",
     "wrapt",
     "xarray"

From 62530f94bbbf0cc110c1f105ddabe9a41217ff0e Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 25 Sep 2024 10:47:28 -0400
Subject: [PATCH 12/14] BLD: Remove build-time setuptools pin.

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index cf4dc79..810a510 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61, <=70.0", "numpy"]
+requires = ["setuptools>=61", "numpy"]
 build-backend = "setuptools.build_meta"
 
 [project]

From b602e982789181eaf246f59809ac21bde1e25ecb Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 25 Sep 2024 14:12:30 -0400
Subject: [PATCH 13/14] BLD: Pin setuptools<70 to get msvccompiler

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 810a510..81dac41 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61", "numpy"]
+requires = ["setuptools>=61, <70", "numpy"]
 build-backend = "setuptools.build_meta"
 
 [project]

From 8b989e6bb0712090fff061dbc7a6be17bcfc37c9 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Wed, 25 Sep 2024 14:37:46 -0400
Subject: [PATCH 14/14] BLD: Add -fopenmp to LDFLAGS

Let's see if this gets Linux compiles working.
---
 build_scripts/gnu_omp.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_scripts/gnu_omp.sh b/build_scripts/gnu_omp.sh
index 03faa1b..46dded6 100755
--- a/build_scripts/gnu_omp.sh
+++ b/build_scripts/gnu_omp.sh
@@ -11,6 +11,7 @@ $FC -E ompgen.F90 -fopenmp -cpp -o omp.f90
 cd ..
 
 python setup.py clean --all
+export LDFLAGS=" -fopenmp "
 python setup.py config_fc --f90flags="-mtune=generic -fopenmp" build_ext --libraries="gomp" build
 pip install .