Deprecate py-cmake and py-ninja (#44257)

This commit is contained in:
Adam J. Stewart 2024-05-20 18:05:06 +02:00 committed by GitHub
parent 32dfb522d6
commit f8f4d94d7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 32 additions and 31 deletions

View File

@ -46,10 +46,6 @@ class PyAmrex(PythonPackage, CudaPackage, ROCmPackage):
depends_on("py-mpi4py@2.1.0:", type=("build", "run"), when="+mpi")
depends_on("py-packaging@23:", type="build")
depends_on("py-setuptools@42:", type="build")
# We just need a CMake binary, and py-cmake is notoriously hard to build on
# exotic architectures. So ignore the pyproject.toml declaration and use
# Spack's cmake package.
# depends_on('py-cmake@3.20:3', type='build')
depends_on("cmake@3.20:3", type="build")
depends_on("py-pybind11@2.11.1:", type="link")

View File

@ -20,6 +20,6 @@ class PyBlosc(PythonPackage):
depends_on("python@3.6:", type=("build", "run"))
depends_on("py-setuptools", type="build")
depends_on("py-scikit-build", type="build")
depends_on("py-cmake@3.11:", type="build")
depends_on("py-ninja", type="build")
depends_on("cmake@3.11:", type="build")
depends_on("ninja", type="build")
# depends_on('c-blosc') # shipped internally

View File

@ -22,10 +22,8 @@ class PyBlosc2(PythonPackage):
depends_on("py-setuptools", type="build")
depends_on("py-scikit-build", type="build")
depends_on("py-cython", type="build")
# FIXME: why doesn't this work?
# depends_on("py-cmake", type="build")
depends_on("cmake@3.11:", type="build")
depends_on("py-ninja", type="build")
depends_on("ninja", type="build")
depends_on("py-numpy@1.20.3:", type=("build", "link", "run"))
depends_on("py-ndindex@1.4:", when="@2.2:", type=("build", "run"))
depends_on("py-msgpack", type=("build", "run"))

View File

@ -24,5 +24,5 @@ class PyChemfiles(PythonPackage):
depends_on("py-setuptools@44:", type="build")
depends_on("py-wheel@0.36:", type="build")
depends_on("py-cmake", type="build")
depends_on("py-ninja", type="build")
depends_on("cmake", type="build")
depends_on("ninja", type="build")

View File

@ -15,7 +15,9 @@
class PyCmake(PythonPackage):
"""CMake is an open-source, cross-platform family of tools designed to
build, test and package software
build, test and package software.
Deprecated: use cmake instead.
"""
homepage = "https://cmake.org"
@ -25,7 +27,7 @@ class PyCmake(PythonPackage):
license("Apache-2.0")
for v, sha in pycmake_versions.items():
version(v, sha256=sha)
version(v, sha256=sha, deprecated=True)
depends_on("ninja", type="build")
depends_on("py-scikit-build@0.12:", type="build")

View File

@ -27,7 +27,7 @@ class PyCorrectionlib(PythonPackage):
depends_on("py-setuptools@42:", type="build")
depends_on("py-setuptools-scm@3.4:+toml", type="build")
depends_on("py-scikit-build", type="build")
depends_on("py-cmake@3.11:", type="build")
depends_on("cmake@3.11:", type="build")
depends_on("py-make", type="build")
depends_on("py-pybind11@2.6.1:", type="build")
depends_on("py-numpy@1.13.3:", type=("build", "run"))

View File

@ -23,7 +23,7 @@ class PyDeepspeed(PythonPackage):
depends_on("py-setuptools", type="build")
depends_on("py-hjson", type=("build", "run"))
depends_on("py-ninja", type=("build", "run"))
depends_on("ninja", type=("build", "run"))
depends_on("py-numpy", type=("build", "run"))
depends_on("py-packaging@20:", type=("build", "run"))
depends_on("py-psutil", type=("build", "run"))

View File

@ -32,8 +32,8 @@ class PyDlioProfilerPy(PythonPackage):
depends_on("yaml-cpp@0.6.3", when="@0.0.2:")
depends_on("py-setuptools@42:", type="build")
depends_on("py-pybind11", type=("build", "run"))
depends_on("py-ninja", type="build")
depends_on("py-cmake@3.12:", type="build")
depends_on("ninja", type="build")
depends_on("cmake@3.12:", type="build")
def setup_build_environment(self, env):
env.set("DLIO_PROFILER_DIR", self.prefix)

View File

@ -25,7 +25,7 @@ class PyFlashAttn(PythonPackage):
with default_args(type=("build", "run")):
depends_on("py-torch+cuda")
depends_on("py-ninja")
depends_on("ninja")
depends_on("py-einops")
depends_on("py-packaging")

View File

@ -28,7 +28,7 @@ class PyGmxapi(PythonPackage):
depends_on("gromacs@2022.1:~mdrun_only+shared")
depends_on("mpi")
depends_on("py-cmake@3.16:", type="build")
depends_on("cmake@3.16:", type="build")
depends_on("py-importlib-metadata", type="test", when="^python@:3.7")
depends_on("py-mpi4py", type=("build", "run"))
depends_on("py-networkx@2.0:", type=("build", "run"))

View File

@ -22,4 +22,4 @@ class PyIminuit(PythonPackage):
depends_on("py-setuptools", type="build")
depends_on("py-numpy", type=("build", "run"), when="@1.3:1.3.6")
depends_on("py-numpy@1.11.3:", type=("build", "run"), when="@1.3.7:")
depends_on("py-cmake", type="build", when="@2.8.4")
depends_on("cmake", type="build", when="@2.8.4")

View File

@ -30,7 +30,7 @@ class PyLineProfiler(PythonPackage):
depends_on("py-cython@3.0.3:", type="build", when="@4.1.2:")
depends_on("py-ipython@0.13:", type=("build", "run"))
depends_on("cmake", type="build", when="@3")
depends_on("py-ninja", type="build", when="@3")
depends_on("ninja", type="build", when="@3")
depends_on("py-scikit-build@0.9.0:", type="build", when="@3")
patch("gettimeofday_py39.patch", when="@:2.1.2 ^python@3.9:")

View File

@ -28,7 +28,7 @@ class PyNetket(PythonPackage):
# build only deps
depends_on("py-setuptools", type="build")
depends_on("py-cmake@3.12:", type="build")
depends_on("cmake@3.12:", type="build")
depends_on("blas")
depends_on("mpi")

View File

@ -9,14 +9,21 @@
class PyNinja(PythonPackage):
"""Ninja is a small build system with a focus on speed."""
"""Ninja is a small build system with a focus on speed.
Deprecated: use ninja instead.
"""
homepage = "https://ninja-build.org"
pypi = "ninja/ninja-1.10.2.tar.gz"
license("Apache-2.0")
version("1.10.2", sha256="bb5e54b9a7343b3a8fc6532ae2c169af387a45b0d4dd5b72c2803e21658c5791")
version(
"1.10.2",
sha256="bb5e54b9a7343b3a8fc6532ae2c169af387a45b0d4dd5b72c2803e21658c5791",
deprecated=True,
)
depends_on("cmake@3.6:", type="build")
depends_on("py-setuptools@42:", type="build")

View File

@ -30,7 +30,7 @@ class PyQiskitAer(PythonPackage, CudaPackage):
depends_on("py-qiskit-terra@0.21.0:", type=("build", "run"), when="@0.11.1")
depends_on("py-scipy@1.0:", type=("build", "run"))
depends_on("py-scikit-build@0.11.0:", type="build")
depends_on("py-cmake@:3.16,3.18:", type="build")
depends_on("cmake@:3.16,3.18:", type="build")
depends_on("mpi", when="+mpi")
depends_on("nlohmann-json@3.1.1:")
depends_on("spdlog@1.5.0:")

View File

@ -27,7 +27,7 @@ class PySmartsim(PythonPackage):
depends_on("python@3.8:3.10", type=("build", "run"))
depends_on("py-setuptools@39.2:", type=("build",))
depends_on("py-cmake@3.13:", type=("build",))
depends_on("cmake@3.13:", type=("build",))
depends_on("py-psutil@5.7.2:", type=("build", "run"))
depends_on("py-coloredlogs@10:", type=("build", "run"))

View File

@ -23,8 +23,8 @@ class PyTweedledum(PythonPackage):
depends_on("python@3.6:", type=("build", "run"))
depends_on("py-setuptools@42:", type="build")
depends_on("py-scikit-build@0.12:", type="build")
depends_on("py-cmake@3.18:", type="build")
depends_on("py-ninja", type="build")
depends_on("cmake@3.18:", type="build")
depends_on("ninja", type="build")
depends_on("py-wheel", type="build")
depends_on("eigen@3.3:")
depends_on("nlohmann-json@3.9.0:")

View File

@ -91,9 +91,7 @@ class PyWarpx(PythonPackage):
depends_on("py-picmistandard@0.0.18", type=("build", "run"), when="@22.01")
depends_on("py-setuptools@42:", type="build")
# Since we use PYWARPX_LIB_DIR to pull binaries out of the
# 'warpx' spack package, we don't need py-cmake as declared
# depends_on('py-cmake@3.15:3', type='build')
# depends_on('py-cmake@3.18:3', type='build', when='@22.01:')
# 'warpx' spack package, we don't need cmake as declared
depends_on("warpx +lib ~mpi +shared", type=("build", "link"), when="~mpi")
depends_on("warpx +lib +mpi +shared", type=("build", "link"), when="+mpi")