diff --git a/var/spack/repos/builtin/packages/cmake/package.py b/var/spack/repos/builtin/packages/cmake/package.py index 8984f03712a..af28284cea2 100644 --- a/var/spack/repos/builtin/packages/cmake/package.py +++ b/var/spack/repos/builtin/packages/cmake/package.py @@ -75,45 +75,6 @@ class Cmake(Package): version("3.0.2", sha256="6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e") version("2.8.10.2", sha256="ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1") - with default_args(deprecated=True): - version( - "3.29.3", sha256="252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb" - ) - version( - "3.29.2", sha256="36db4b6926aab741ba6e4b2ea2d99c9193222132308b4dc824d4123cb730352e" - ) - version( - "3.29.1", sha256="7fb02e8f57b62b39aa6b4cf71e820148ba1a23724888494735021e32ab0eefcc" - ) - version( - "3.29.0", sha256="a0669630aae7baa4a8228048bf30b622f9e9fd8ee8cedb941754e9e38686c778" - ) - version( - "3.28.4", sha256="eb9c787e078848dc493f4f83f8a4bbec857cd1f38ab6425ce8d2776a9f6aa6fb" - ) - version( - "3.28.3", sha256="72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1" - ) - version( - "3.28.2", sha256="1466f872dc1c226f373cf8fba4230ed216a8f108bd54b477b5ccdfd9ea2d124a" - ) - version( - "3.28.1", sha256="15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad" - ) - version( - "3.28.0", sha256="e1dcf9c817ae306e73a45c2ba6d280c65cf4ec00dd958eb144adaf117fb58e71" - ) - # used in py-cmake, to be removed in Spack 0.23 - version( - "3.22.2", sha256="3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced" - ) - version( - "3.21.4", sha256="d9570a95c215f4c9886dd0f0564ca4ef8d18c30750f157238ea12669c2985978" - ) - version( - "3.18.0", sha256="83b4ffcb9482a73961521d2bafe4a16df0168f03f56e6624c419c461e5317e29" - ) - depends_on("c", type="build") depends_on("cxx", type="build") diff --git a/var/spack/repos/builtin/packages/py-cmake/package.py b/var/spack/repos/builtin/packages/py-cmake/package.py deleted file mode 100644 index 59dc41a1b7a..00000000000 --- a/var/spack/repos/builtin/packages/py-cmake/package.py +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright Spack Project Developers. See COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - -pycmake_versions = { - "3.27.9": "d8a40eef1268c91e5b520b28fd5fe0591d750e48e44276dbfd493a14ee595c41", - "3.22.2": "b5bd5eeb488b13cf64ec963800f3d979eaeb90b4382861b86909df503379e219", - "3.21.4": "30fa5ed8a5ad66dcd263adb87f3ce3dc2d0ec0ac3958f5becff577e4b62cd065", - "3.18.0": "52b98c5ee70b5fa30a8623e96482227e065292f78794eb085fdf0fecb204b79b", -} - - -class PyCmake(PythonPackage): - """CMake is an open-source, cross-platform family of tools designed to - build, test and package software. - - Deprecated: use cmake instead. - """ - - homepage = "https://cmake.org" - git = "https://github.com/scikit-build/cmake-python-distributions.git" - pypi = "cmake/cmake-3.22.2.tar.gz" - - license("Apache-2.0") - - for v, sha in pycmake_versions.items(): - version(v, sha256=sha, deprecated=True) - - depends_on("ninja", type="build") - depends_on("py-scikit-build@0.12:", type="build") - depends_on("py-setuptools@42:", type="build") - depends_on("py-setuptools-scm+toml", when="@3.27.9:", type="build") - # in newer pip versions --install-option does not exist - depends_on("py-pip@:23.0", type="build") - depends_on("git", type="build") - - for v in pycmake_versions.keys(): - depends_on(f"cmake@{v}", type=("build", "link", "run"), when=f"@{v}") - - # see: - # https://github.com/scikit-build/cmake-python-distributions/issues/227 - # https://github.com/spack/spack/pull/28760#issuecomment-1029362288 - for v in pycmake_versions.keys(): - resource( - name="cmake-src", - git="https://gitlab.kitware.com/cmake/cmake.git", - commit="v{0}".format(v), - when="@{0}".format(v), - destination="cmake-src", - placement="cmake-src", - ) - - def install_options(self, spec, prefix): - return ["-DBUILD_CMAKE_FROM_SOURCE=ON", "-DCMakeProject_SOURCE_DIR=cmake-src"] - - def setup_build_environment(self, env): - if self.run_tests: - env.set( - "SKBUILD_CONFIGURE_OPTIONS", - # BootstrapTest is already exlcude upstream, - # The rest are (non-understood) known failures, disabled to get test suite working - # todo: investigate test failures / check if still needed in newer versions - "-DRUN_CMAKE_TEST=ON -DRUN_CMAKE_TEST_EXCLUDE=BootstrapTest|CompileWarningAsError" - "|GET_RUNTIME_DEPENDENCIES", - ) - else: - env.set("SKBUILD_CONFIGURE_OPTIONS", "-DRUN_CMAKE_TEST=OFF")