Add [email protected], [email protected]; clean uwtools versions and fix dependency errors (#555)

Add [email protected] & [email protected], cleaning up rarely used uwtools versions and adding error fixes from authoritative pr #116

Author: WeirAE

var/spack/repos/builtin/packages/iotaa/package.py

@@ -16,12 +16,12 @@ class Iotaa(PythonPackage):
 
     license("Apache-2.0", checked_by="WeirAE")
 
+    version("1.3.0", sha256="2e3a31cfae0000f2440917ecc9cb7c769bd1024952a299d0db263761b388693f")
     version("1.2.3", sha256="010842cc3f20f203f1154b29befe7d58db7ed45ca7c8d972c08487de5d7dc43e")
-
     version("1.1.6", sha256="b375edafec7dc00f854f7122e0817924ce53f05e0a62e01422ea44aff25c5f8d")
-
     version("0.8.3", sha256="d92bf7a1a41f46987effb7aeeacc12b1fc7dbe8bbaedda8ec71dcf188e5d05bb")
 
+    depends_on("[email protected]:")
     depends_on("py-setuptools@42:", type="build")
 
     build_directory = "src"

var/spack/repos/builtin/packages/uwtools/package.py

@@ -21,28 +21,25 @@ class Uwtools(PythonPackage):
 
     license("GPL-2.0-or-later", checked_by="WeirAE")
 
-    version("2.7.1", sha256="2764aa5fa9f4ebb3eb43bf6ee3cf9e37d3889f374bfc536faabdfb3dc46b26c8")
-    version("2.7.0", sha256="778c935256c9511d81e32a7548412ace3a1901d8afc22bdb042639156e45bcc5")
-    version("2.6.3", sha256="0b9cd205c91202cf20eef64fa462176b37d6fbbceb752097a065d1772855bfc4")
+    version("2.7.2", sha256="56816d543664792258bfa7dfb7e4cc66f794959dc92dc3710021f40a2b8571a4")
     version("2.6.2", sha256="d0922ddd2b3bdbeb925c2e4694f929f3e966145d2929e74ab9f9c9ecd27b674a")
-    version("2.6.1", sha256="cd3fb06b153ddba3b5256c79c3be4d84c6b388b7c2f7737e8b32bcb28081774b")
-    version("2.6.0", sha256="25f350a3f69b29a4b685ce9c93edfc11a39b99192040bc44250495c0e6a09b68")
-    version("2.5.3", sha256="fec29a1c1b07788d3144fa45a263566bab6cfd286da0cfbefe2b2a02f7bacad1")
-    version("2.5.2", sha256="358da7473205456720e2f8231a43ad7ef0b9946dfdad41ea542963f444d258b9")
     version("2.5.1", sha256="f389f63195492196c8009d5843a3861ad350b5fd1cea1fdb8a6bfdc7cbfd660f")
-    version("2.5.0", sha256="246f1cb1d3b7c507eae833f5223d3be5efaea16204a71cafba820901edc0e19e")
 
     depends_on("py-pip", type="build")
+    # Maximum Python version limited here for compatibility with the JCSDA unified environment
     depends_on("[email protected]:3.11")
     depends_on("py-setuptools", type="build")
     depends_on("[email protected]")
     depends_on("[email protected]")
-    depends_on("[email protected]:", when="@:2.6.3")
-    depends_on("[email protected]:", when="@2.6.3:")
-    depends_on("[email protected]:", when="@2.7.1:")
-    depends_on("[email protected]:4.24")
-    depends_on("[email protected]")
+    depends_on("[email protected]", when="@:2.5")
+    depends_on("[email protected]", when="@2.6")
+    depends_on("[email protected]", when="@2.7")
+    depends_on("[email protected]:2.0", when="@2.8:")
+    depends_on("[email protected]:4.23")
+    depends_on("[email protected]", when="@2.7")
+    depends_on("[email protected]:5.4", when="@2.8")
+    depends_on("[email protected]", when="@:2.6")
     depends_on("[email protected]")
-    depends_on("[email protected]", when="@2.6.3:")
+    depends_on("[email protected]", when="@2.6:")
 
     build_directory = "src"