Support oneTBB 2021.13.0 and 2022.0.0 (#48239)

Fix CI log aggregation script failing due to an import error.

share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py

@@ -6,7 +6,7 @@
 
 import os
 
-from llnl.util.tty import tty
+from llnl.util import tty
 
 
 def find_logs(prefix, filename):

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

@@ -191,7 +191,7 @@ def cmake_args(self):
             "DDEve",
             "UtilityApps",
         ]
-        enabled_packages = [p for p in packages if self.spec.variants[package.lower()].value]
+        enabled_packages = [p for p in packages if self.spec.variants[p.lower()].value]
         args.append(self.define("DD4HEP_BUILD_PACKAGES", " ".join(enabled_packages)))
         return args
 

var/spack/repos/builtin/packages/intel-tbb/package.py

@@ -32,6 +32,8 @@ class IntelTbb(CMakePackage, MakefilePackage):
     license("Apache-2.0")
 
     version("master", branch="master")
+    version("2022.0.0", sha256="e8e89c9c345415b17b30a2db3095ba9d47647611662073f7fbf54ad48b7f3c2a")
+    version("2021.13.0", sha256="3ad5dd08954b39d113dc5b3f8a8dc6dc1fd5250032b7c491eb07aed5c94133e1")
     version("2021.12.0", sha256="c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f")
     version("2021.11.0", sha256="782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363")
     version("2021.10.0", sha256="487023a955e5a3cc6d3a0d5f89179f9b6c0ae7222613a7185b0227ba0c83700b")

var/spack/repos/builtin/packages/py-scipy/package.py

@@ -178,6 +178,10 @@ class PyScipy(PythonPackage):
         msg="SciPy requires at least vc142 (default with Visual Studio 2019) "
         "when building with MSVC",
     )
+
+    # https://github.com/spack/spack/issues/48243
+    conflicts("%intel", when="@1.14:", msg="SciPy 1.14: Use Intel LLVM instead of Intel Classic")
+
     # https://github.com/spack/spack/issues/45718
     conflicts("%aocc", msg="SciPy doesn't compile with AOCC yet")
 

var/spack/repos/builtin/packages/py-snakemake-executor-plugin-htcondor/package.py

@@ -1,27 +0,0 @@
-# Copyright 2013-2024 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 PySnakemakeExecutorPluginHtcondor(PythonPackage):
-    """A Snakemake executor plugin for submitting jobs to a HTCondor cluster."""
-
-    homepage = "https://github.com/jannisspeer/snakemake-executor-plugin-htcondor"
-    pypi = "snakemake_executor_plugin_htcondor/snakemake_executor_plugin_htcondor-0.1.2.tar.gz"
-
-    maintainers("wdconinc")
-
-    license("MIT", checked_by="wdconinc")
-
-    version("0.1.2", sha256="c5268807ecb6810d1852cbf7ccde0b54394e1a824eb64baa55538ccf55328f45")
-
-    depends_on("htcondor@23.4.0:23", type=("build", "run"))
-
-    depends_on("py-snakemake-interface-common@1.15:1", type=("build", "run"))
-    depends_on("py-snakemake-interface-executor-plugins@9", type=("build", "run"))
-
-    depends_on("python@3.11:3", type=("build", "run"))
-    depends_on("py-poetry-core", type="build")

var/spack/repos/builtin/packages/py-snakemake-storage-plugin-xrootd/package.py

@@ -1,27 +0,0 @@
-# Copyright 2013-2024 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 PySnakemakeStoragePluginXrootd(PythonPackage):
-    """A Snakemake storage plugin to read and write from XRootD Storage."""
-
-    homepage = "https://github.com/snakemake/snakemake-storage-plugin-xrootd"
-    pypi = "snakemake_storage_plugin_xrootd/snakemake_storage_plugin_xrootd-0.1.4.tar.gz"
-
-    maintainers("wdconinc")
-
-    license("MIT", checked_by="wdconinc")
-
-    version("0.1.4", sha256="61a48b2567fa7f35a29f00f0a74d1efd069a16c0ef7c9f7f440a46088d2c6dbc")
-
-    depends_on("xrootd@5.6.4:5 +python", type=("build", "run"))
-
-    depends_on("py-snakemake-interface-common@1.15:1", type=("build", "run"))
-    depends_on("py-snakemake-interface-storage-plugins@3.3.0:3", type=("build", "run"))
-
-    depends_on("python@3.11:3", type=("build", "run"))
-    depends_on("py-poetry-core", type="build")