New version for openCARP packages, v13.0 (#37940)

* New version for openCARP packages

* Update carputils dependencies

* Update types of openCARP dependencies

* Add type "run" to setuptools dependency

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

* Add package py-common as carputils dependency

* Add setuptools dependency for py-common

* Remove spaces on blank line

* Restrict type of dependency setuptools to "build"

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

---------

Co-authored-by: openCARP consortium <info@opencarp.org>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

4 files changed, 36 insertions, 16 deletions

diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py
index 25d77d295e..4a4dbdfe6f 100644
--- a/var/spack/repos/builtin/packages/meshtool/package.py
+++ b/var/spack/repos/builtin/packages/meshtool/package.py
@@ -16,6 +16,7 @@ class Meshtool(MakefilePackage):
 
     version("master", branch="master", preferred=True)
     # Version to use with openCARP releases
+    version("oc13.0", commit="867431d")
     version("oc12.0", commit="867431d")
     version("oc11.0", commit="867431d")
     version("oc10.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9")
diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py
index bdb752343b..7d975f1dd1 100644
--- a/var/spack/repos/builtin/packages/opencarp/package.py
+++ b/var/spack/repos/builtin/packages/opencarp/package.py
@@ -18,7 +18,8 @@ class Opencarp(CMakePackage):
 
     maintainers("MarieHouillon")
 
-    version("12.0", commit="a34c11af", submodules=False, no_cache=True, preferred=True)
+    version("13.0", commit="e1e0deca", submodules=False, no_cache=True, preferred=True)
+    version("12.0", commit="a34c11af", submodules=False, no_cache=True)
     version("11.0", commit="fd8419d5", submodules=False, no_cache=True)
     version("10.0", commit="7aec7900", submodules=False, no_cache=True)
     version("9.0", commit="c0167599", submodules=False, no_cache=True)
@@ -33,7 +34,7 @@ class Opencarp(CMakePackage):
     # Patch removing problematic steps in CMake process
     patch("opencarp7.patch", when="@7.0")
 
-    depends_on("git")
+    depends_on("git", type=("build", "run"))
     depends_on("petsc")
     depends_on("binutils")
     depends_on("gengetopt")
@@ -42,10 +43,10 @@ class Opencarp(CMakePackage):
     depends_on("zlib")
     depends_on("perl")
 
-    depends_on("py-carputils", when="+carputils")
-    depends_on("meshtool", when="+meshtool")
+    depends_on("py-carputils", when="+carputils", type=("build", "run"))
+    depends_on("meshtool", when="+meshtool", type=("build", "run"))
     # Use specific versions of carputils and meshtool for releases
-    for ver in ["12.0", "11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]:
+    for ver in ["13.0", "12.0", "11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]:
         depends_on("py-carputils@oc" + ver, when="@" + ver + " +carputils")
         depends_on("meshtool@oc" + ver, when="@" + ver + " +meshtool")
 
diff --git a/var/spack/repos/builtin/packages/py-carputils/package.py b/var/spack/repos/builtin/packages/py-carputils/package.py
index 44156e6e30..7082557d1d 100644
--- a/var/spack/repos/builtin/packages/py-carputils/package.py
+++ b/var/spack/repos/builtin/packages/py-carputils/package.py
@@ -17,6 +17,7 @@ class PyCarputils(PythonPackage):
 
     version("master", branch="master")
     # Version to use with openCARP releases
+    version("oc13.0", commit="216c3802c2ac2d14c739164dcd57f2e59aa2ede3")
     version("oc12.0", commit="4d7a1f0c604a2ad232e70cf9aa3a8daff5ffb195")
     version("oc11.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8")
     version("oc10.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8")
@@ -25,16 +26,16 @@ class PyCarputils(PythonPackage):
     version("oc8.1", commit="a4210fcb0fe17226a1744ee9629f85b629decba3")
     version("oc7.0", commit="4c04db61744f2fb7665594d7c810699c5c55c77c")
 
-    depends_on("git")
+    depends_on("git", type=("build", "run"))
 
-    depends_on("python", type=("build", "run"))
-    depends_on("py-pip", type="build")
     depends_on("py-numpy@1.14.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-python-dateutil", type="run")
-    depends_on("py-scipy@1.5.0:", type="run")
-    depends_on("py-matplotlib@3.0.0:", type="run")
-    depends_on("py-pandas", type="run")
-    depends_on("py-tables@3.6.1:", type="run")
-    depends_on("py-six@1.12.0:", type="run")
-    depends_on("py-ruamel-yaml", type="run")
+    depends_on("py-setuptools@41.6.0:", type=("build", "run"))
+    depends_on("py-python-dateutil@2.8.1:", type=("build", "run"))
+    depends_on("py-scipy@1.5.0:", type=("build", "run"))
+    depends_on("py-matplotlib@3.0.0:", type=("build", "run"))
+    depends_on("py-pandas", type=("build", "run"))
+    depends_on("py-tables@3.6.1:", type=("build", "run"))
+    depends_on("py-six@1.12.0:", type=("build", "run"))
+    depends_on("py-pydoe@0.3.8", type=("build", "run"))
+    depends_on("py-ruamel-yaml@0.17.4:", type=("build", "run"))
+    depends_on("py-common", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-common/package.py b/var/spack/repos/builtin/packages/py-common/package.py
new file mode 100644
index 0000000000..21fe32094b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-common/package.py
@@ -0,0 +1,17 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyCommon(PythonPackage):
+    """Common tools and data structures implemented in pure python."""
+
+    homepage = "https://pypi.python.org/pypi/common"
+    pypi = "common/common-0.1.2.tar.gz"
+
+    version("0.1.2", sha256="3dfa982670abefc870043b239eaa0ecd860be7aa952b1931c1356b426ff8c76a")
+
+    depends_on("py-setuptools", type="build")